From 4801ac8a9dbcd3c64e7851c01efa8d82ac0a201c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 09:31:40 +0800
Subject: [PATCH] no message

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
index 020951a..81f1c12 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java
@@ -534,6 +534,7 @@
 
     /**
      * 娉㈡鍑哄簱棰勮
+     *
      * @param param
      * @return
      */
@@ -1148,7 +1149,7 @@
                         .eq(WaveDetl::getStockIndex, matUniqueKey)
                         .eq(WaveDetl::getWaveId, wave.getId()));
                 if (waveDetl == null) {
-                    throw new CoolException("waveId:" + wave.getId()  + "鐗╂枡锛�" + taskDetl.getMatnr() + "娉㈡鏁版嵁涓嶅瓨鍦�");
+                    throw new CoolException("waveId:" + wave.getId() + "鐗╂枡锛�" + taskDetl.getMatnr() + "娉㈡鏁版嵁涓嶅瓨鍦�");
                 }
                 waveDetl.setWorkQty(waveDetl.getWorkQty() + taskDetl.getAnfme());
                 waveDetl.setUpdateTime(new Date());
@@ -1638,7 +1639,10 @@
 
         for (LocDetl locDetl : param.getLocDetls()) {
             List<OrderOutMergeParam> orders = new ArrayList<>();
-            LocDetl detl = locDetlService.getOne(new LambdaQueryWrapper<LocDetl>().eq(LocDetl::getLocNo, locDetl.getLocNo()));
+            LocDetl detl = locDetlService.getOne(new LambdaQueryWrapper<LocDetl>()
+                    .eq(LocDetl::getMatId, locDetl.getLocId())
+                    .eq(LocDetl::getBatch, locDetl.getLocId())
+                    .eq(LocDetl::getLocNo, locDetl.getLocNo()));
             if (Objects.isNull(detl)) {
                 continue;
             }

--
Gitblit v1.9.1