From 6bbfcae338fc15d9dd4b3a97b4b47be7fce430f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Thu, 5 Jan 2023 15:57:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=8B=E6=9C=BA=E5=8F=AB=E6=96=99=E6=97=B6?= =?UTF-8?q?=E5=BA=8F=E4=BF=AE=E6=94=B9=20=E5=8E=8B=E6=9C=BA=E5=8F=AB?= =?UTF-8?q?=E6=96=99=E4=BB=BB=E5=8A=A1=E6=9C=AA=E6=AD=A3=E5=B8=B8=E5=AE=8C?= =?UTF-8?q?=E6=88=90=20=E6=9C=AA=E6=AD=A3=E5=B8=B8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hongfeng/hf_station/HfStationDeviceDriver.java | 2 +- .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java | 8 +++++--- .../wms/sch/tasks/callMaterial/YljCallMaterialTask.java | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java index bf1e0d4..6fe8045 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_station/HfStationDeviceDriver.java @@ -497,7 +497,7 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De json.put("type", "3"); JSONObject resp = acsToWmsService.apply(json); if (StrUtil.equals(resp.getString("status"), "200")) { - this.writing(8); + this.writing(6); this.setCallMaterialRequireSucess(true); logServer.deviceInfo("acs申请任务", this.getDevice_code(), "压机叫料任务申请成功!"); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 23b1df7..1dc07ff 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -321,9 +321,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { //如果是的话说明困料区来的 先去库存表查询对应的条码的物料信息 并将对应的物料信息保存在redis中 if (StrUtil.equals(is_first, "true")) { JSONObject ivtJson = wo_ivt.query("vehicle_code = '" + barcode + "'").uniqueResult(0); - redisUtils.set(barcode, ivtJson.getString("material_id")); - redisUtils.set(barcode + "-ivt_qty", ivtJson.getString("ivt_qty")); - materialbaseDto = materialbaseService.findById(ivtJson.getLong("material_id")); + if (ObjectUtil.isNotEmpty(ivtJson)) { + redisUtils.set(barcode, ivtJson.getString("material_id")); + redisUtils.set(barcode + "-ivt_qty", ivtJson.getString("ivt_qty")); + materialbaseDto = materialbaseService.findById(ivtJson.getLong("material_id")); + } } Object redis_material_id = redisUtils.get(barcode); String material_id = ObjectUtil.isEmpty(redis_material_id) ? null : String.valueOf(redis_material_id); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java index edc099e..27966c3 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callMaterial/YljCallMaterialTask.java @@ -70,14 +70,14 @@ public class YljCallMaterialTask extends AbstractAcsTask { pointTab.update(jsonStart); } - if (StrUtil.equals(status, "1")) { + if (StrUtil.equals(status, TaskStatusEnum.EXECUTING.getCode())) { // 更新任务状态为执行中 taskObj.put("task_status", TaskStatusEnum.EXECUTING.getCode()); taskObj.put("update_time", DateUtil.now()); taskTab.update(taskObj); } - if (StrUtil.equals(status, "2")) { + if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) { //判断状态, if (StrUtil.equals("2", taskObj.getString("task_status"))) {