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

rev：解决异步多次请求

Browse Source
This commit is contained in:
gengby
2023-12-25 11:15:15 +08:00
parent 3d34802611
commit cbebb04175
1 changed files with 2 additions and 2 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

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