From a23651a16cade75932998eea15961f6c10524d0e Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 28 Aug 2024 11:15:36 +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

---
 .../bonus/sgzb/app/controller/BackReceiveController.java | 2 +-
 .../sgzb/app/service/impl/BackReceiveServiceImpl.java    | 2 +-
 .../src/main/resources/mapper/app/BackReceiveMapper.xml  | 9 ++++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
index 2cbb035..f9611cc 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java
@@ -190,7 +190,7 @@ public class BackReceiveController extends BaseController {
         }
     }
 
-    @Log(title = "退料接收-结束任务", businessType = BusinessType.MATERIAL)
+    //@Log(title = "退料接收-结束任务", businessType = BusinessType.MATERIAL)
     @PreventRepeatSubmit
     @PostMapping("endBack")
     public AjaxResult endBack(@RequestBody BackApplyInfo record) {
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
index c90173f..9649c6d 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
@@ -168,7 +168,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
         }
         //修改任务状态
         List<BackApplyInfo> list = backReceiveMapper.receiveView2(record);
-        boolean allZeros = list.stream().allMatch(n -> Double.valueOf(n.getNum()).intValue() == 0);
+        boolean allZeros = list.stream().allMatch(n -> Double.valueOf(n.getMaxBackNum()).intValue() == 0);
         if (allZeros) {
             res = updateTaskStatus(taskId, 40);
             if (res == 0) {
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 fe9b626..51923ca 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
@@ -730,15 +730,18 @@
     bad.pre_num as preNum,
     bad.audit_num as auditNum,
     bad.status as status,
-    IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num,
+    IFNULL(sai.num, 0) as max_back_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,
-    bb.finished_back_num,
     mtk.user_id,
     CONCAT('NSJJ',mt.`code`,mt.model_code) as `code`
     FROM
     back_apply_details bad
     LEFT JOIN back_apply_info bai on bai.id=bad.parent_id
     LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
+    LEFT JOIN (select agreement_id,type_id, sum(IFNULL(num, 0)) as num from slt_agreement_info where status=0
+        group by agreement_id,type_id) sai on tta.agreement_id=sai.agreement_id and sai.type_id=bad.type_id
     LEFT JOIN ma_type mt on mt.type_id=bad.type_id
     LEFT JOIN ma_type mt2 ON mt2.type_id=mt.parent_id
     LEFT JOIN ma_type_keeper mtk on mt.type_id=mtk.type_id
@@ -749,7 +752,7 @@
     FROM
     back_check_details
     WHERE
-    parent_id=#{parentId}
+    parent_id=#{parentId} and is_finished is null
     GROUP BY type_id
     ) aa on aa.typeId=bad.type_id
     LEFT JOIN (