From 8ae2f2dcfe7e263d42c21ed7644641c780445b95 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 16 一月 2026 17:45:50 +0800
Subject: [PATCH] 空板改余料回库优化

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 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 91df095..1748b6e 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -454,6 +454,7 @@
         }
 
         LocAroundBind binds = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>()
+                .eq("loc_type", LocStsType.LOC_STS_TYPE_O.type)
                 .eq("dev_no", basDevice.getDevNo()).orderBy("is_default", false));
 
         if (Objects.isNull(binds)) {
@@ -564,7 +565,12 @@
             wrkDetl.setUnit(locDel.getUnit());
             wrkDetl.setSpecs(locDel.getSpecs());
             wrkDetl.setBatch(locDel.getBatch());
-            wrkDetl.setAnfme(locDel.getAnfme());
+            //搴撳瓨鏁伴噺
+            wrkDetl.setStockQty(locDel.getAnfme());
+            //鍗曟嵁鏁伴噺
+            wrkDetl.setRealQty(locDto.getAnfme());
+            //鍗曟嵁鏁伴噺
+            wrkDetl.setAnfme(locDto.getAnfme());
             wrkDetl.setAppeTime(now);
             wrkDetl.setAppeUser(userId);
             wrkDetl.setModiTime(now);
@@ -1520,6 +1526,7 @@
             wrkDetls.forEach(wrkDetl -> {
                 WrkDetl wrkDetl1 = new WrkDetl();
                 BeanUtils.copyProperties(wrkDetl, wrkDetl1);
+                wrkDetl1.setAnfme(wrkDetl.getStockQty() - wrkDetl.getAnfme());
                 wrkDetl1.setWrkNo(wokNo);
                 if (!wrkDetlService.insert(wrkDetl1)) {
                     throw new CoolException("浠诲姟妗f槑缁嗕繚瀛樺け璐ワ紒锛�");
@@ -1536,11 +1543,11 @@
             throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
         }
 
-        wrkMast.setWrkCode(null);
-
-        if (!wrkMastService.updateById(wrkMast)) {
-            throw new CoolException("浠诲姟妗f洿鏂板け璐ワ紒锛�");
-        }
+//        wrkMast.setWrkCode(null);
+//
+//        if (!wrkMastService.updateById(wrkMast)) {
+//            throw new CoolException("浠诲姟妗f洿鏂板け璐ワ紒锛�");
+//        }
     }
 
 

--
Gitblit v1.9.1