diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java index 55ef645b7..fa820dc8c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoOutTask.java @@ -129,6 +129,7 @@ public class TwoOutTask extends AbstractAcsTask { } private List ifShallow(List taskArr) { + List result = new ArrayList<>(); // 筛选出深货位 List collect = taskArr.stream() .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"); - JSONObject jsonObject = WQL.getWO("OUT_TASK01").addParamMap(json) - .process().uniqueResult(0); + if (json.getString("zdepth").equals(IOSEnum.ZDEPTH_STRUCT.code("深"))) { + JSONObject jsonObject = WQL.getWO("OUT_TASK01").addParamMap(json) + .process().uniqueResult(0); - if (ObjectUtil.isNotEmpty(jsonObject)) { - taskArr.add(jsonObject); + if (ObjectUtil.isNotEmpty(jsonObject)) { + result.add(jsonObject); + } else { + json.put("zdepth",IOSEnum.IS_NOTANDYES.code("是")); + } } + json.remove("flag"); + result.add(json); } - List result = taskArr.stream() + result = result.stream() .distinct() .collect(Collectors.toList()); return result; diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/wql/OUT_TASK01.wql b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/wql/OUT_TASK01.wql index 06536b531..d54b7afe2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/wql/OUT_TASK01.wql +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/wql/OUT_TASK01.wql @@ -58,6 +58,8 @@ and task.is_delete = '0' and attr.sect_code = 'BZC01' + order by task.create_time + ENDSELECT ENDQUERY ENDIF