From 93c192a2dded7c8fc6b64b556a4e263d390b45d1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 13 七月 2024 15:27:35 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
index c2b2bc2..ed35e06 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java
@@ -115,9 +115,19 @@
return map;
}
}else {
- if (task.getTaskSts() == 1000 || task.getMemo().equals(agvTaskParam.getExtra().getValues().getSlotName())){
- task.setTaskSts(1001L);
- taskService.updateById(task);
+ if (task.getTaskSts() == 1000 && task.getMemo().equals(agvTaskParam.getExtra().getValues().getSlotName())){
+ HashMap<String, String> mesMap = new HashMap<>();
+ mesMap.put("taskNo", agvTaskParam.getRobotTaskCode());
+ mesMap.put("contNo",agvTaskParam.getExtra().getValues().getCarrierCode());
+ boolean returnTask4 = toMesHttpRequest(mesMap, "172.18.231.126", "/api/wcs/wcsTaskInfo", "4",agvTaskParam.getExtra().getValues().getSlotName());
+ if (returnTask4){
+ task.setTaskSts(1001L);
+ taskService.updateById(task);
+ log.info("鍑哄簱浠诲姟瀹屾垚鎺ㄩ�乵es"+task.getWmsTaskNo());
+ }else {
+ log.error("鍑哄簱浠诲姟瀹屾垚鎺ㄩ�乵es澶辫触"+task.getWmsTaskNo());
+ }
+
}
}
}else {
@@ -125,6 +135,11 @@
mesMap.put("taskNo", agvTaskParam.getRobotTaskCode());
mesMap.put("contNo",agvTaskParam.getExtra().getValues().getCarrierCode());
boolean returnTask4 = toMesHttpRequest(mesMap, "172.18.231.126", "/api/wcs/wcsTaskInfo", "4",agvTaskParam.getExtra().getValues().getSlotName());
+ if (returnTask4){
+ log.info("鍑哄簱浠诲姟瀹屾垚鎺ㄩ�乵es"+agvTaskParam.getRobotTaskCode());
+ }else {
+ log.error("鍑哄簱浠诲姟瀹屾垚鎺ㄩ�乵es澶辫触"+agvTaskParam.getRobotTaskCode());
+ }
}
map.put("code","0");
@@ -239,6 +254,7 @@
map.put("message", "澶辫触锛岃姹傚弬鏁颁负绌�");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
if (Cools.isEmpty(param.getRequestPK()) || Cools.isEmpty(param.getContNo()) || Cools.isEmpty(param.getTrkPrty()) || Cools.isEmpty(param.getToPos())){
@@ -246,6 +262,7 @@
map.put("message", "澶辫触锛岃姹傚弬鏁颁负绌�");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
@@ -255,6 +272,7 @@
map.put("message", "澶辫触锛屽瓨鍦ㄧ浉鍚岀紪鍙风殑浠诲姟");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
String sta = "06YZ";
@@ -270,6 +288,7 @@
map.put("message", httpRequest);
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
}catch (Exception e){
@@ -277,6 +296,7 @@
map.put("message", "杞彂AGV浠诲姟鍑洪敊");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
}
@@ -296,6 +316,7 @@
map.put("message", "鐢熸垚浠诲姟鍑洪敊");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}finally {
int code = (int) inTask.get("code");
@@ -328,6 +349,7 @@
map.put("message", "鐢熸垚浠诲姟鍑洪敊");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}finally {
int code = (int) outTask.get("code");
@@ -354,6 +376,7 @@
map.put("message", httpRequest);
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
}catch (Exception e){
@@ -361,6 +384,7 @@
map.put("message", "杞彂AGV浠诲姟鍑洪敊");
map.put("result", "");
map.put("requestPK", param.getRequestPK());
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
@@ -370,6 +394,7 @@
map.put("result", "");
map.put("requestPK", param.getRequestPK());
}
+ log.info("杩斿洖mes淇℃伅:"+JSONObject.toJSONString(map));
return map;
}
public static String getWMStoWCSLocNo(String loc){
--
Gitblit v1.9.1