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

dev:新增备货区代码

Browse Source
This commit is contained in:
zhouz
2024-05-09 20:01:54 +08:00
parent 66571afda4
commit d03c915e92
21 changed files with 880 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java
View File

@@ -85,7 +85,7 @@ public class BakingServiceImpl implements BakingService {
if (ObjectUtil.isEmpty(raw_jo)) {
throw new BadRequestException("未查询到对应的生箔工单！");
}
if (raw_jo.getString("order_type").equals("1")){
if (raw_jo.getString("order_type").equals("1")) {
throw new BadRequestException("当前工单为标箔工单，不允许烘烤！");
}
String resource_name = raw_jo.getString("resource_name");
@@ -196,8 +196,8 @@ public class BakingServiceImpl implements BakingService {
}
JSONObject map = new JSONObject();
map.put("flag", "1");
if (product_area.equals("B2")){
map.put("flag","3");
if (product_area.equals("B2")) {
map.put("flag", "3");
}
map.put("reging_id", reging_id);
map.put("point_location", point_location);
@@ -218,22 +218,22 @@ public class BakingServiceImpl implements BakingService {
JSONObject jsonHotIvt = getJsonObject(product_area, point_code2_jo, temperature);
if (ObjectUtil.isEmpty(jsonHotIvt)) {
if (product_area.equals("B2")){
if (product_area.equals("B2")) {
String cant_location1 = point_code2_jo.getString("point_location");
String cant_location = "('"+point_code2_jo.getString("point_location")+"')";
map.put("cant_location",cant_location);
String cant_location = "('" + point_code2_jo.getString("point_location") + "')";
map.put("cant_location", cant_location);
point_code2_jo = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
jsonHotIvt = getJsonObject(product_area, point_code2_jo, temperature);
if (ObjectUtil.isEmpty(jsonHotIvt)){
cant_location = "('"+cant_location1+"','"+point_code2_jo.getString("point_location")+"')";
map.put("cant_location",cant_location);
if (ObjectUtil.isEmpty(jsonHotIvt)) {
cant_location = "('" + cant_location1 + "','" + point_code2_jo.getString("point_location") + "')";
map.put("cant_location", cant_location);
point_code2_jo = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
jsonHotIvt = getJsonObject(product_area, point_code2_jo, temperature);
if (ObjectUtil.isEmpty(jsonHotIvt)){
if (ObjectUtil.isEmpty(jsonHotIvt)) {
throw new BadRequestException("烘烤区没有合适温度的空位！");
}
}
}else {
} else {
throw new BadRequestException("烘烤区没有合适温度的空位！");
}
}
@@ -494,11 +494,13 @@ public class BakingServiceImpl implements BakingService {
JSONObject map = new JSONObject();
map.put("flag", "2");
map.put("product_area", jsonPoint.getString("product_area"));
map.put("point_location", jsonPoint.getString("point_location"));
if (!jsonPoint.getString("product_area").equals("B2")) {
map.put("point_location", jsonPoint.getString("point_location"));
}
JSONObject jsonCooIvt = WQL.getWO("PDA_OVENINANDOUT_01").addParamMap(map).process().uniqueResult(0);
// 如果为空
if (ObjectUtil.isEmpty(jsonCooIvt)) {
if (ObjectUtil.isEmpty(jsonCooIvt) && !jsonPoint.getString("product_area").equals("B2")) {
if (StrUtil.equals(jsonPoint.getString("point_location"), "0")) {
map.put("point_location", "1");
}