From 4e32eae9008b56a346f52710d86241890a0ae1a7 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 27 十一月 2025 19:59:00 +0800
Subject: [PATCH] #库存调整

---
 src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
index 1380b77..28004d3 100644
--- a/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CheckOrderServiceImpl.java
@@ -61,9 +61,15 @@
         }
         List<LocDto> locDtos = new ArrayList<>();
         for (CheckOrderDetl checkOrderDetl : checkOrderDetls) {
+            if (!checkOrderDetl.getStatus().equals(1)){
+                continue;
+            }
             LocDto locDto = new LocDto(checkOrderDetl.getLocNo(), checkOrderDetl.getMatnr(), checkOrderDetl.getMaktx(), checkOrderDetl.getBatch(), checkOrderDetl.getOrderNo(),
                     checkOrderDetl.getAnfme().doubleValue());
             LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", checkOrderDetl.getLocNo()));
+            if (!locMast.getLocSts().equals("F")){
+                continue;
+            }
             LocDetl locDetl = locDetlService.selectById(checkOrderDetl.getLocDetlId());
             locDto.setFrozen(locDetl.getFrozen());
             locDto.setFrozenLoc(locMast.getFrozen());
@@ -96,11 +102,7 @@
             if(Cools.isEmpty(wrkDetl.getOrderNo())){
                 throw new CoolException("鏄庣粏鏁版嵁鏈夎锛屾棤璁㈠崟鍙锋暟鎹�");
             }
-            CheckOrderDetl checkOrderDetl = checkOrderDetlService.selectOne(new EntityWrapper<CheckOrderDetl>()
-                    .eq("loc_no", wrkMast.getSourceLocNo())
-                    .eq("matnr", wrkDetl.getMatnr())
-                    .eq("batch", wrkDetl.getBatch())
-                    .eq("order_no", wrkDetl.getOrderNo()));
+            CheckOrderDetl checkOrderDetl = checkOrderDetlService.selectById(wrkDetl.getOrderId());
             if(Cools.isEmpty(checkOrderDetl)){
                 throw new CoolException("鏄庣粏鏁版嵁鏈夎锛屾湭鎵惧埌鐩樼偣鍗曟暟鎹�");
             }
@@ -126,6 +128,7 @@
         }
 
         for (CheckOrderDetl checkOrderDetl: checkTaskListParam.getCheckOrderDetlList()){
+            checkOrderDetl.setDiffQty(checkOrderDetl.getWorkQty().subtract(checkOrderDetl.getAnfme()));
             checkOrderDetl.setStatus(3);
             if (!checkOrderDetlService.updateById(checkOrderDetl)){
                 throw new CoolException("鏇存柊鐩樼偣鐘舵�佸け璐�");

--
Gitblit v1.9.1