From e6554a9e416abf227eeef0a9d30a9947ddbc884a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 27 Dec 2023 08:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/plan/ProOrderWorkorderMapper.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 853fc9abf..938b4e955 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -60,7 +60,7 @@
                 pow.shift_id, pow.parent_order,pow.status, pow.prod_type,pow.factory_code,
                 pow.end_flag,pow.car_num,pow.sort_no,
                 pow.workorder_code_sap,
-                ppow.product_code pproductCode,ppow.product_name pproductName,pow.workorder_code_sap pworkorderCodeSap
+                ppow.product_code pproductCode,ppow.product_name pproductName,ppow.workorder_code_sap pworkorderCodeSap
         from pro_order_workorder pow
         left join pro_order_workorder ppow on pow.parent_order = ppow.workorder_code
         <where>
@@ -80,7 +80,7 @@
             <if test="endFlag != null  and endFlag != ''"> and pow.end_flag = #{endFlag}</if>
             <if test="productDateStart != null "> and CONVERT(varchar(10),pow.product_date, 120) >= '${productDateStart}'</if>
             <if test="productDateEnd != null "> and '${productDateEnd}' >= CONVERT(varchar(10),pow.product_date, 120)</if>
-            and pow.del_flag = '0'
+            and pow.del_flag = '0' and ppow.del_flag = '0'
         </where>
     </select>