From aa30d957547e9326265ff9629e0341bd643e5d73 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Tue, 9 May 2023 13:11:16 +0800
Subject: [PATCH] =?UTF-8?q?rev=20acs=E8=87=AA=E5=B7=B1=E4=B8=8B=E5=8F=91?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E4=B8=8D=E8=AF=B7=E6=B1=82wms=E5=8F=96?=
 =?UTF-8?q?=E6=94=BE=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
index f8c6688..d415712 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.AcsConfig;
 import org.nl.acs.agv.server.NDCAgvService;
 import org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun;
 import org.nl.acs.device.service.DeviceService;
@@ -167,7 +168,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             }
 
             Object reqWms = device.getExtraValue().get("reqWms");
-            if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) {
+            if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")&& !StrUtil.startWith(inst.getTask_code(), "-")  && StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(),"1")) {
                 JSONArray req = new JSONArray();
                 JSONObject map = new JSONObject();
                 map.put("vehicle_code", inst.getVehicle_code());
@@ -228,7 +229,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             }
 
             Object reqWms = device.getExtraValue().get("reqWms");
-            if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) {
+            if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true") && !StrUtil.startWith(inst.getTask_code(), "-")  && StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(),"1")) {
                 JSONArray req = new JSONArray();
                 JSONObject map = new JSONObject();
                 map.put("vehicle_code", inst.getVehicle_code());
@@ -285,7 +286,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                 return;
             }
             Object reqWms = device.getExtraValue().get("reqWms");
-            if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) {
+            if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")&& !StrUtil.startWith(inst.getTask_code(), "-")  && StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(),"1")) {
                 JSONArray req = new JSONArray();
                 JSONObject map = new JSONObject();
                 map.put("vehicle_code", inst.getVehicle_code());
@@ -343,7 +344,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                 return;
             }
             Object reqWms = device.getExtraValue().get("reqWms");
-            if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true")) {
+            if (ObjectUtil.isNotEmpty(reqWms) && reqWms.toString().equals("true") && !StrUtil.startWith(inst.getTask_code(), "-")  && StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(),"1")) {
                 JSONArray req = new JSONArray();
                 JSONObject map = new JSONObject();
                 map.put("vehicle_code", inst.getVehicle_code());