From 58d7db705cb080972ed1cadb55fe51322254c847 Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Fri, 24 Mar 2023 13:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql            | 3 +++
 .../src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
index f56593d4c..37b183865 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
@@ -599,6 +599,9 @@
             OPTION 输入.find_type = "3"
                 point_status = '03'
             ENDOPTION
+            OPTION 输入.find_type = "4"
+                point_status = '02'
+            ENDOPTION
             AND NOT EXISTS (
                 SELECT
                     *
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
index 4726c265b..5b10a00dd 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutConveyorTask.java
@@ -250,7 +250,7 @@ public class CutConveyorTask extends AbstractAcsTask {
                                 .addParam("product_area", product_area)
                                 .addParam("sort_seq", sort_seq)
                                 .addParam("find_type", "4")
-                                .addParam("flag", "18").process().uniqueResult(0);
+                                .addParam("flag", "17").process().uniqueResult(0);
                         if (ObjectUtil.isNotEmpty(left_point) && StrUtil.isNotEmpty(jsonTask.getString("vehicle_code"))) {
                             //创建空载具输送出
                             JSONObject form = new JSONObject();