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 81f5362..284f407 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 @@ -1060,7 +1060,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic logServer.deviceExecuteLog(device_code, "", "", "允许关门。"); } - if (driver.getAction() == 2) { + //百济没有2已关,0就当作已关门 + if (driver.getAction() == 0) { data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); } } else if (device.getDeviceDriver() instanceof StandardElevatorDeviceDriver) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index 2dfc6b4..4e06081 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -337,9 +337,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme }}; JSONObject response = acsToWmsService.shipDeviceUpdate(param); - if (response == null || 20000 == response.getIntValue("code")) { +// if (response == null || 20000 == response.getIntValue("code")) { this.requiresShipDeviceUpdate = true; - } +// } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java index 06a7dab..56e3321 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java @@ -269,9 +269,9 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl }}; JSONObject response = acsToWmsService.shipDeviceUpdate(param); - if (response == null || 20000 == response.getIntValue("code")) { +// if (response == null || 20000 == response.getIntValue("code")) { this.requiresShipDeviceUpdate = true; - } +// } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java index 3229939..11dbae9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java @@ -340,9 +340,9 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp this.instruction_require_time = date; JSONObject response = acsToWmsService.shipDeviceUpdate(param); - if (20000 == response.getIntValue("code")) { +// if (20000 == response.getIntValue("code")) { this.requireSucess = true; - } +// } } } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java index 901cdd6..85b3bbb 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java @@ -212,9 +212,9 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements this.instruction_require_time = date; JSONObject response = acsToWmsService.shipDeviceUpdate(param); - if (20000 == response.getIntValue("code")) { +// if (20000 == response.getIntValue("code")) { this.requireSucess = true; - } +// } } }