From a451e2d9e1abcae3286dfcfec4103aad1ee64085 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 08 四月 2025 15:08:54 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 75 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 34f7fda..78f28ef 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -121,10 +121,30 @@
@RequestMapping(value = "/taskWrk/delete/auth")
@ManagerAuth
- public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
- taskWrkService.deleteById(id);
+ public R delete(@RequestParam String taskNo){
+// for (Long id : ids){
+// taskWrkService.deleteById(id);
+// }
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error();
}
+ Date now = new Date();
+ taskWrk.setMemo("鎵嬪姩寮哄埗鍒犻櫎锛侊紒锛�");
+ taskWrk.setModiTime(now);
+ taskWrk.setModiUser(getUserId());
+ if (!taskWrkService.updateById(taskWrk)){
+ log.error("鍒犻櫎澶辫触" + taskWrk);
+ return R.error("鍒犻櫎澶辫触" + taskWrk);
+
+ }
+ if (taskWrkService.saveToHistoryD(taskWrk.getTaskNo()) == 0) {
+ log.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+ return R.error("浠诲姟妗ｈ浆浠诲姟鍘嗗彶妗ｅけ璐�" + taskWrk);
+
+ }
+ //鍒犻櫎浠诲姟
+ taskWrkService.delete(new EntityWrapper<TaskWrk>().eq("task_no", taskWrk.getTaskNo()));
return R.ok();
}
@@ -212,6 +232,7 @@
locMast.setBarcode(taskWrk.getBarcode());
}
+ String response="";
try{
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
@@ -219,7 +240,7 @@
headParam.put("ioType",taskWrk.getIoType());
headParam.put("barcode",taskWrk.getBarcode());
// headParam.put("reportTime",new Date());
- String response;
+ log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
response = new HttpHandler.Builder()
// .setHeaders(headParam)
.setUri(wmsUrl)
@@ -227,7 +248,7 @@
.setJson(JSON.toJSONString(headParam))
.build()
.doPost();
- log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms", taskWrk);
+
JSONObject jsonObject = JSON.parseObject(response);
apiLogService.save("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms"
,wmsUrl+taskStatusFeedbackPath
@@ -238,12 +259,15 @@
,true
);
}catch (Exception e){
- log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶辫触", taskWrk);
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶眥},杩斿洖鍊�={}", taskWrk,response);
+// throw new CoolException(e);
}
+ Date now = new Date();
+ locMast.setModiTime(now);
locMastService.updateById(locMast);
taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
- taskWrk.setModiTime(new Date());
+ taskWrk.setModiTime(now);
+ taskWrk.setCompleteTime(now);
taskWrkService.updateById(taskWrk);
return R.ok();
}
@@ -261,11 +285,13 @@
Date now = new Date();
taskWrk.setStatus(TaskStatusType.CANCEL.id);
taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setCancelTime(now);
try{
taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
}catch (Exception e){
- taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
+ taskWrk.setModiUser(1111L);//鎿嶄綔鍛�
}
+ String response="";
try{
HashMap<String, Object> headParam = new HashMap<>();
headParam.put("taskNo",taskWrk.getTaskNo());
@@ -273,7 +299,8 @@
headParam.put("ioType",taskWrk.getIoType());
headParam.put("barcode",taskWrk.getBarcode());
// headParam.put("reportTime",new Date());
- String response;
+
+ log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wm={}", taskWrk);
response = new HttpHandler.Builder()
// .setHeaders(headParam)
.setUri(wmsUrl)
@@ -281,7 +308,6 @@
.setJson(JSON.toJSONString(headParam))
.build()
.doPost();
- log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms", taskWrk);
JSONObject jsonObject = JSON.parseObject(response);
apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
,wmsUrl+taskStatusFeedbackPath
@@ -292,8 +318,8 @@
,true
);
}catch (Exception e){
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触", taskWrk);
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk,response);
+// throw new CoolException(e);
}
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
@@ -327,5 +353,28 @@
return "鏈煡";
}
}
+ @PostMapping(value = "/taskWrk/returnWorkingCondition/auth")
+ @ManagerAuth(memo = "閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟")
+ public R returnWorkingCondition(@RequestParam String taskNo) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==12){
+ taskWrk.setWrkSts(11);
+ if(!taskWrkService.updateById(taskWrk)){
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
+ taskWrk.setWrkSts(2);
+ taskWrkService.updateById(taskWrk);
+ if(!taskWrkService.updateById(taskWrk)){
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ }else{
+ return R.error("浠诲姟鐘舵�佷笉瀵规棤娉曢噸鏂扮粰鍫嗗灈鏈轰笅鍙戜换鍔�");
+ }
+
+ }
+
}
--
Gitblit v1.9.1