From b10df09872f788e8ca75b9b3f3165265c8cf32c3 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 19 五月 2025 15:00:15 +0800
Subject: [PATCH] #pda盘点入库开发
---
src/main/java/com/zy/common/web/WcsController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 00a4bf2..473c209 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -105,7 +105,7 @@
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
- dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(),param.getWeight(), locTypeDto, waitPakins);
break;
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, param.getBarcode());
@@ -321,7 +321,7 @@
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode,Double weight, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -347,6 +347,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("Y");
+ wrkMast.setScWeight(weight);
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
@@ -371,7 +372,8 @@
wrkDetl.setProType(orderDetl.getProType());
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
- wrkDetl.setLuHao(orderDetl.getLuHao());
+// wrkDetl.setLuHao(orderDetl.getLuHao());
+ wrkDetl.setWeight(wrkMast.getScWeight());
wrkDetl.setPacking(orderDetl.getPacking());
wrkDetl.setColor(orderDetl.getColor());
wrkDetl.setWareId(orderDetl.getWareId());
@@ -386,6 +388,7 @@
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
.eq("zpallet", barcode);
WaitPakin setParam = new WaitPakin();
+ setParam.setWeight(weight);//灏嗘暣鎵橀噸閲忚鍏ラ�氱煡妗�
setParam.setLocNo(dto.getLocNo());
setParam.setIoStatus("Y");
setParam.setModiTime(now);
--
Gitblit v1.9.1