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\Noble'lift
2024-03-08 17:41:03 +08:00
parent c9d9e86848
commit f19b938a33
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/MesToLmsServiceImpl.java
View File

@@ -1509,8 +1509,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
JSONObject form = new JSONObject(); JSONObject form = new JSONObject();
if (StrUtil.isEmpty(up_scroll)) { if (StrUtil.isEmpty(up_scroll)) {
//取满放满 //取满放满
form.put("point_code1", jsonCoolIvt.getString("point_code")); form.put("point_code1", jsonCoolIvt.getString("full_point_code"));
form.put("point_code2", device_jo.getString("point_code")); form.put("point_code2", device_jo.getString("up_point_code"));
form.put("task_type", "010702"); form.put("task_type", "010702");
form.put("material_code", jsonCoolIvt.getString("container_name")); form.put("material_code", jsonCoolIvt.getString("container_name"));
form.put("vehicle_code", jsonCoolIvt.getString("full_vehicle_code")); form.put("vehicle_code", jsonCoolIvt.getString("full_vehicle_code"));
@@ -1518,8 +1518,8 @@ public class MesToLmsServiceImpl implements MesToLmsService {
} else { } else {
//取满取空放满放空 //取满取空放满放空
form.put("point_code1", jsonCoolIvt.getString("full_point_code")); form.put("point_code1", jsonCoolIvt.getString("full_point_code"));
form.put("point_code2", device_jo.getString("point_code")); form.put("point_code2", device_jo.getString("up_point_code"));
form.put("point_code3", device_jo.getString("point_code")); form.put("point_code3", device_jo.getString("up_point_code"));
//判断对应空轴点位是否为空，为空用当前点位，不为空查询其他点位 //判断对应空轴点位是否为空，为空用当前点位，不为空查询其他点位
if (jsonCoolIvt.getString("empty_point_status").equals("01")) { if (jsonCoolIvt.getString("empty_point_status").equals("01")) {
form.put("point_code4", jsonCoolIvt.getString("empty_point_code")); form.put("point_code4", jsonCoolIvt.getString("empty_point_code"));
@@ -1545,7 +1545,7 @@ public class MesToLmsServiceImpl implements MesToLmsService {
map.put("flag", "1"); map.put("flag", "1");
map.put("product_area", device_jo.getString("product_area")); map.put("product_area", device_jo.getString("product_area"));
JSONObject jsonIvt = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0); JSONObject jsonIvt = WQL.getWO("PDA_RAWFOIL_01").addParamMap(map).process().uniqueResult(0);
form.put("point_code1", device_jo.getString("point_code")); form.put("point_code1", device_jo.getString("up_point_code"));
//寻找可用的冷却区满轴点位 //寻找可用的冷却区满轴点位
form.put("point_code2", jsonIvt.getString("full_point_code")); form.put("point_code2", jsonIvt.getString("full_point_code"));
form.put("task_type", "010704"); form.put("task_type", "010704");