From c57096181eab2fcc8ae0fbb4f4d9da465f88773a Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Fri, 25 Apr 2025 14:09:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java index 731d9b1ba..576b5762b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/ShippingServiceImpl.java @@ -381,7 +381,7 @@ public class ShippingServiceImpl implements ShippingService { throw new BadRequestException("载具码不能为空！"); } JSONObject vehicle_task = WQLObject.getWQLObject("sch_base_task").query("vehicle_code2 = '" + vehicle_code + "' AND is_delete = '0' AND task_status < '07'").uniqueResult(0); - if (ObjectUtil.isNotEmpty(vehicle_task)) { + if (ObjectUtil.isNotEmpty(vehicle_task) && vehicle_task.getString("point_code2").contains("OUT")) { // 请求ACS删除任务 log.info("载具码：" + vehicle_code + "存在未完成的输送线任务！正在请求ACS删除任务！"); JSONObject taskParams = new JSONObject(); @@ -394,6 +394,8 @@ public class ShippingServiceImpl implements ShippingService { vehicle_task.put("remark", "异常自动完成任务!"); WQLObject.getWQLObject("sch_base_task").update(vehicle_task); // throw new BadRequestException("载具码：" + vehicle_code + "存在未完成的输送线任务！"); + } else if (ObjectUtil.isNotEmpty(vehicle_task)) { + throw new BadRequestException("载具码：" + vehicle_code + "存在未完成的输送线任务！"); } JSONObject del_jo = WQLObject.getWQLObject("st_ivt_deliverypointivt").query("vehicle_code = '" + vehicle_code + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(del_jo)) {