From d8d107072cde858bdc4d23318c56d52e91f28c93 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 21 七月 2023 09:47:13 +0800
Subject: [PATCH] #wrkmast==>sheetNo:徐工汉云拆垛标记  0: 未拆  1: 已拆  2:已处理可下一步(转历史档)

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 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..875140f 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()));
                 }
@@ -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