From b59ec69cc3d75df8ad115c22edc9c07312351169 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 24 三月 2025 09:33:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxjdzwcs' into jxjdzwcs
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 83 ++++++++++++++++++++++++++---------------
1 files changed, 52 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 93bb195..b9b6763 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -45,8 +45,8 @@
@Autowired
private LocMastService locMastService;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
+ @Value("${wms.TaskExecCallback}")
+ private String TaskExecCallback;
@Autowired
private ApiLogService apiLogService;
@@ -165,12 +165,12 @@
return R.ok();
}
- @PostMapping(value = "/taskWrk/distribute/auth")
- @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
- public R distribute(@RequestParam String taskNo) {
- taskWrkService.distribute(taskNo, getUserId());
- return R.ok();
- }
+// @PostMapping(value = "/taskWrk/distribute/auth")
+// @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
+// public R distribute(@RequestParam String taskNo) {
+// taskWrkService.distribute(taskNo, getUserId());
+// return R.ok();
+// }
@PostMapping(value = "/taskWrk/complete/auth")
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
@@ -212,25 +212,24 @@
locMast.setBarcode(taskWrk.getBarcode());
}
+ String response="";
try{
HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("taskNo",taskWrk.getTaskNo());
- headParam.put("status",taskWrk.getStatus());
- headParam.put("ioType",taskWrk.getIoType());
- headParam.put("barcode",taskWrk.getBarcode());
- headParam.put("reportTime",new Date());
- String response;
+ headParam.put("TaskNo",taskWrk.getTaskNo());
+ headParam.put("Result",1);
+// headParam.put("reportTime",new Date());
+ log.info("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms={}", taskWrk);
response = new HttpHandler.Builder()
// .setHeaders(headParam)
.setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
+ .setPath(TaskExecCallback)
.setJson(JSON.toJSONString(headParam))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
- ,wmsUrl+taskStatusFeedbackPath
+ apiLogService.save("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms"
+ ,wmsUrl+TaskExecCallback
,null
,"127.0.0.1"
,JSON.toJSONString(headParam)
@@ -238,14 +237,37 @@
,true
);
}catch (Exception e){
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触", taskWrk);
- throw new CoolException("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms澶辫触");
+ log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶眥},杩斿洖鍊�={}", taskWrk,response);
+// throw new CoolException(e);
}
locMastService.updateById(locMast);
taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
taskWrk.setModiTime(new Date());
taskWrkService.updateById(taskWrk);
return R.ok();
+ }
+
+ @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("浠诲姟鐘舵�佷笉瀵规棤娉曢噸鏂扮粰鍫嗗灈鏈轰笅鍙戜换鍔�");
+ }
+
}
@PostMapping(value = "/taskWrk/cancel/auth")
@@ -266,25 +288,24 @@
}catch (Exception e){
taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
}
+ String response="";
try{
HashMap<String, Object> headParam = new HashMap<>();
- headParam.put("taskNo",taskWrk.getTaskNo());
- headParam.put("status",taskWrk.getStatus());
- headParam.put("ioType",taskWrk.getIoType());
- headParam.put("barcode",taskWrk.getBarcode());
- headParam.put("reportTime",new Date());
- String response;
+ headParam.put("TaskNo",taskWrk.getTaskNo());
+ headParam.put("Result",0);
+// headParam.put("reportTime",new Date());
+
+ log.info("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wm={}", taskWrk);
response = new HttpHandler.Builder()
// .setHeaders(headParam)
.setUri(wmsUrl)
- .setPath(taskStatusFeedbackPath)
+ .setPath(TaskExecCallback)
.setJson(JSON.toJSONString(headParam))
.build()
.doPost();
-
JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs娲惧彂鍏ュ簱浠诲姟涓婃姤wms"
- ,wmsUrl+taskStatusFeedbackPath
+ apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
+ ,wmsUrl+TaskExecCallback
,null
,"127.0.0.1"
,JSON.toJSONString(headParam)
@@ -292,8 +313,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);
--
Gitblit v1.9.1