From e80490cff05ff25a359ba16a6031403635cabafe Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Sat, 17 Jun 2023 16:11:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E7=94=B3=E8=AF=B7=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SiemensConveyorDeviceDriver.java | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java index 5f1efbf76..f481a4b94 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java @@ -938,31 +938,30 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme this.require_empty_in_time = date; if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { - //message = "申请空盘入库任务中..."; + message = "申请空盘入库任务中..."; -// if(taskserver.querySameOriginTask(this.device_code) > 0 ){ -// message = "已存在空盘出库任务不再请求"; -// return; -// } + if(taskserver.querySameOriginTask(this.device_code) > 0 ){ + message = "已存在空盘出库任务不再请求"; + return; + } JSONObject apply = new JSONObject(); apply.put("device_code", device_code); apply.put("type", "2"); -// String str = acsToWmsService.applyTaskToWms(apply); -// logServer.deviceExecuteLog(this.device_code, "", "", "申请空盘入库,请求参数:" + apply); -// -// JSONObject jo = JSON.parseObject(str); -// if (ObjectUtil.isEmpty(jo)) { -// message = "申请空盘入库接口不通"; -// } else { -// if (jo.getInteger("status") == 200) { + String str = acsToWmsService.applyTaskToWms(apply); + logServer.deviceExecuteLog(this.device_code, "", "", "申请空盘入库,请求参数:" + apply); + + JSONObject jo = JSON.parseObject(str); + if (ObjectUtil.isEmpty(jo)) { + message = "申请空盘入库接口不通"; + } else { + if (jo.getInteger("status") == 200) { message = "申请空盘入库成功"; requireEmptyInSuccess = true; -// } else { -// message = "申请空盘入库失败，" + jo.get("message").toString(); -// } -// } - + } else { + message = "申请空盘入库失败，" + jo.get("message").toString(); + } + } } } }