From fcd924c9be6fc3811f4d41cbeee31ad8dc01fd97 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 08 七月 2025 19:29:27 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/manage/OutManage.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 71af48e..f9adb77 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
@@ -1226,7 +1226,7 @@
/**
* @author Ryan
* @date 2025/7/4
- * @description: 鐢熼潰鎷ｈ揣鏄庣粏
+ * @description: 鐢熸垚鎷ｈ揣鏄庣粏
* @version 1.0
*/
@Transactional(rollbackFor = Exception.class)
@@ -1496,12 +1496,12 @@
continue;
}
OrderOutMergeDto outMergeParam = new OrderOutMergeDto();
- outMergeParam.setAnfme(outLocDetl.getAnfme())
- .setLocNo(outLocDetl.getLocNo())
- .setLocDetlId(detl.getId())
- .setLocId(detl.getLocId())
- .setMatnr(outLocDetl.getMatnr())
- .setBatch(detl.getBatch());
+ outMergeParam.setAnfme(outLocDetl.getAnfme());
+ outMergeParam.setLocNo(outLocDetl.getLocNo());
+ outMergeParam.setLocDetlId(detl.getId());
+ outMergeParam.setLocId(detl.getLocId());
+ outMergeParam.setMatnr(outLocDetl.getMatnr());
+ outMergeParam.setBatch(detl.getBatch());
orders.add(outMergeParam);
//鏍规嵁搴撲綅ID鍒嗙粍
--
Gitblit v1.9.1