From 129e1a510f52a37d5274873a7f7da8829118a263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Tue, 28 Mar 2023 20:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LnshLaminatingMachineDeviceDriver.java | 1 - .../org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java | 6 ++++++ .../org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java index 0ae2e1e..8588170 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java @@ -130,7 +130,6 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i if (mode != last_mode) { this.setRequireSucess(false); - this.setResult(false); logServer.deviceItemValue(this.device_code,"mode" ,String.valueOf(mode)); logServer.deviceExecuteLog(this.device_code,"","","信号mode：" + last_mode + "->" + mode); } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java index f7cdfe7..8c82c77 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java @@ -861,7 +861,13 @@ public class WmsToJnServiceImpl implements WmsToJnService { } String method = "/TrayBak"; String vehicle_code = (String) whereJson.get("vehicle_code"); + if (StrUtil.isBlank(vehicle_code) || "0".equals(vehicle_code) || "0000".equals(vehicle_code) || "999".equals(vehicle_code)) { + return null; + } JSONObject jsonObject = WQL.getWO("WMSTOJN_001").addParam("flag", "15").addParam("vehicle_code", vehicle_code).process().uniqueResult(0); + if (ObjectUtil.isEmpty(jsonObject)) { + return null; + } jsonObject.put("outdate",DateUtil.now()); JSONObject obj = new JSONObject(); obj.put("ticker", "WLXT"); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java index 7224365..4d417b9 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendEmptyVehicleTask.java @@ -82,7 +82,7 @@ public class SendEmptyVehicleTask extends AbstractAcsTask { JSONObject startPointObj = pointTab.query("point_code='" + jsonTask.getString("start_point_code") + "'").uniqueResult(0); //调用mes接口 HashMap hashMap = new HashMap(); - hashMap.put("vehicle_code",startPointObj.getString("vehicle_code")); + hashMap.put("vehicle_code", startPointObj.getString("vehicle_code")); WmsToJnServiceImpl wmsToJnServiceImpl = new WmsToJnServiceImpl(); wmsToJnServiceImpl.feedBackTrayBak(hashMap);