From 1e078b242182dd495ac238394264bf7295aadf24 Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期三, 15 十月 2025 07:58:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 72 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 37 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..af999eb 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -21,6 +21,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2022/4/8
@@ -233,13 +234,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 {
@@ -277,9 +279,12 @@
wrkMast.setWrkSts(4L);//4.浠诲姟缁撴潫
} else if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 110) {
wrkMast.setWrkSts(14L);
+ }else if(wrkMast.getIoType() == 11) {
+ wrkMast.setWrkSts(4L);
}
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 +301,8 @@
return map1;
}
workService.cancelWrkMast(String.valueOf(wrkMast.getWrkNo()),9999L);
+ map1.put("ReturnStatus", "0");
+ map1.put("ErrorMessage", "");
}
}
return map1;
@@ -305,48 +312,39 @@
* 鍑哄簱---鐩殑鍦版惉绂�
*/
@RequestMapping("/leave/task")
- public HashMap<String, Object> leaveTask(@RequestBody HashMap<String, Object> map) {
- String taskNo = map.get("TaskNo") + "";
+ public R leaveTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = String.valueOf(map.get("taskNo"));
+ String status = String.valueOf(map.get("status"));
HashMap<String, Object> map1 = new HashMap<>();
if (Cools.isEmpty(taskNo)) {
- map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
+ return R.error("浠诲姟鍙蜂负绌�");
} else {
-
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
if (wrkMast == null) {
- map1.put("ReturnStatus", "1");
- 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) {
- map1.put("ReturnStatus", "0");
- map1.put("ErrorMessage", "");
- return map1;
- } else {
- 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);
- }
+ return R.error("娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
}
+ if (status.equals("complete")) {
+ // 鍏ュ簱 + 搴撲綅杞Щ
+ if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
+ wrkMast.setWrkSts(4L);
+ // 鍑哄簱
+ } else if (wrkMast.getWrkSts() > 10) {
+ wrkMast.setWrkSts(14L);
+ }
+ Date now = new Date();
+ wrkMast.setWrkSts(14L);//鍑哄簱鍒扮珯鐐逛笂
+ wrkMast.setCrnStrTime(DateUtils.calculate(now, 1L, TimeUnit.SECONDS, true));
+ wrkMast.setCrnEndTime(now);
+ wrkMast.setModiTime(now);
+ wrkMastService.updateById(wrkMast);
+ return R.ok();
+ } else if (status.equals("cancel")) {
+ workService.cancelWrkMast(taskNo, 9527L);
+ return R.ok();
+ }
}
- return map1;
+ return R.error();
}
}
--
Gitblit v1.9.1