From b4b2da143af53a7422135abffd5306b282be6a39 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 16 四月 2025 09:46:11 +0800
Subject: [PATCH] 2.0版本
---
src/main/java/com/zy/asrs/controller/OpenController.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 24bd3a6..5d419a7 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -233,13 +233,14 @@
map1.put("ReturnStatus", "1");
map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
} else {
- if (wrkMast.getIoType() == 1) {
+ if (wrkMast.getIoType() == 1||wrkMast.getIoType() == 57|| wrkMast.getIoType() == 53) {
wrkMast.setWrkSts(3L);//鍏ュ簱寮�濮�
- } else if (wrkMast.getIoType() == 11) {
+ } else if (wrkMast.getIoType() == 11 ||wrkMast.getIoType() == 107|| wrkMast.getIoType() == 103 ) {
wrkMast.setWrkSts(13L);//鍑哄簱寮�濮�
}
wrkMast.setModiTime(new Date());
if (wrkMastService.updateById(wrkMast)) {
+ log.info("WMS浠诲姟寮�濮嬫洿鏂�"+wrkMast);
map1.put("ReturnStatus", "0");
map1.put("ErrorMessage", "");
} else {
@@ -279,7 +280,8 @@
wrkMast.setWrkSts(14L);
}
wrkMast.setModiTime(new Date());
- if (wrkMastService.updateById(wrkMast)) {
+ if (wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>().eq("wrk_no",wrkMast.getWrkNo()))) {
+ log.info("WMS浠诲姟瀹屾垚鏇存柊"+wrkMast);
map1.put("ReturnStatus", "0");
map1.put("ErrorMessage", "");
} else {
@@ -296,6 +298,8 @@
return map1;
}
workService.cancelWrkMast(String.valueOf(wrkMast.getWrkNo()),9999L);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
}
}
return map1;
@@ -319,17 +323,7 @@
map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
return map1;
}
- if ((wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 110) && wrkMast.getWrkSts() != 14) {
- wrkMast.setWrkSts(14L);//鍑哄簱鍒扮珯鐐逛笂
- wrkMast.setModiTime(new Date());
- if (wrkMastService.updateById(wrkMast)) {
- map1.put("ReturnStatus", "0");
- map1.put("ErrorMessage", "");
- } else {
- map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast);
- }
- } else if (wrkMast.getIoType() != 101) {
+ if (wrkMast.getIoType() != 101) {
map1.put("ReturnStatus", "0");
map1.put("ErrorMessage", "");
return map1;
--
Gitblit v1.9.1