From 21fceb5f1fc76fe0a9dc3099667b823c126247ea Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Mon, 12 Dec 2022 22:23:12 +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

---
 .../StandardCoveyorControlDeviceDriver.java            |  2 +-
 .../java/org/nl/acs/ext/wms/service/AgvWaitUtil.java   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java
index b6a45da..6f2c5a3 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_conveyor_control/StandardCoveyorControlDeviceDriver.java
@@ -230,7 +230,7 @@ public class StandardCoveyorControlDeviceDriver extends AbstractOpcDeviceDriver
         Map<String, Object> itemMap = new HashMap<String, Object>();
         itemMap.put(to_param, value);
         ReadUtil.write(itemMap, server);
-        logServer.log("kong", "write", String.valueOf(type), param.toString(), String.valueOf(param), "200", "", "");
+        logServer.log("kong", "write", String.valueOf(type), to_param.toString(), String.valueOf(param), "200", "", "");
 
     }
 
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 2590138..07db712 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
@@ -49,7 +49,7 @@ public class AgvWaitUtil {
                 int responseCode = Integer.parseInt(String.valueOf(feedback.get("responseCode")));
                 String responseMessage = String.valueOf(feedback.get("responseMessage"));
                 if (responseCode == 0) {
-                    feedback.put("feedbackStatus", "taking");
+                    feedMap.put("feedbackStatus", "taking");
                     acsToWmsZDService.taskFeedback(feedMap);
                     map.put("status", 200);
                     map.put("message", "请求成功");
@@ -83,7 +83,7 @@ public class AgvWaitUtil {
 
                 String responseMessage = String.valueOf(feedback.get("responseMessage"));
                 if (responseCode == 0) {
-                    feedback.put("feedbackStatus", "taking");
+                    feedMap.put("feedbackStatus", "taking");
                     acsToWmsZDService.taskFeedback(feedMap);
                     map.put("status", 200);
                     map.put("message", "请求成功");
@@ -195,7 +195,7 @@ public class AgvWaitUtil {
 
                 String responseMessage = (String.valueOf(feedback.get("responseMessage")));
                 if (responseCode == 0) {
-                    feedback.put("feedbackStatus", "puting");
+                    feedMap.put("feedbackStatus", "puting");
                     acsToWmsZDService.taskFeedback(feedMap);
                     map.put("status", 200);
                     map.put("message", "请求成功");
@@ -213,7 +213,7 @@ public class AgvWaitUtil {
                 map.put("message", "请求失败,终点位置有货!move = " + standardConveyorLineDeviceDriver.getMove() + "action = " + standardConveyorLineDeviceDriver.getAction());
                 type = "erro";
                 logServer.log(task_code, "waitpointRequest", type, param.toString(), String.valueOf(map), "400", "api/agv/waitpointRequest", instructionDto.getVehicle_code());
-                throw new BadRequestException("请求失败,终点位置有货!");
+                throw new BadRequestException("请求失败,终点位置有货或不允许放货!");
             }
         }
         if (device.getDeviceDriver() instanceof StandardCoveyorControlDeviceDriver) {
@@ -229,7 +229,7 @@ public class AgvWaitUtil {
 
                 String responseMessage = (String.valueOf(feedback.get("responseMessage")));
                 if (responseCode == 0) {
-                    feedback.put("feedbackStatus", "puting");
+                    feedMap.put("feedbackStatus", "puting");
                     acsToWmsZDService.taskFeedback(feedMap);
                     map.put("status", 200);
                     map.put("message", "请求成功");