From aa538cf6967e63cf28b0aee43d3812b4cd468485 Mon Sep 17 00:00:00 2001
From: taisheng <taisheng@qq.com>
Date: 星期五, 09 五月 2025 15:40:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 55 ++++++++++++++++++++++++++++---------------------------
src/main/resources/application.yml | 2 +-
2 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index b891f3b..3c2815c 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -291,33 +291,34 @@
taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
}
String response="";
- try{
- HashMap<String, Object> headParam = new HashMap<>();
- 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(TaskExecCallback)
- .setJson(JSON.toJSONString(headParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
- ,wmsUrl+TaskExecCallback
- ,null
- ,"127.0.0.1"
- ,JSON.toJSONString(headParam)
- ,response
- ,true
- );
- }catch (Exception e){
- log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk,response);
-// throw new CoolException(e);
- }
+// try{
+// HashMap<String, Object> headParam = new HashMap<>();
+// 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(TaskExecCallback)
+// .setJson(JSON.toJSONString(headParam))
+// .build()
+// .doPost();
+// JSONObject jsonObject = JSON.parseObject(response);
+// apiLogService.save("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms"
+// ,wmsUrl+TaskExecCallback
+// ,null
+// ,"127.0.0.1"
+// ,JSON.toJSONString(headParam)
+// ,response
+// ,true
+// );
+// }catch (Exception e){
+// log.error("wcs鎵嬪姩鍙栨秷浠诲姟涓婃姤wms澶辫触={},杩斿洖鍊�={}", taskWrk,response);
+//// throw new CoolException(e);
+// }
+ taskWrk.setWrkSts(9);
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 537b138..1b20df4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -62,7 +62,7 @@
# 绉诲簱鐢宠鎺ュ彛
movePath: api/InterFace/get_InterFace_TestStorage
wcs:
- urlWcs: 10.10.20.200:9090/wcs
+ urlWcs: 127.0.0.1:9090/wcs
#鍏ュ簱浠诲姟鐢宠
inboundTaskApplyPathWcs: openapi/createInTask
#鍑哄簱浠诲姟鐢宠
--
Gitblit v1.9.1