From 1ea70e17d02d001b7efe34fbc6cc5aa938e9f4aa Mon Sep 17 00:00:00 2001 From: zhangjiangwei Date: Tue, 14 Mar 2023 15:28:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B4=E6=8B=86=E7=9B=B4?= =?UTF-8?q?=E7=A0=81=E5=8F=AA=E7=94=9F=E6=88=90=E7=A9=BA=E6=89=98=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...hPackagePalletManipulatorDeviceDriver.java | 17 ++++++++++------- ...agePalletSplitManipulatorDeviceDriver.java | 19 +++++++++++-------- .../acs/service/impl/AcsToWmsServiceImpl.java | 2 +- .../wms/sch/manage/buss/SendMaterialTask.java | 2 +- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index 10ce332..6f25baa 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -707,8 +707,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD case 6: //码垛完成 if (!requireSucess) { - applyEmpty(); - if (resultSucess) { + if (applyEmpty()) { palletizing(); } } @@ -1135,13 +1134,14 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD json.put("material_code",material); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - if (ObjectUtil.isNotEmpty(result)) { + if (result.getStatus() == 200) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { + if ("200".equals(jsonObject.getString("status"))) { this.writing(this.mode); this.setRequireSucess(true); } } + result.close(); return true; } } @@ -1264,14 +1264,17 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD json.put("device_code",demoList.get(put_station-1).replace("\"","")); json.put("type","4"); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - if (ObjectUtil.isNotEmpty(result)) { + if (result.getStatus() == 200) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { + if ("200".equals(jsonObject.getString("status"))) { this.writing(8); this.setResultSucess(true); + this.setRequireSucess(true); + return true; } } - return true; + result.close(); + return false; } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java index 1f9c6d0..ee4bb32 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java @@ -65,7 +65,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe private Date instruction_require_time = new Date(); private Date instruction_finished_time = new Date(); - private int instruction_require_time_out =3000; + private int instruction_require_time_out; boolean requireSucess = false; boolean resultSucess = false; @@ -729,8 +729,7 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe case 6: //码垛完成 if (!requireSucess) { - applyEmpty(); - if (resultSucess) { + if (applyEmpty()) { palletizing(); } } @@ -1369,13 +1368,14 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe json.put("material_code",material); HttpResponse result = acsToWmsService.applyTaskManipulatorToWms(json); - if (ObjectUtil.isNotEmpty(result)) { + if (result.getStatus() == 200) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { + if ("200".equals(jsonObject.getString("status"))) { this.writing(this.mode); this.setRequireSucess(true); } } + result.close(); return true; } } @@ -1498,14 +1498,17 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe json.put("device_code",demoList.get(put_station-1).replace("\"","")); json.put("type","4"); HttpResponse result = acsToWmsService.lnshApplyTaskToWms(json); - if (ObjectUtil.isNotEmpty(result)) { + if (result.getStatus() == 200) { JSONObject jsonObject = JSONObject.parseObject(result.body()); - if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { + if ("200".equals(jsonObject.getString("status"))) { this.writing(8); this.setResultSucess(true); + this.setRequireSucess(true); + return true; } } - return true; + result.close(); + return false; } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 8a14b11..cf238f1 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -335,7 +335,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { String vehicle_code = ""; JSONObject produceInfoByCode = new JSONObject(); String is_full = (String) jsonObject.get("is_full"); - if (ObjectUtil.isNotEmpty(jsonObject.get("vehicle_code")) && !StrUtil.equals(jsonObject.get("vehicle_code").toString(), "0000")) { + if (ObjectUtil.isNotEmpty(jsonObject.get("vehicle_code")) && !StrUtil.equals(jsonObject.get("vehicle_code").toString(), "0000") && !"0".equals(jsonObject.get("vehicle_code").toString())) { vehicle_code = jsonObject.get("vehicle_code").toString(); } String qty = String.valueOf(jsonObject.get("qty")); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java index e86b9f4..d598dba 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/SendMaterialTask.java @@ -293,7 +293,7 @@ public class SendMaterialTask extends AbstractAcsTask { next_point_code = inStructObj.getString("struct_code"); //创建入库单据 //假如静置时间为0 或者为空，则取物料表上的静置时间 - if (StrUtil.isEmpty(stewing_time) || StrUtil.equals(stewing_time, "0")) { + if (StrUtil.isEmpty(stewing_time) || StrUtil.equals(stewing_time, "0") || "0.0".equals(stewing_time)) { stewing_time = WQLObject.getWQLObject("md_me_material").query("material_id ='" + material_id + "'"). uniqueResult(0).getString("stewing_time"); }