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