rev:出库任务下发顺序以及优先级优化
This commit is contained in:
@@ -129,6 +129,7 @@ public class TwoOutTask extends AbstractAcsTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private List<JSONObject> ifShallow(List<JSONObject> taskArr) {
|
private List<JSONObject> ifShallow(List<JSONObject> taskArr) {
|
||||||
|
List<JSONObject> result = new ArrayList<>();
|
||||||
// 筛选出深货位
|
// 筛选出深货位
|
||||||
List<JSONObject> collect = taskArr.stream()
|
List<JSONObject> collect = taskArr.stream()
|
||||||
.filter(row -> row.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深")))
|
.filter(row -> row.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深")))
|
||||||
@@ -139,17 +140,23 @@ public class TwoOutTask extends AbstractAcsTask {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 找对应的浅货位任务
|
// 找对应的浅货位任务
|
||||||
for (JSONObject json : collect) {
|
for (JSONObject json : taskArr) {
|
||||||
json.put("flag", "2");
|
json.put("flag", "2");
|
||||||
JSONObject jsonObject = WQL.getWO("OUT_TASK01").addParamMap(json)
|
if (json.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) {
|
||||||
.process().uniqueResult(0);
|
JSONObject jsonObject = WQL.getWO("OUT_TASK01").addParamMap(json)
|
||||||
|
.process().uniqueResult(0);
|
||||||
|
|
||||||
if (ObjectUtil.isNotEmpty(jsonObject)) {
|
if (ObjectUtil.isNotEmpty(jsonObject)) {
|
||||||
taskArr.add(jsonObject);
|
result.add(jsonObject);
|
||||||
|
} else {
|
||||||
|
json.put("zdepth",IOSEnum.IS_NOTANDYES.code("是"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
json.remove("flag");
|
||||||
|
result.add(json);
|
||||||
}
|
}
|
||||||
|
|
||||||
List<JSONObject> result = taskArr.stream()
|
result = result.stream()
|
||||||
.distinct()
|
.distinct()
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
@@ -58,6 +58,8 @@
|
|||||||
and task.is_delete = '0'
|
and task.is_delete = '0'
|
||||||
and attr.sect_code = 'BZC01'
|
and attr.sect_code = 'BZC01'
|
||||||
|
|
||||||
|
order by task.create_time
|
||||||
|
|
||||||
ENDSELECT
|
ENDSELECT
|
||||||
ENDQUERY
|
ENDQUERY
|
||||||
ENDIF
|
ENDIF
|
||||||
|
|||||||
Reference in New Issue
Block a user