From f4ad461c853ebaa419f03d03f995c2c97c4a6af7 Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 28 Aug 2023 17:27:15 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A1.=E7=94=B3=E8=AF=B7=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=E4=BC=98=E5=8C=962.=E6=89=8B?= =?UTF-8?q?=E6=8C=81=E5=87=BA=E5=BA=93=E6=89=AB=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/service/impl/AcsToWmsServiceImpl.java | 16 ++++++++++++++++ .../service/impl/ProductionOutServiceImpl.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) 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 b7d3c9f63..bef4d4f1f 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 @@ -399,6 +399,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } if (type.equals("4")) { + CutConveyorTask cutConveyorTask = new CutConveyorTask(); + //查询该木箱对应的包装关系 JSONObject sub_jo = WQLObject.getWQLObject("pdm_bi_subpackagerelation").query("package_box_sn = '" + vehicle_code + "'").uniqueResult(0); if (ObjectUtil.isEmpty(sub_jo)) { @@ -480,6 +482,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' and is_used = '1' order by out_order_seq ASC").getResultJSONArray(0); if (pointArr.size() == flag) { JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0); + + if (cutConveyorTask.isSingleTask(jsonNewRow.getString("point_code"))) { + continue; + } + point_code = jsonNewRow.getString("point_code"); break; } @@ -499,6 +506,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 堵住则判断下一个 continue; } else { + if (cutConveyorTask.isSingleTask(json.getString("point_code"))) { + continue; + } + // 未堵住: 跳出循环 point_code = json.getString("point_code"); break; @@ -527,6 +538,11 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' and is_used = '1' order by out_order_seq ASC").getResultJSONArray(0); if (pointArr.size() == flag) { JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0); + + if (cutConveyorTask.isSingleTask(jsonNewRow.getString("point_code"))) { + continue; + } + point_code = jsonNewRow.getString("point_code"); break; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java index 49acf6c2b..7bb342171 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/ProductionOutServiceImpl.java @@ -53,7 +53,7 @@ public class ProductionOutServiceImpl implements ProductionOutService { String box_no = whereJson.getString("box_no"); if (ObjectUtil.isEmpty(box_no)) throw new BadRequestException("木箱不能为空"); - JSONObject jsonPoint = pointTab.query("vehicle_code = '" + box_no + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); + JSONObject jsonPoint = pointTab.query("vehicle_code = '" + box_no + "' and is_delete = '0' and is_used = '1' and point_type = '9'").uniqueResult(0); if (ObjectUtil.isEmpty(jsonPoint)) { throw new BadRequestException("请输入正确的木箱或查看点位是否存在");