更新

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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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);

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);
         }