From f15593e8661cd697fc2870a516ef989903913b23 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sat, 7 Sep 2024 20:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BackReceiveServiceImpl.java  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

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 db42679..353f6b3 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
@@ -259,6 +259,19 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                     res = insertSad(newTaskId, bfList);
                 }
 
+                List<BackApplyInfo> allList = backReceiveMapper.getAllList(record);
+                List<BackApplyInfo> allList2 = allList.stream().filter(o -> o.getTypeId().equals(record.getTypeId())).collect(Collectors.toList());
+                if (allList2 != null && allList2.size() > 0) {
+                    res = updateSlt(record, allList2);
+                    if (res == 0) {
+                        throw new RuntimeException("该机具未被领料使用");
+                    }
+                    BackApplyInfo b = allList2.get(0);
+                    record.setTypeId(b.getTypeId());
+                    int postStoreNum = backReceiveMapper.getmaChineByCt(record);
+                    record.setPostStoreNum(postStoreNum);
+                }
+
                 //完成退料的部分，更新 back_check_details 为 is_finished=1，此部分不支持撤回
                 finishBackCheckDetails(record);
 
@@ -268,18 +281,6 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                 record.setMaintenanceNum(maintenanceNum);
                 record.setScrapNum(scrapNum);
             }
-
-            List<BackApplyInfo> allList = backReceiveMapper.getAllList(record);
-            if (allList != null && allList.size() > 0) {
-                res = updateSlt(record, allList);
-                if (res == 0) {
-                    throw new RuntimeException("该机具未被领料使用");
-                }
-                BackApplyInfo b = allList.get(0);
-                record.setTypeId(b.getTypeId());
-                int postStoreNum = backReceiveMapper.getmaChineByCt(record);
-                record.setPostStoreNum(postStoreNum);
-            }
         }
 
         return res;