From c93396678a30bebff91c6db38449a0524e438fd8 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Fri, 30 Aug 2024 15:32:41 +0800
Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E5=87=BA=E5=BA=93=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=B8=8B=E5=8F=91=E9=A1=BA=E5=BA=8F=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E7=BA=A7=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/b_lms/sch/tasks/TwoOutTask.java    | 19 +++++++++++++------
 .../org/nl/b_lms/sch/tasks/wql/OUT_TASK01.wql |  2 ++
 2 files changed, 15 insertions(+), 6 deletions(-)

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<JSONObject> ifShallow(List<JSONObject> taskArr) {
+        List<JSONObject> result = new ArrayList<>();
         // 筛选出深货位
         List<JSONObject> 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<JSONObject> 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