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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lishuai
2023-12-25 12:36:58 +08:00
parent 9dcef9e939 cbebb04175
commit 2287effa7c
6 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -431,7 +431,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
JSONObject param = new JSONObject();
param.put("device_code", device_code);
logServer.deviceExecuteLog(this.device_code, "", "", "有货变无货请求LMS,参数:" + param);
this.requiresShipDeviceUpdate = true;
HttpResponse response = acsToWmsService.shipDeviceUpdate(param);
if (response == null || response.getStatus() == 200) {
logServer.deviceExecuteLog(this.device_code, "", "", "有货变无货请求LMS,接口返回:" + response.body());
@@ -441,6 +440,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
future.completeExceptionally(e);
}
});
this.requiresShipDeviceUpdate = true;
}
public void sendDeviceStatus(JSONObject param) {
@@ -450,11 +450,11 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
try {
acsToWmsService.sendDeviceStatus(param);
future.complete("Async operation completed");
this.requiresShipDeviceUpdate = true;
} catch (Exception e) {
future.completeExceptionally(e);
}
});
this.requiresShipDeviceUpdate = true;
}
private void taskDeviceUpdate(int task) {