From c31a99bce92e0a00ecb6d2add26600e2146793d9 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Sun, 11 Dec 2022 16:40:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hd/logPath_IS_UNDEFINED/2022-12-11.0.log | 0 .../ACS请求ERP/2022-12-11.0.log | 0 .../ACS请求WMS/2022-12-11.0.log | 0 .../AGV请求离开/2022-12-11.0.log | 0 hd/logPath_IS_UNDEFINED/NDC/2022-12-11.0.log | 0 .../WMS下发ACS/2022-12-11.0.log | 0 .../反馈AGV请求/2022-12-11.0.log | 0 .../扫码记录/2022-12-11.0.log | 0 .../查询AGV指令状态/2022-12-11.0.log | 0 .../2022-12-11.0.log | 0 .../自动创建指令/2022-12-11.0.log | 0 .../nl/acs/ext/wms/service/AgvWaitUtil.java | 25 ++++++++++++------- .../task/service/impl/TaskServiceImpl.java | 2 +- 13 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 hd/logPath_IS_UNDEFINED/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/ACS请求ERP/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/ACS请求WMS/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/AGV请求离开/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/NDC/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/WMS下发ACS/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/反馈AGV请求/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/扫码记录/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/查询AGV指令状态/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/查询仙知AGV指令状态/2022-12-11.0.log create mode 100644 hd/logPath_IS_UNDEFINED/自动创建指令/2022-12-11.0.log diff --git a/hd/logPath_IS_UNDEFINED/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/ACS请求ERP/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/ACS请求ERP/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/ACS请求WMS/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/ACS请求WMS/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/AGV请求离开/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/AGV请求离开/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/NDC/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/NDC/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/WMS下发ACS/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/WMS下发ACS/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/反馈AGV请求/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/反馈AGV请求/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/扫码记录/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/扫码记录/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/查询AGV指令状态/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/查询AGV指令状态/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/查询仙知AGV指令状态/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/查询仙知AGV指令状态/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/logPath_IS_UNDEFINED/自动创建指令/2022-12-11.0.log b/hd/logPath_IS_UNDEFINED/自动创建指令/2022-12-11.0.log new file mode 100644 index 0000000..e69de29 diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java b/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java index 5d89182..db810ca 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/AgvWaitUtil.java @@ -47,7 +47,7 @@ public class AgvWaitUtil { if (standardConveyorLineDeviceDriver.getMove() == 1 && standardConveyorLineDeviceDriver.getAction() == 1) { feedMap.put("feedbackStatus", "applyTake"); Map feedback = acsToWmsZDService.taskFeedback(feedMap); - int responseCode = Integer.parseInt((String) feedback.get("responseCode")); + int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode"))); String responseMessage = String.valueOf(feedback.get("responseMessage")); if (responseCode == 0) { feedback.put("feedbackStatus", "taking"); @@ -80,8 +80,9 @@ public class AgvWaitUtil { standardCoveyorControlDeviceDriver.writing(1, "0"); feedMap.put("feedbackStatus", "applyTake"); Map feedback = acsToWmsZDService.taskFeedback(feedMap); - int responseCode = Integer.parseInt((String) feedback.get("responseCode")); - String responseMessage = String.valueOf(feedback.get("responseMessage")); + int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode"))); + + String responseMessage = String.valueOf(feedback.get("responseMessage")); if (responseCode == 0) { feedback.put("feedbackStatus", "taking"); acsToWmsZDService.taskFeedback(feedMap); @@ -123,7 +124,8 @@ public class AgvWaitUtil { standardConveyorLineDeviceDriver.writing(2); feedMap.put("feedbackStatus", "takeFinish"); Map feedback = acsToWmsZDService.taskFeedback(feedMap); - int responseCode = (int) feedback.get("responseCode"); + int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode"))); + String responseMessage = (String) feedback.get("responseMessage"); if (responseCode == 0) { map.put("status", 200); @@ -151,7 +153,8 @@ public class AgvWaitUtil { standardCoveyorControlDeviceDriver.writing(1, "2"); feedMap.put("feedbackStatus", "takeFinish"); Map feedback = acsToWmsZDService.taskFeedback(feedMap); - int responseCode = (int) feedback.get("responseCode"); + int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode"))); + String responseMessage = (String) feedback.get("responseMessage"); if (responseCode == 0) { map.put("status", 200); @@ -191,7 +194,8 @@ public class AgvWaitUtil { if (standardConveyorLineDeviceDriver.getMove() == 0 && standardConveyorLineDeviceDriver.getAction() == 2) { feedMap.put("feedbackStatus", "applyPut"); Map feedback = acsToWmsZDService.taskFeedback(feedMap); - int responseCode = Integer.parseInt((String) feedback.get("responseCode")); + int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode"))); + String responseMessage = (String) feedback.get("responseMessage"); if (responseCode == 0) { feedback.put("feedbackStatus", "puting"); @@ -224,7 +228,8 @@ public class AgvWaitUtil { standardCoveyorControlDeviceDriver.writing(1, "0"); feedMap.put("feedbackStatus", "applyPut"); Map feedback = acsToWmsZDService.taskFeedback(feedMap); - int responseCode = Integer.parseInt((String) feedback.get("responseCode")); + int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode"))); + String responseMessage = (String) feedback.get("responseMessage"); if (responseCode == 0) { feedback.put("feedbackStatus", "puting"); @@ -268,7 +273,8 @@ public class AgvWaitUtil { standardConveyorLineDeviceDriver.writing(3); feedMap.put("feedbackStatus", "putFinish"); Map feedback = acsToWmsZDService.taskFeedback(feedMap); - int responseCode = (int) feedback.get("responseCode"); + int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode"))); + String responseMessage = (String) feedback.get("responseMessage"); if (responseCode == 0) { map.put("status", 200); @@ -296,7 +302,8 @@ public class AgvWaitUtil { standardCoveyorControlDeviceDriver.writing(1, "3"); feedMap.put("feedbackStatus", "putFinish"); Map feedback = acsToWmsZDService.taskFeedback(feedMap); - int responseCode = (int) feedback.get("responseCode"); + int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode"))); + String responseMessage = (String) feedback.get("responseMessage"); if (responseCode == 0) { map.put("status", 200); diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index 9f0fcc4..05a2b25 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -902,7 +902,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { String hasWms = acsConfigService.findConfigFromCache().get(AcsConfig.HASWMS); if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { JSONObject map = new JSONObject(); - map.put("task_code",entity.getTask_code()); + map.put("taskCode",entity.getTask_code()); map.put("reason","acs手动取消！"); acsToWmsZDService.taskDeprecate(map); }