报工组件修改10

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,