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

opt: 生箔指定车辆改为一期

Browse Source
This commit is contained in:
liyongde
2024-11-12 15:19:05 +08:00
parent 1bd7049bcd
commit d4f6578ffc
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,12 +228,8 @@ public class RawFoilServiceImpl implements RawFoilService {
if (ObjectUtil.isEmpty(point_code2_jo)) { if (ObjectUtil.isEmpty(point_code2_jo)) {
throw new BadRequestException("未查询到可用的点位类型为入箱的烘箱对接位！"); throw new BadRequestException("未查询到可用的点位类型为入箱的烘箱对接位！");
} }
String bigType = whereJson.getString("big_type");
// 起点和终点确定 生成任务 // 起点和终点确定 生成任务
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
if (ObjectUtil.isNotEmpty(bigType) && "1".equals(bigType)) {
param.put("car_no", "99");
}
param.put("point_code1", jsonIvt.getString("empty_point_code")); param.put("point_code1", jsonIvt.getString("empty_point_code"));
param.put("point_code2", jsonSb.getString("point_code") + "_K"); param.put("point_code2", jsonSb.getString("point_code") + "_K");
param.put("point_code3", jsonSb.getString("point_code") + "_M"); param.put("point_code3", jsonSb.getString("point_code") + "_M");
@@ -250,17 +246,14 @@ public class RawFoilServiceImpl implements RawFoilService {
map.put("flag", "1"); map.put("flag", "1");
map.put("product_area", jsonSb.getString("product_area")); map.put("product_area", jsonSb.getString("product_area"));
map.put("point_location", jsonSb.getString("point_location")); map.put("point_location", jsonSb.getString("point_location"));
map.put("point_type", "1");
// 如果是B2, 需要根据标箔或者锂电来判断是哪个位置 // 如果是B2, 需要根据标箔或者锂电来判断是哪个位置
if (jsonSb.getString("product_area").equals("B2")) { if (jsonSb.getString("product_area").equals("B2")) {
String orderType = jsonRaw.getString("order_type"); String orderType = jsonRaw.getString("order_type");
// order_type 1-标箔；2-锂电 // order_type 1-标箔；2-锂电
if ("2".equals(orderType)) { if ("2".equals(orderType)) {
map.put("point_type", "4"); map.put("point_type", "4");
} else {
map.put("point_type", "1");
} }
} else {
map.put("point_type", "1");
} }
JSONObject jsonIvt = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0); JSONObject jsonIvt = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0);
// 3.如果没找到则继续找下一节点 // 3.如果没找到则继续找下一节点
@@ -277,6 +270,10 @@ public class RawFoilServiceImpl implements RawFoilService {
// 起点和终点确定 生成任务 // 起点和终点确定 生成任务
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
String bigType = whereJson.getString("big_type");
if (ObjectUtil.isNotEmpty(bigType) && "1".equals(bigType)) {
param.put("car_no", "99");
}
param.put("point_code1", start_pint_code); param.put("point_code1", start_pint_code);
param.put("point_code2", jsonSb.getString("point_code") + "_K"); param.put("point_code2", jsonSb.getString("point_code") + "_K");
param.put("point_code3", jsonSb.getString("point_code") + "_M"); param.put("point_code3", jsonSb.getString("point_code") + "_M");