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:
张江玮
2023-08-14 17:57:45 +08:00
parent 9e6ebe8613
commit 445510b81a
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,6 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
@Override @Override
public void execute() { public void execute() {
String message = null;
try { try {
devicecode = this.getDeviceCode(); devicecode = this.getDeviceCode();
mode = this.itemProtocol.getMode(); mode = this.itemProtocol.getMode();

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

@@ -152,10 +152,15 @@ public class FoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implements
break; break;
case 2: case 2:
if (!this.requireSucess) { if (!this.requireSucess) {
int max_emptypalletnum = Integer.parseInt(this.getDevice().getExtraValue().get("max_emptypalletnum").toString());
if (number == 0 || number == max_emptypalletnum) {
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
param.put("device_code", this.device_code); param.put("device_code", this.device_code);
param.put("is_have", this.number == 0 ? 0 : 1); param.put("is_have", this.number == 0 ? 0 : 1);
this.shipDeviceUpdate(param); this.shipDeviceUpdate(param);
} else {
this.requireSucess = true;
}
} }
} }
} }