From 16884fb76a74ae489f30ed3488350b89d98214ef Mon Sep 17 00:00:00 2001
From: "ZHOUZ\\Noble'lift" <1014987728@qq.com>
Date: Sat, 11 Feb 2023 13:35:35 +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           | 2 ++
 .../src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql        | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

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 a75255917..777be0ad5 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
@@ -446,6 +446,8 @@
                 plan.qzzno = 输入.qzzno
             AND
                 plan.is_delete = '0'
+            AND
+                plan.is_child_ps_ok = '0'
             OPTION 输入.product_area <> ""
                 cut.product_area = 输入.product_area
             ENDOPTION
diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql
index 3d04f186a..31939d23a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/task/wql/PDA_TASK.wql
@@ -60,14 +60,14 @@
 			    ) AS task_status,
 			    class.class_name AS task_type,
 			    car_no,
-			    create_time,
+			    task.create_time,
 			    vehicle_code2,
 			    material_code
             FROM
             	SCH_BASE_Task task
             LEFT JOIN md_pb_classstandard class ON class.class_code = task.task_type
             WHERE
-                is_delete = '0'
+                task.is_delete = '0'
                 AND task_status <> '07'
 
                 OPTION 输入.search <> ""