From ab0ab891cc2eeae24fe621412749cd95731e6d98 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 11 七月 2024 11:11:18 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 1 +
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/OpenController.java | 21 ++++++++++++++++++---
2 files changed, 19 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..c002a4f 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");
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
index 896d325..a47b94d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -78,6 +78,7 @@
if (httpRequest){
task.setTaskSts(1000L);
taskService.updateById(task);
+ log.info("鍑哄簱浠诲姟鎺ㄩ�乺gv"+task.getWmsTaskNo());
}else {
log.error("鍑哄簱浠诲姟鎺ㄩ�乺gv澶辫触"+task.getWmsTaskNo());
}
--
Gitblit v1.9.1