From f4887a5f4cae675e53c84f3a1e82d25d346108ee Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 25 Dec 2023 12:48:16 +0800 Subject: [PATCH] =?UTF-8?q?rev:=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 --- .../java/org/nl/wms/common/StructFindUtil.java | 3 ++- .../sch/manage/buss/CallEmptyVehicleTask.java | 4 +--- .../nl/wms/sch/manage/buss/ToPackIngTask.java | 16 ++++++++++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java index dd571d8..0e7e228 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java @@ -99,7 +99,8 @@ public class StructFindUtil { // 单口空铁托盘区--->堆叠铁托盘区 查找单口空铁托盘区 if (StrUtil.equals("03", area_type) || StrUtil.equals("04", area_type)) { result = WQL.getWO("QSTRUCT_RUL01").addParam("flag", "1") - .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).addParam("point_code", point_code).process().uniqueResult(0); +// .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).addParam("point_code", point_code).process().uniqueResult(0); + .addParam("area_type", area_type).addParam("point_code", point_code).process().uniqueResult(0); } else { result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5") .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type) diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java index 0c6e510..0bcfa2b 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallEmptyVehicleTask.java @@ -221,9 +221,7 @@ public class CallEmptyVehicleTask extends AbstractAcsTask { } JSONObject param = new JSONObject(); // 如果托盘类型不是02，则需要加上托盘类型(木托盘) - if (!StrUtil.equals(vehicle_type, "02")) { - param.put("vehicle_type", vehicle_type); - } + param.put("vehicle_type", vehicle_type); param.put("area_type", start_area); param.put("point_code", start_point_code); diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java index 8c5cd36..52ad64e 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/ToPackIngTask.java @@ -72,11 +72,14 @@ public class ToPackIngTask extends AbstractAcsTask { JSONObject nextPointCode2Obj = pointTab.query("point_code='" + nextPointCode2 + "'").uniqueResult(0); //覆膜或者半托 if (ObjectUtil.isNotEmpty(startPointCode2Obj)) { + //非半托缓存，覆膜区不清理载具等相关信息 + if (!startPointCode2.contains("FMJ")){ + startPointCode2Obj.put("point_status", "00"); + startPointCode2Obj.put("vehicle_code", ""); + startPointCode2Obj.put("vehicle_type", ""); + startPointCode2Obj.put("material_id", ""); + } startPointCode2Obj.put("lock_type", "00"); - startPointCode2Obj.put("point_status", "00"); - startPointCode2Obj.put("vehicle_code", ""); - startPointCode2Obj.put("vehicle_type", ""); - startPointCode2Obj.put("material_id", ""); startPointCode2Obj.put("update_time", DateUtil.now()); pointTab.update(startPointCode2Obj); } @@ -218,8 +221,9 @@ public class ToPackIngTask extends AbstractAcsTask { .process().getResultJSONArray(0); PointUpdateUtil.updatePoint(pointarr2); - vehicle_type = produceObj.getString("vehicle_type"); - start_Point2 = pointTable.query("area_type='05' and vehicle_type = '"+produceObj.getString("vehicle_type")+"'").uniqueResult(0); + + vehicle_type= WQLObject.getWQLObject("md_me_material").query("material_id = '"+produceObj.getString("material_id")+"'").uniqueResult(0).getString("vehicle_type"); + start_Point2 = pointTable.query("area_type='05' and vehicle_type = '"+vehicle_type+"'").uniqueResult(0); if (ObjectUtil.isEmpty(start_Point2)) { throw new BadRequestException("覆膜区未找到合适的木托盘类型"); }