From 9887483aa168beda1262240318c07d953408ada3 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Tue, 3 Jan 2023 21:52:14 +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 --- .../hf_station/HfStationDeviceDriver.java | 1 - .../hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java | 4 +++- .../tasks/callEmpty/HnjCallEmpVehicleTask.java | 10 ++++++++++ .../nl/wms/sch/tasks/handling/HandlingTask.java | 6 +++--- .../tasks/sendMaterial/HnjSendMaterialTask.java | 15 +++++++++++---- 5 files changed, 27 insertions(+), 9 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 60192a8..bf1e0d4 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 @@ -171,7 +171,6 @@ public class HfStationDeviceDriver extends AbstractOpcDeviceDriver implements De String message = null; try { device_code = this.getDeviceCode(); - mode = this.itemProtocol.getMode(); move = this.itemProtocol.getMove(); action = this.itemProtocol.getAction(); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java index 06cc2c4..afe53c3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/hongfeng/hf_two_rgv/HfTwoRGVDeviceDriver.java @@ -446,6 +446,7 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev String next_device_code = task.getNext_device_code(); if (repeatDeviceCodeList.contains(startDeviceCode)) { if (!repeatPutDeviceCodeList.contains(next_device_code)) { + task = null; continue; } else { if (ObjectUtil.isNotEmpty(task)) break; @@ -552,13 +553,14 @@ public class HfTwoRGVDeviceDriver extends AbstractOpcDeviceDriver implements Dev String next_device_code = task.getNext_device_code(); if (repeatDeviceCodeList.contains(startDeviceCode)) { if (!repeatPutDeviceCodeList.contains(next_device_code)) { + task = null; continue; } else { if (ObjectUtil.isNotEmpty(task)) break; } } } - if (ObjectUtil.isNotEmpty(task)); + if (ObjectUtil.isNotEmpty(task)) ; } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/HnjCallEmpVehicleTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/HnjCallEmpVehicleTask.java index 0f231f0..70f5231 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/HnjCallEmpVehicleTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/callEmpty/HnjCallEmpVehicleTask.java @@ -101,6 +101,16 @@ public class HnjCallEmpVehicleTask extends AbstractAcsTask { ivtEnd.put("instorage_time", DateUtil.now()); ivtTab.update(ivtEnd); + //解锁终点 + jsonEnd.put("lock_type", "1"); + jsonEnd.put("vehicle_type", ""); + jsonEnd.put("vehicle_code", ""); + jsonEnd.put("material_id", ""); + jsonEnd.put("point_status", "2"); + jsonEnd.put("task_id", ""); + jsonEnd.put("update_time", DateUtil.now()); + pointTab.update(jsonEnd); + //修改起点库存 ivtStart.put("vehicle_type", ""); ivtStart.put("vehicle_code", ""); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java index ac8b9ea..dc03999 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java @@ -140,11 +140,11 @@ public class HandlingTask extends AbstractAcsTask { MaterialbaseServiceImpl materialbaseService = SpringContextHolder.getBean(MaterialbaseServiceImpl.class); KlzhcwUtil klzhcwUtil = SpringContextHolder.getBean(KlzhcwUtil.class); - MaterialbaseDto materialbaseDto = materialbaseService.findById(ivtStart.getLong("material_id")); + MaterialbaseDto materialbaseDto = materialbaseService.findById(jsonTask.getLong("material_id")); LinkedList ll = MyLinkedListService.getLinkedList(); JSONObject param = new JSONObject(); - param.put("vehicle_type", ivtStart.getString("vehicle_type")); - param.put("vehicle_code", ivtStart.getString("vehicle_code")); + param.put("vehicle_type", jsonTask.getString("vehicle_type")); + param.put("vehicle_code", jsonTask.getString("vehicle_code")); if (ObjectUtil.isNotEmpty(materialbaseDto)) { param.put("material_code", materialbaseDto.getMaterial_code()); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java index b876af8..a10d69a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/HnjSendMaterialTask.java @@ -9,12 +9,9 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; -import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.system.util.CodeUtil; -import org.nl.modules.wql.WQL; import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; -import org.nl.wms.basedata.service.MaterialbaseService; import org.nl.wms.basedata.service.dto.MaterialbaseDto; import org.nl.wms.basedata.service.impl.MaterialbaseServiceImpl; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; @@ -128,6 +125,16 @@ public class HnjSendMaterialTask extends AbstractAcsTask { ivtEnd.put("instorage_time", DateUtil.now()); ivtTab.update(ivtEnd); + //解锁终点 + jsonEnd.put("lock_type", "1"); + jsonEnd.put("vehicle_type", ""); + jsonEnd.put("vehicle_code", ""); + jsonEnd.put("material_id", ""); + jsonEnd.put("point_status", "2"); + jsonEnd.put("task_id", ""); + jsonEnd.put("update_time", DateUtil.now()); + pointTab.update(jsonEnd); + //修改起点库存 ivtStart.put("vehicle_type", ""); ivtStart.put("vehicle_code", ""); @@ -172,7 +179,7 @@ public class HnjSendMaterialTask extends AbstractAcsTask { if (ObjectUtil.isNotEmpty(materialbaseDto)) { param.put("material_code", materialbaseDto.getMaterial_code()); } - param.put("ivt_qty",taskObj.getString("qty")); + param.put("ivt_qty", taskObj.getString("qty")); boolean flag = klzhcwUtil.judge(ll, param); if (flag) { jsonEnd.put("lock_type", "1");