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

fix: 混碾送料业务顺序互换

Browse Source
This commit is contained in:
liyongde
2024-05-28 14:18:26 +08:00
parent eb36ab0921
commit 230d1ab7bd
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/p2p/PDATask.java
View File

@@ -47,7 +47,7 @@ public class PDATask extends AbstractAcsTask {
"-",
"-",
8,
RGCDTask.class.getName(),
PDATask.class.getName(),
form.getString("create_mode"),
form.getString("request_param"),
ObjectUtil.isEmpty(form.getString("create_id")) ? "1" : form.getString("create_id"),

39
lms/nladmin-system/src/main/java/org/nl/wms/sch/task/send/material/HLSendMaterialTask.java
View File

@@ -111,46 +111,49 @@ public class HLSendMaterialTask extends AbstractAcsTask {
.addParam("point_code", task.getString("point_code1"))
.process()
.uniqueResult(0);
// 如果有关联压机
if (ObjectUtil.isNotEmpty(object.getString("associated_device"))) {
// 如果有关联压机(状态：4，锁定：1)，直接送到对应的布料机上
// 如果有关联压机(状态：4等待，锁定：1)，直接送到对应的布料机上
nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
.addParam("flag", "12")
.addParam("point_code", object.getString("associated_device"))
.process()
.uniqueResult(0);
if (ObjectUtil.isEmpty(nextPoint)) {
// 通过工单的关联压机送到对应位置，如果不满足就走以下流程
flag = false;
nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
.addParam("flag", "8")
.addParam("point_code", startPoint.getString("device_code"))
.process()
.uniqueResult(0);
}
}
if (ObjectUtil.isEmpty(nextPoint)) {
if (ObjectUtil.isEmpty(nextPoint) || ObjectUtil.isEmpty(nextPoint.get("point_code"))) {
// 判断压机上是否有点位状态是4，物料对应
flag = true;
nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
.addParam("flag", "10")
.addParam("material_id", task.getString("material_id"))
.process()
.uniqueResult(0);
} else {
task.put("priority", "4");
}
if (ObjectUtil.isEmpty(nextPoint)) {
flag = false;
// 通过工单的关联压机送到对应位置，如果不满足就走以下流程
// 先去普通压机困料货位
nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
.addParam("flag", "8")
.addParam("point_code", startPoint.getString("device_code"))
.addParam("flag", "4")
.addParam("material_id", task.getString("material_id"))
.process()
.uniqueResult(0);
if (ObjectUtil.isEmpty(nextPoint) || ObjectUtil.isEmpty(nextPoint.get("point_code"))) {
// 先去普通压机困料货位
if (ObjectUtil.isEmpty(nextPoint)) {
// 公共货位
nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
.addParam("flag", "4")
.addParam("material_id", task.getString("material_id"))
.addParam("flag", "5")
.process()
.uniqueResult(0);
if (ObjectUtil.isEmpty(nextPoint)) {
// 公共货位
nextPoint = WQL.getWO("SEND_MATERIAL_TASK")
.addParam("flag", "5")
.process()
.uniqueResult(0);
}
} else {
task.put("priority", "4");
}
}
}