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

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-02-25 09:53:54 +08:00
parent fbc772c30a
commit 109c68f253
2 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -700,6 +700,15 @@ public class MesToLmsServiceImpl implements MesToLmsService {
if (ObjectUtil.isEmpty(plan_jo)) { if (ObjectUtil.isEmpty(plan_jo)) {
throw new BadRequestException("未查询到分切计划：" + row.getString("ContainerGroup")); throw new BadRequestException("未查询到分切计划：" + row.getString("ContainerGroup"));
} }
//如果入站的分切计划气涨轴为空，则虚拟一个气涨轴编号
if (StrUtil.isEmpty(plan_jo.getString("qzzno"))) {
if (i == 0 || i == 2) {
plan_jo.put("qzzno", "XN-" + plan_jo.getString("resource_name") + "A");
}
if (i == 1 || i == 3) {
plan_jo.put("qzzno", "XN-" + plan_jo.getString("resource_name") + "B");
}
}
plan_jo.put("status", "05"); plan_jo.put("status", "05");
WQLObject.getWQLObject("pdm_bi_slittingproductionplan").update(plan_jo); WQLObject.getWQLObject("pdm_bi_slittingproductionplan").update(plan_jo);
} }

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

@@ -113,6 +113,14 @@ public class CasingServiceImpl implements CasingService {
} }
} }
//如果一个分切组只有两个子卷，则一定得分两根轴进行绑定
if (rows.size() == 2 && order_type.equals("1")) {
JSONArray group_rows = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("parent_container_name = '" + parent_container_name + "' AND split_group = '" + split_group + "' AND is_delete = '0'").getResultJSONArray(0);
if (group_rows.size() == 2) {
throw new BadRequestException("该分切组只有两个分切计划，请选择两个不同的轴进行绑定！");
}
}
//查询该气涨轴是否存在已经套轴的分切计划 //查询该气涨轴是否存在已经套轴的分切计划
JSONArray case_rows = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("qzzno = '" + qzzno + "' AND is_delete = '0' AND is_child_tz_ok = '1' AND status < '09'").getResultJSONArray(0); JSONArray case_rows = WQLObject.getWQLObject("pdm_bi_slittingproductionplan").query("qzzno = '" + qzzno + "' AND is_delete = '0' AND is_child_tz_ok = '1' AND status < '09'").getResultJSONArray(0);
for (int i = 0; i < case_rows.size(); i++) { for (int i = 0; i < case_rows.size(); i++) {