日生产报表查询逻辑修改

op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml

@@ -455,14 +455,15 @@
             mr.work_time,
             mr2.quantity_feedback,
             ROUND( mr2.quantity_feedback/mr.work_time,2) AS actXl
-        from mes_line ml
+        from (
-                 left join(
+             select top 1 use_man,work_time,machine_code,report_code,product_code
-            select top 1 use_man,work_time,machine_code,report_code
+             from mes_report_work where del_flag = '0' and machine_code = #{equCode} and parent_order !='0' order by create_time desc
-            from mes_report_work where del_flag = '0' and machine_code = #{equCode} and parent_order !='0' order by create_time desc
+        ) mr
-        ) mr on mr.machine_code = ml.line_code
+        left join mes_report_work mr2 on mr2.report_code = mr.report_code and mr2.parent_order ='0'
-                 left join mes_report_work mr2 on mr2.report_code = mr.report_code and mr2.parent_order ='0'
+        left join mes_line ml on mr.machine_code = ml.line_code
+        left join mes_line_product mlp on mlp.belong_to = ml.id and mr2.product_code = mlp.product_code
         where ml.line_code = #{equCode}
-          and ml.del_flag='0'
+          and ml.del_flag='0' and mlp.del_flag='0'
     </select>
 
 </mapper>

op-modules/op-mes/src/main/resources/mapper/mes/MesReportWorkMapper.xml

@@ -687,7 +687,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		from base_equipment be
 		left join pro_order_workorder pow on be.equipment_code = pow.workorder_name
 		left join mes_line ml on be.equipment_code = ml.line_code
-		where be.del_flag = '0' and be.sap_code is not null and pow.status = 'w3'
+		left join mes_line_product mlp on mlp.belong_to = ml.id and pow.product_code = mlp.product_code
+		where be.del_flag = '0' and be.sap_code is not null and pow.status = 'w3' and mlp.del_flag='0'
 			and pow.parent_order = '0' and pow.del_flag='0' and ml.del_flag='0'
 			<if test="sapName != null and sapName != ''">and be.sap_name like concat('%', #{sapName}, '%')</if>
 		  	<if test="workCenter != null and workCenter != ''">and be.workshop_code = #{workCenter}</if>