From cfe90393865cbeeeb434aec95c4c350d3496c3b0 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Thu, 2 Feb 2023 11:17:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java | 7 ++++--- .../sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java index 6033712..57929b0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java @@ -198,7 +198,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask { taskObj.put("update_time", DateUtil.now()); taskTab.update(taskObj); } - return; + continue; } JSONObject param1 = new JSONObject(); param1.put("flag", "1"); @@ -221,6 +221,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask { taskObj.put("remark", "相应列有AGV在工作,等待执行!"); taskObj.put("update_time", DateUtil.now()); taskTab.update(taskObj); + continue; } } } @@ -233,7 +234,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask { if (col_num != 1) { // 因为找到的是对应相同的物料点，所以是下一个位置 JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and lock_type = '1' and point_status = '1' and is_used = '1' and is_delete = '0'", "col_num desc").uniqueResult(0); // and col_num ='" + (col_num - 1) + "' -// if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!"); + if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!"); taskObj.put("point_code2", firstRow.getString("point_code")); taskObj.put("update_time", DateUtil.now()); taskObj.put("task_status", TaskStatusEnum.START_AND_POINT.getCode()); @@ -243,7 +244,7 @@ public class GjxSendMaterialTask extends AbstractAcsTask { JSONObject point = new JSONObject(); point.put("lock_type", "2"); pointTab.update(point, "point_code = '" + firstRow.getString("point_code") + "'"); - return; + continue; // JSONObject point = new JSONObject(); // point.put("lock_type", "2"); // point.put("task_id", taskObj.getString("task_id")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql index 64f902b..d2082a8 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql @@ -67,7 +67,8 @@ OPTION 输入.vehicle_type <> "" p.can_vehicle_type like "%" 输入.vehicle_type "%" ENDOPTION - AND '3' <> (SELECT p2.point_status FROM SCH_BASE_Point p2 WHERE p2.block_num = p.block_num AND p2.row_num = p.row_num AND p2.col_num = '1') + AND '3' <> (SELECT p2.point_status FROM SCH_BASE_Point p2 WHERE p2.block_num = p.block_num AND p2.row_num = p.row_num AND p2.col_num = '1' + AND p2.col_num = (SELECT MIN(p3.col_num) FROM SCH_BASE_Point p3 WHERE p3.block_num = p2.block_num AND p3.row_num = p2.row_num AND p3.is_used = '1' AND p3.is_delete = '0')) ORDER BY block_num,row_num,col_num ENDSELECT ENDQUERY