psh 1 year ago
parent
commit
abcc8264ef
  1. 3
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
  2. 4
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
  3. 4
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java
  4. 4
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
  5. 4
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java

3
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) {

4
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;
}
// }
}

4
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;
}
// }
}

4
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;
}
// }
}
}

4
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;
}
// }
}
}

Loading…
Cancel
Save