From a38d0d32e5776d49c63204c94db09cff0ea5a55a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 25 Mar 2024 10:55:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=BB=84=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B910?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/mes/MesReportWorkConsumeMapper.xml    | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
index d45efda4a..f5c05a81f 100644
--- a/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
+++ b/op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkConsumeMapper.xml
@@ -52,6 +52,7 @@
             <if test="factoryCode != null  and factoryCode != ''">and factory_code = #{factoryCode}</if>
             <if test="recoil != null and recoil != ''">and recoil = #{recoil}</if>
             and del_flag = '0'
+            and quantity != '.00'
         </where>
     </select>
 
@@ -86,6 +87,12 @@
         <if test="productGroupName != null  and productGroupName != ''">
             and bp.product_group_name like concat('%',#{productGroupName}, '%')
         </if>
+        <if test="workorderCode != null  and workorderCode != ''">
+        and bp.product_code not in(
+            select material_code from mes_report_work_consume
+            where workorder_code = #{workorderCode} or parent_order = #{workorderCode} and del_flag='0'
+        )
+        </if>
     </select>
     <select id="getTeamList" resultType="com.op.system.api.domain.mes.BaseTeamTDTO">
 		select Team_Code teamCode,