From 20b72a000801cf006bfe1f487baabc110594832f Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期日, 05 四月 2026 17:55:42 +0800
Subject: [PATCH] 重量
---
src/main/java/com/zy/common/web/WcsController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index f5adbea..1f202e0 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -20,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -135,7 +136,7 @@
locTypeDto.setLocType2((short) 1);
}
- StartupDto dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins);
+ StartupDto dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins,param.getWeight());
log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
return R.ok().add(dto);
} finally {
@@ -444,7 +445,7 @@
* 鍏ㄦ澘鍏ュ簱
*/
@Transactional
- public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins) {
+ public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins, BigDecimal weight) {
long startTime = System.currentTimeMillis();
try {
// 婧愮珯鐐圭姸鎬佹娴�
@@ -478,6 +479,7 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("N"); // 绌烘澘
wrkMast.setLinkMis("Y");
+ wrkMast.setScWeight(weight);
// 鎶� referenceId/orderNo 閫忎紶鍒板伐浣滀富妗ｏ紝渚夸簬浣滀笟瀹屾垚鍚庣户缁洖浼犵粰 IoT銆�
wrkMast.setUserNo(waitPakins.get(0).getOrderNo());
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
@@ -496,6 +498,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setWeight(waitPakin.getWeight());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
@@ -521,6 +524,7 @@
if (locMast.getLocSts().equals("O")) {
locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
locMast.setModiTime(now);
+ locMast.setScWeight(weight);
if (!locMastService.updateById(locMast)) {
throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
}
--
Gitblit v1.9.1