From a8f3045185f8bba7f14dfe18a69ec5f91aecc750 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 28 Aug 2024 10:00:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6=E6=97=B6,?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=BB=93=E7=AE=97=E8=A1=A8=E6=8B=BF=E5=88=B0?=
 =?UTF-8?q?=E5=BE=85=E9=80=80=E6=96=99=E6=95=B0=E9=87=8F,=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2=E5=A4=9A=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java   | 5 +++++
 .../src/main/resources/mapper/app/BackReceiveMapper.xml      | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
index f29b83f..f78d5ff 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java
@@ -286,6 +286,11 @@ public class BackApplyInfo extends BaseEntity {
      */
     private String finishedBackNum;
 
+    /**
+     * 未完成的退料数量
+     */
+    private String inCompletedBackNum;
+
     /**
      * 此协议号最大剩余退料数
      */
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
index 17c8332..348a80b 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -673,7 +673,7 @@
       bad.audit_num as auditNum,
       bad.status as status,
       IFNULL(sai.num, 0) as max_back_num,
-      IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num,
+      IFNULL(aa.back_num,0) as in_completed_back_num,
       IFNULL(bb.finished_back_num, 0) as finished_back_num,
       mt.manage_type as manageType,
       mtk.user_id,
@@ -694,7 +694,7 @@
         FROM
           back_check_details
         WHERE
-          parent_id=#{id}
+          parent_id=#{id} and is_finished is null
         GROUP BY type_id
       ) aa on aa.typeId=bad.type_id
         LEFT JOIN (