From 88e6db11cf5c11e9f85c0a9f9a6c76b6e2ed61bf Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期五, 10 四月 2026 13:05:12 +0800
Subject: [PATCH] 1.数字孪生--近期订单（默认7天）优化
---
src/main/java/com/zy/common/web/WcsController.java | 18 +++++++++++++++---
1 files changed, 15 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 1f202e0..c7aef46 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -15,12 +15,15 @@
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.web.param.SearchLocParam;
+import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -58,8 +61,12 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
- public synchronized R getLocNo(@RequestBody SearchLocParam param) {
+ public synchronized R getLocNo(@RequestBody SearchLocParam param, HttpServletRequest request) {
long startTime = System.currentTimeMillis();
+ if (param != null && request != null) {
+ log.info("[getLocNo] cache: {}", JSON.toJSONString(param));
+ request.setAttribute("cache", param);
+ }
String barcode = param == null ? null : param.getBarcode();
Integer sourceStaNo = param == null ? null : param.getSourceStaNo();
try {
@@ -93,7 +100,7 @@
// }
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
if (Cools.isEmpty(waitPakins)) {
- return R.error("璇峰厛娣诲姞鍏ュ簱閫氱煡妗�");
+ return R.error("璇峰厛鏀惰揣鍚庡啀鍏ュ簱");
// WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
// if (wrkMast != null && wrkMast.getIoType() == 103) {
// return R.parse(CodeRes.PICK_600);
@@ -134,6 +141,11 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNoEntity);
if (waitPakins.get(0).getMatnr().equals("emptyPallet")) {
locTypeDto.setLocType2((short) 1);
+ }
+
+ // 鍏ュ弬閲嶉噺鏈�澶氫袱浣嶅皬鏁�
+ if (param.getWeight() != null) {
+ param.setWeight(param.getWeight().setScale(2, RoundingMode.HALF_UP));
}
StartupDto dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, waitPakins,param.getWeight());
@@ -498,7 +510,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
- wrkDetl.setWeight(waitPakin.getWeight());
+ wrkDetl.setWeight(wrkMast.getScWeight());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
--
Gitblit v1.9.1