From 1aa6b4b46493157a0cafb8b2ecb632b6c0d6e702 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 15 六月 2025 16:31:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index b1bc5a0..22263a3 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -89,11 +89,11 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
if (param.getBarcode().startsWith("11")) {
locTypeDto.setLocType2((short) 1);
- }else if (param.getBarcode().startsWith("13")) {
+ } else if (param.getBarcode().startsWith("13")) {
locTypeDto.setLocType2((short) 2);
- }else if (param.getBarcode().startsWith("16")) {
+ } else if (param.getBarcode().startsWith("16")) {
locTypeDto.setLocType2((short) 3);
- }else {
+ } else {
return R.error("鏈煡鎵樼洏鐮佽鍒�");
}
@@ -185,7 +185,7 @@
// dto.setStaNo(103);
// LocMast locMastxx = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "O"));
// dto.setLocNo(locMastxx.getLocNo());
-// dto.setWorkNo(Integer.parseInt(Math.random() * 1000 + ""));
+// dto.setWorkNo(Integer.parseInt((System.currentTimeMillis() + "").substring(10)));
StartupDto dto = commonService.getLocNo( 1, devpNo,findLocNoAttributeVo, locTypeDto);
if (dto == null) {
@@ -233,10 +233,16 @@
// 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
.eq("zpallet", barcode);
+ List<WaitPakin> waitPakinList = waitPakinService.selectList(wrapper);
+ String tkFlag = null;
+ for (WaitPakin waitPakin : waitPakinList) {
+ tkFlag = waitPakin.getTkFlag();
+ }
WaitPakin setParam = new WaitPakin();
setParam.setLocNo(dto.getLocNo());
setParam.setIoStatus("Y");
setParam.setModiTime(now);
+ setParam.setTkFlag(tkFlag);
if (!waitPakinService.update(setParam, wrapper)) {
throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
}
--
Gitblit v1.9.1