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

fix 申请任务

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2023-06-17 16:11:03 +08:00
parent 57a95af649
commit e80490cff0
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -938,31 +938,30 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
this.require_empty_in_time = date; this.require_empty_in_time = date;
if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) {
//message = "申请空盘入库任务中..."; message = "申请空盘入库任务中...";
// if(taskserver.querySameOriginTask(this.device_code) > 0 ){ if(taskserver.querySameOriginTask(this.device_code) > 0 ){
// message = "已存在空盘出库任务不再请求"; message = "已存在空盘出库任务不再请求";
// return; return;
// } }
JSONObject apply = new JSONObject(); JSONObject apply = new JSONObject();
apply.put("device_code", device_code); apply.put("device_code", device_code);
apply.put("type", "2"); apply.put("type", "2");
// String str = acsToWmsService.applyTaskToWms(apply); String str = acsToWmsService.applyTaskToWms(apply);
// logServer.deviceExecuteLog(this.device_code, "", "", "申请空盘入库,请求参数:" + apply); logServer.deviceExecuteLog(this.device_code, "", "", "申请空盘入库,请求参数:" + apply);
//
// JSONObject jo = JSON.parseObject(str); JSONObject jo = JSON.parseObject(str);
// if (ObjectUtil.isEmpty(jo)) { if (ObjectUtil.isEmpty(jo)) {
// message = "申请空盘入库接口不通"; message = "申请空盘入库接口不通";
// } else { } else {
// if (jo.getInteger("status") == 200) { if (jo.getInteger("status") == 200) {
message = "申请空盘入库成功"; message = "申请空盘入库成功";
requireEmptyInSuccess = true; requireEmptyInSuccess = true;
// } else { } else {
// message = "申请空盘入库失败，" + jo.get("message").toString(); message = "申请空盘入库失败，" + jo.get("message").toString();
// } }
// } }
} }
} }
} }