From ddc462832f99c124fbcc9653a0878e18768224cd Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 11 六月 2025 16:19:13 +0800
Subject: [PATCH] #修复bug,检索该排全部空库位进行判断

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index f4a0121..b0a575b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -871,7 +871,8 @@
                     waitPakin.setIoStatus("N");
                     waitPakin.setLocNo("");
                     waitPakinService.update(waitPakin, new EntityWrapper<WaitPakin>()
-                            .eq("order_no", waitPakin.getOrderNo())
+//                            .eq("order_no", waitPakin.getOrderNo())
+                            .eq("zpallet",waitPakin.getZpallet())
                             .eq("matnr", waitPakin.getMatnr())
                             .eq("batch", waitPakin.getBatch()));
                 }
@@ -986,7 +987,7 @@
         // 鑾峰彇鐩爣绔�
         Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                 .eq("type_no", wrkMast.getIoType() - 50)
-                .eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
+                .eq("stn_no",wrkMast.getStaNo() ) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
                 .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
         StaDesc staDesc = staDescService.selectOne(wrapper);
         if (Cools.isEmpty(staDesc)) {
@@ -1129,7 +1130,24 @@
         if (Cools.isEmpty(mat)){
             throw new CoolException("鐩爣搴撲綅鍟嗗搧缂栫爜鏈夎锛�");
         }
-        locDetlService.updateMatTurn(param.getLocDetls().get(0).getMatnr(),mat.getMatnr());
+        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getLocDetls().get(0).getMatnr()));
+        if (Cools.isEmpty(locDetls) || locDetls.size()<1){
+            throw new CoolException("寰呬慨鏀瑰晢鍝佹棤搴撳瓨锛屾棤闇�淇敼锛�  鍝佸彿锛�"+param.getLocDetls().get(0).getMatnr());
+        }
+        try {
+            locDetlService.updateMatTurn(param.getLocDetls().get(0).getMatnr(),mat.getMatnr());
+        }catch (Exception e){
+            throw new CoolException("瀵规暟鎹簱淇敼鍑洪敊锛�");
+        }
+        for (LocDetl locDetl:locDetls){
+            // 淇濆瓨璋冩暣璁板綍
+            AdjDetl adjDetl = new AdjDetl();
+            adjDetl.setLocNo(locDetl.getLocNo());
+            adjDetl.setMatnr(mat.getMatnr());
+            adjDetl.setMatnrOld(param.getLocDetls().get(0).getMatnr());
+            adjDetl.setAdjQty(locDetl.getAnfme());
+            adjDetlService.save(adjDetl, userId);
+        }
     }
 
 }

--
Gitblit v1.9.1