From 8b956ddc3aa02cc4d20413a0eca63da71afb43c1 Mon Sep 17 00:00:00 2001 From: ludj Date: Mon, 17 Jul 2023 18:25:13 +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 --- .../org/nl/wms/common/StructFindUtil.java | 28 ++----------------- .../org/nl/wms/ext/acs/wql/ACSTOMES_001.wql | 2 +- 2 files changed, 4 insertions(+), 26 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 5b72731..7bf202e 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 @@ -97,12 +97,10 @@ public class StructFindUtil { .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0); }else // 单口空铁托盘区--->堆叠铁托盘区 查找单口空铁托盘区 - if (StrUtil.equals("03", area_type)) { + 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).process().uniqueResult(0); - } - - else { + .addParam("area_type", area_type).addParam("vehicle_type", vehicle_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) .addParam("point_code", point_code). @@ -143,26 +141,6 @@ public class StructFindUtil { return null; } - public static JSONObject getEmptyMto(JSONObject jsonObject) { - String area_type = jsonObject.getString("area_type"); - String vehicle_type = jsonObject.getString("vehicle_type"); - if (StrUtil.isEmpty(vehicle_type)) { - throw new BadRequestException("木托盘类型不能为空！"); - } - JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5") - .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0); - return result; - } - public static JSONObject getOutCacheStruct() { - //找一个可以入库的入窑缓存货位 - String area_type = "01"; - String is_full = "1"; - JSONObject result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "9") - .addParam("area_type", area_type) - .addParam("is_full", is_full) - .process().uniqueResult(0); - return result; - } } diff --git a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql index 9507716..2f22a94 100644 --- a/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql +++ b/wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql @@ -15,7 +15,7 @@ ################################################# 输入.flag TYPEAS s_string 输入.workprocedure_id TYPEAS s_string - 输入.material_id TYPEAS s_string + 输入.material_id TYPEAS s_string 输入.area_type TYPEAS s_string 输入.point_code TYPEAS s_string 输入.device_id TYPEAS s_string