root/project_promession
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
psh
2023-12-25 18:48:45 +08:00
parent c0454f6ae2
commit abcc8264ef
5 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -1060,7 +1060,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
logServer.deviceExecuteLog(device_code, "", "", "允许关门。"); logServer.deviceExecuteLog(device_code, "", "", "允许关门。");
} }
if (driver.getAction() == 2) { //百济没有2已关，0就当作已关门
if (driver.getAction() == 0) {
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); data = NDCAgvService.sendAgvOneModeInst(phase, index, 0);
} }
} else if (device.getDeviceDriver() instanceof StandardElevatorDeviceDriver) { } else if (device.getDeviceDriver() instanceof StandardElevatorDeviceDriver) {

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -337,9 +337,9 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
}}; }};
JSONObject response = acsToWmsService.shipDeviceUpdate(param); JSONObject response = acsToWmsService.shipDeviceUpdate(param);
if (response == null || 20000 == response.getIntValue("code")) { // if (response == null || 20000 == response.getIntValue("code")) {
this.requiresShipDeviceUpdate = true; this.requiresShipDeviceUpdate = true;
} // }
} }

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor_ckk/SiemensConveyorCkkDeviceDriver.java
View File

@@ -269,9 +269,9 @@ public class SiemensConveyorCkkDeviceDriver extends AbstractOpcDeviceDriver impl
}}; }};
JSONObject response = acsToWmsService.shipDeviceUpdate(param); JSONObject response = acsToWmsService.shipDeviceUpdate(param);
if (response == null || 20000 == response.getIntValue("code")) { // if (response == null || 20000 == response.getIntValue("code")) {
this.requiresShipDeviceUpdate = true; this.requiresShipDeviceUpdate = true;
} // }
} }

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -340,9 +340,9 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
this.instruction_require_time = date; this.instruction_require_time = date;
JSONObject response = acsToWmsService.shipDeviceUpdate(param); JSONObject response = acsToWmsService.shipDeviceUpdate(param);
if (20000 == response.getIntValue("code")) { // if (20000 == response.getIntValue("code")) {
this.requireSucess = true; this.requireSucess = true;
} // }
} }
} }

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/fold_disc_site/FoldDiscSiteDeviceDriver.java
View File

@@ -212,9 +212,9 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
this.instruction_require_time = date; this.instruction_require_time = date;
JSONObject response = acsToWmsService.shipDeviceUpdate(param); JSONObject response = acsToWmsService.shipDeviceUpdate(param);
if (20000 == response.getIntValue("code")) { // if (20000 == response.getIntValue("code")) {
this.requireSucess = true; this.requireSucess = true;
} // }
} }
} }