root/rongLiJiaNai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ludj
2023-07-17 18:25:13 +08:00
parent 7901d3f9fb
commit 8b956ddc3a
2 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wms/hd/nladmin-system/src/main/java/org/nl/wms/common/StructFindUtil.java
View File

@@ -97,12 +97,10 @@ public class StructFindUtil {
.addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0); .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0);
}else }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") result = WQL.getWO("QSTRUCT_RUL01").addParam("flag", "1")
.addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).process().uniqueResult(0); .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type).addParam("point_code", point_code).process().uniqueResult(0);
} } else {
else {
result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5") result = WQL.getWO("QSTRUCT_RULE").addParam("flag", "5")
.addParam("area_type", area_type).addParam("vehicle_type", vehicle_type) .addParam("area_type", area_type).addParam("vehicle_type", vehicle_type)
.addParam("point_code", point_code). .addParam("point_code", point_code).
@@ -143,26 +141,6 @@ public class StructFindUtil {
return null; 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;
}
} }

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/wql/ACSTOMES_001.wql
View File

@@ -15,7 +15,7 @@
################################################# #################################################
输入.flag TYPEAS s_string 输入.flag TYPEAS s_string
输入.workprocedure_id TYPEAS s_string 输入.workprocedure_id TYPEAS s_string
输入.material_id TYPEAS s_string 输入.material_id TYPEAS s_string
输入.area_type TYPEAS s_string 输入.area_type TYPEAS s_string
输入.point_code TYPEAS s_string 输入.point_code TYPEAS s_string
输入.device_id TYPEAS s_string 输入.device_id TYPEAS s_string