From 8fcb29555f6a7fdf29534dff20617fbb8fd9bfd8 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Fri, 21 Mar 2025 15:19:32 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/app/BackReceiveMapper.xml        | 2 +-
 .../src/main/resources/mapper/base/WarehouseKeeperMapper.xml   | 3 +++
 .../main/resources/mapper/material/ScrapApplyDetailsMapper.xml | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index 6baaa40b..d9944c26 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -1199,7 +1199,7 @@
       type_id = #{typeId}
   </select>
   <select id="getCheckDetails" resultType="java.lang.Integer">
-    select back_num from back_check_details where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
+    select sum(back_num) from back_check_details where parent_id = #{parentId} and type_id = #{typeId} and (is_finished is null or is_finished != 1)
   </select>
 
 
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
index 7975dce6..05590d09 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
@@ -37,6 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeName != null and typeName != ''">
             AND mt2.type_name like concat('%', #{typeName}, '%')
         </if>
+        <if test="userId != null">
+            AND mtk.user_id = #{userId}
+        </if>
         <if test="modelName != null and modelName != ''">
             AND mt.type_name like concat('%', #{modelName}, '%')
         </if>
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
index 97ae4eaf..f2e27568 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml
@@ -1255,7 +1255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
         AND mt1.del_flag = '0'
         LEFT JOIN tm_task tt on sad.task_id = tt.task_id
-        AND tt.task_type = 128
+        AND tt.task_type = 141
         where sad.scrap_source = '3'
         <if test="taskStatus != null "> and tt.task_status = #{taskStatus}</if>
         <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">