From c5940da435c96bf48549c10f4438fb7a52840a02 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 1 Aug 2024 18:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86=E9=80=80?=
 =?UTF-8?q?=E6=96=99=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sgzb/app/service/impl/BackReceiveServiceImpl.java     | 5 +++--
 .../src/main/resources/mapper/app/BackReceiveMapper.xml   | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
index 8ac804b6..c3cb6125 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
@@ -181,8 +181,6 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                     //修改back_apply_details为已退料（1）
                     res = updateStatus(record);
                 }
-                //完成退料的部分，更新 back_check_details 为 is_finished=1，此部分不支持撤回
-                finishBackCheckDetails(record);
                 List<BackApplyInfo> hgList = backReceiveMapper.getHgList(record);
                 if (hgList != null && hgList.size() > 0) {
                     res = insertIad(hgList);
@@ -238,6 +236,9 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                         throw new RuntimeException("该机具未被领料使用");
                     }
                 }
+
+                //完成退料的部分，更新 back_check_details 为 is_finished=1，此部分不支持撤回
+                finishBackCheckDetails(record);
             }
         } else {
             throw new RuntimeException("typeId为空");
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 c7455025..ac810c95 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
@@ -776,7 +776,7 @@
         LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
     WHERE
       bcd.parent_id=#{parentId} and bcd.type_id=#{typeId}
-      and bcd.back_status='1'
+      and bcd.back_status='1' and bcd.is_finished is null
   </select>
 
   <select id="getWxList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@@ -796,7 +796,7 @@
         LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
     WHERE
       bcd.parent_id=#{parentId} and bcd.type_id=#{typeId}
-      and bcd.back_status='2'
+      and bcd.back_status='2' and bcd.is_finished is null
   </select>
 
   <select id="getBfList" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@@ -819,7 +819,7 @@
         LEFT JOIN tm_task_agreement tta on tta.task_id=bai.task_id
     WHERE
       bcd.parent_id=#{parentId} and bcd.type_id=#{typeId}
-      and bcd.back_status='3'
+      and bcd.back_status='3' and bcd.is_finished is null
   </select>
 
   <select id="codeQuery" resultType="com.bonus.sgzb.app.domain.BackApplyInfo">
@@ -950,7 +950,7 @@
         LEFT JOIN back_apply_info bai ON bai.id = bcd.parent_id
         LEFT JOIN tm_task_agreement tta ON tta.task_id = bai.task_id
     WHERE
-      bcd.parent_id = #{parentId} and bcd.type_id=#{typeId}
+      bcd.parent_id = #{parentId} and bcd.type_id=#{typeId} and bcd.is_finished is null
     GROUP By bcd.type_id,bcd.ma_id
   </select>
   <select id="getBackMachine" resultType="com.bonus.sgzb.app.domain.TmTask">