From 1c2d6f76ab6e973ffa2f18d21a8f56b44eef2eec Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 30 Apr 2025 16:18:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E6=BB=A4=E5=A4=B1=E8=B4=A52?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mps/service/impl/ShippingServiceImpl.java | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) 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 576b5762b..0938cbf5b 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,21 +381,22 @@ 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) && vehicle_task.getString("point_code2").contains("OUT")) { - // 请求ACS删除任务 - log.info("载具码：" + vehicle_code + "存在未完成的输送线任务！正在请求ACS删除任务！"); - JSONObject taskParams = new JSONObject(); - taskParams.put("product_area", vehicle_task.getString("product_area")); - taskParams.put("task_code", vehicle_task.getString("task_code")); - JSONObject acsRes = wmsToAcsService.toNoticeACSCancelTask(taskParams); - // 删除任务 - log.info("请求ACS删除完毕！ACS返回值：{}", acsRes); - vehicle_task.put("task_status", TaskStatusEnum.FINISHED.getCode()); - 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 + "存在未完成的输送线任务！"); + if (ObjectUtil.isNotEmpty(vehicle_task)) { + if (vehicle_task.getString("point_code2").contains("OUT")) { + // 请求ACS删除任务 + log.info("载具码：" + vehicle_code + "存在未完成的输送线任务！正在请求ACS删除任务！"); + JSONObject taskParams = new JSONObject(); + taskParams.put("product_area", vehicle_task.getString("product_area")); + taskParams.put("task_code", vehicle_task.getString("task_code")); + JSONObject acsRes = wmsToAcsService.toNoticeACSCancelTask(taskParams); + // 删除任务 + log.info("请求ACS删除完毕！ACS返回值：{}", acsRes); + vehicle_task.put("task_status", TaskStatusEnum.FINISHED.getCode()); + vehicle_task.put("remark", "异常自动完成任务!"); + WQLObject.getWQLObject("sch_base_task").update(vehicle_task); + } else { + 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)) {