From 04b1c0aacbf17a5df6d2fb7adad409ae9596d461 Mon Sep 17 00:00:00 2001
From: 18188916393 <2562295436@qq.com>
Date: Fri, 5 Aug 2022 10:26:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=80=BC=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=9C=AA=E4=B8=8B=E5=8F=91=E4=BB=A5=E5=A4=96=E7=9A=84=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql
index 445d5432..738978f5 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/BIGSCREENPRODUCT.wql
@@ -61,6 +61,7 @@
            where
 
                  shiftorder.is_delete='0'
+                 and shiftorder.order_status<>'00'
                  OPTION 输入.worksection_type_scode <> ""
                      workprocedure.worksection_type_scode = 输入.worksection_type_scode
                  ENDOPTION
@@ -134,6 +135,7 @@ ENDIF
           	mps_bd_produceshiftorder shiftorder
            	where
             	 shiftorder.is_delete='0'
+            	 and shiftorder.order_status<>'00'
                 OPTION 输入.produce_date <> ""
                     shiftorder.produce_date = 输入.produce_date
                 ENDOPTION
@@ -149,6 +151,7 @@ ENDIF
               	mps_bd_produceshiftorder shiftorder
                	where
 	                shiftorder.realproduceend_date > shiftorder.planproduceend_date
+	                and shiftorder.order_status<>'00'
                     OPTION 输入.produce_date <> ""
                         shiftorder.produce_date = 输入.produce_date
                     ENDOPTION
@@ -168,6 +171,7 @@ ENDIF
             	LEFT JOIN pdm_bi_workprocedure workprocedure ON workprocedure.workprocedure_id = shiftorder.workprocedure_id
             WHERE
                  shiftorder.is_delete='0'
+                 and shiftorder.order_status<>'00'
                 and	workprocedure.workprocedure_code IN ( '07', '06', '02' )
                     OPTION 输入.produce_date <> ""
                         shiftorder.produce_date = 输入.produce_date
@@ -268,6 +272,7 @@ IF 输入.flag = "11"
                 	left join md_me_materialbase material on material.material_id =shiftorder.material_id
                 WHERE
                      shiftorder.is_delete='0'
+                     and shiftorder.order_status<>'00'
                     and	workprocedure.workprocedure_code IN ( '07', '06', '02' )
                 	and shiftorder. real_qty < shiftorder.plan_qty
                  	 OPTION 输入.produce_date <> ""
@@ -379,9 +384,6 @@ IF 输入.flag = "14"
                  OPTION 输入.worksection_type_scode <> ""
                      workprocedure.worksection_type_scode = 输入.worksection_type_scode
                  ENDOPTION
-                  OPTION 输入.produce_date <> ""
-                          shiftorder.produce_date = 输入.produce_date
-                  ENDOPTION
             ENDSELECT
         ENDQUERY
     ENDIF