From a936c187f9d7f389a711e001739384dcbd9278e2 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 31 三月 2025 13:50:53 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 136 +++++++++++++++++++++++++++++----------------
1 files changed, 87 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4217e4e..24bd3a6 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -8,6 +8,7 @@
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WorkService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
@@ -38,12 +39,14 @@
private OpenService openService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private WorkService workService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -218,30 +221,30 @@
* 浠诲姟寮�濮�
*/
@RequestMapping("/start/task")
- public HashMap<String ,Object> startTask(@RequestBody HashMap<String,Object> map) {
- String taskNo = map.get("TaskNo")+"";
- HashMap<String ,Object> map1 = new HashMap<>();
- if(Cools.isEmpty(taskNo)){
+ public HashMap<String, Object> startTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = map.get("TaskNo") + "";
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
map1.put("ReturnStatus", "1");
map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
- }else{
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",Integer.valueOf(taskNo)));
- if(wrkMast == null){
+ } 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);
- }else{
- if(wrkMast.getIoType()==1){
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ } else {
+ if (wrkMast.getIoType() == 1) {
wrkMast.setWrkSts(3L);//鍏ュ簱寮�濮�
- }else if(wrkMast.getIoType()==11){
+ } else if (wrkMast.getIoType() == 11) {
wrkMast.setWrkSts(13L);//鍑哄簱寮�濮�
}
wrkMast.setModiTime(new Date());
- if(wrkMastService.updateById(wrkMast)){
+ if (wrkMastService.updateById(wrkMast)) {
map1.put("ReturnStatus", "0");
map1.put("ErrorMessage", "");
- }else{
+ } else {
map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�"+wrkMast);
+ map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�" + wrkMast);
}
}
}
@@ -252,62 +255,97 @@
* 鎼繍鍒扮洰鐨勫湴
*/
@RequestMapping("/destination/task")
- public HashMap<String ,Object> destinationTask(@RequestBody HashMap<String,Object> map) {
- String taskNo = map.get("TaskNo")+"";
- HashMap<String ,Object> map1 = new HashMap<>();
- if(Cools.isEmpty(taskNo)){
+ public HashMap<String, Object> destinationTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = map.get("TaskNo") + "";
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
map1.put("ReturnStatus", "1");
map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
- }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);
- }else{
- if(wrkMast.getIoType()==1){
- wrkMast.setWrkSts(4L);//浠诲姟缁撴潫
- }else if(wrkMast.getIoType()==11){
- wrkMast.setWrkSts(13L);//鍑哄簱鍒扮珯鐐逛笂
- }
- wrkMast.setModiTime(new Date());
- if(wrkMastService.updateById(wrkMast)){
- map1.put("ReturnStatus", "0");
- map1.put("ErrorMessage", "");
- }else{
+ } else {
+ //浠诲姟瀹屾垚
+ if (map.get("Result").equals(1)) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.valueOf(taskNo)));
+ if (wrkMast == null) {
map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�"+wrkMast);
+ map1.put("ErrorMessage", "娌℃湁鎵惧埌璇ヤ换鍔″彿锛�" + taskNo);
+ } else {
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10) {
+ wrkMast.setWrkSts(4L);//浠诲姟缁撴潫
+ } else if (wrkMast.getIoType() == 101) {
+ wrkMast.setWrkSts(13L);//鍑哄簱鍒扮珯鐐逛笂
+ } else if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
+ wrkMast.setWrkSts(4L);//4.浠诲姟缁撴潫
+ } else if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107 || wrkMast.getIoType() == 110) {
+ 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 {
+ //浠诲姟鍙栨秷
+ 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;
+ }
+ workService.cancelWrkMast(String.valueOf(wrkMast.getWrkNo()),9999L);
}
}
return map1;
}
/**
- * 鎼繍鍒扮洰鐨勫湴
+ * 鍑哄簱---鐩殑鍦版惉绂�
*/
@RequestMapping("/leave/task")
- public HashMap<String ,Object> leaveTask(@RequestBody HashMap<String,Object> map) {
- String taskNo = map.get("TaskNo")+"";
- HashMap<String ,Object> map1 = new HashMap<>();
- if(Cools.isEmpty(taskNo)){
+ public HashMap<String, Object> leaveTask(@RequestBody HashMap<String, Object> map) {
+ String taskNo = map.get("TaskNo") + "";
+ HashMap<String, Object> map1 = new HashMap<>();
+ if (Cools.isEmpty(taskNo)) {
map1.put("ReturnStatus", "1");
map1.put("ErrorMessage", "浠诲姟鍙蜂负绌�");
- }else{
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",Integer.valueOf(taskNo)));
- if(wrkMast == null){
+ } 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);
- }else{
+ 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)){
+ if (wrkMastService.updateById(wrkMast)) {
map1.put("ReturnStatus", "0");
map1.put("ErrorMessage", "");
- }else{
+ } else {
map1.put("ReturnStatus", "1");
- map1.put("ErrorMessage", "鏇存柊浠诲姟鐘舵�佸け璐�"+wrkMast);
+ 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 map1;
}
--
Gitblit v1.9.1