From bfc2fee36897a0e6ca4d77701cf4d8f6a7281aec Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 04 九月 2024 08:07:30 +0800
Subject: [PATCH] 对程序进行优化
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 69497df..df10756 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;
@@ -215,23 +215,21 @@
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("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
+ ,wmsUrl+TaskExecCallback
,null
,"127.0.0.1"
,JSON.toJSONString(headParam)
@@ -240,7 +238,7 @@
);
}catch (Exception e){
log.error("wcs鎵嬪姩瀹屾垚浠诲姟涓婃姤wms澶眥},杩斿洖鍊�={}", taskWrk,response);
- throw new CoolException(e);
+// throw new CoolException(e);
}
locMastService.updateById(locMast);
taskWrk.setStatus(7);//鎵嬪姩瀹屾垚浠诲姟
@@ -270,23 +268,21 @@
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("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
+ ,wmsUrl+TaskExecCallback
,null
,"127.0.0.1"
,JSON.toJSONString(headParam)
@@ -295,7 +291,7 @@
);
}catch (Exception e){
log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk,response);
- throw new CoolException(e);
+// throw new CoolException(e);
}
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
--
Gitblit v1.9.1