From 0f5dfce37548aadd1353930a7e320714b20d2ee3 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 12 Apr 2024 21:16:20 +0800
Subject: [PATCH] del_flag

---
 .../src/main/resources/mapper/mes/MesReportWorkMapper.xml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
index 3e00b613..0abe5b7b 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml
@@ -596,11 +596,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				 from
 					 mes_report_work
 				 where upload_status != #{uploadStatus} and prod_type = #{prodType}
-			and workorder_code =  #{workorderCode}
+			and workorder_code =  #{workorderCode} and del_flag='0'
 				 group by workorder_code,product_code,product_name,remark
 		) mrw
 		left join pro_order_workorder ow on mrw.workorder_code = ow.workorder_code
 		left join base_equipment equ on equ.equipment_code = ow.workorder_name
+		where ow.del_flag='0' and equ.del_flag='0'
 	</select>
 	<select id="selectMesReportWorkList_S" parameterType="MesReportWork" resultMap="MesReportWorkResult">
 		SELECT