From da8a504b398665c72bbaacb3261c3fb74292c02d Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Thu, 6 Jun 2024 11:28:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E7=94=9F=E4=BA=A7=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/mes/MesMapper.xml | 15 ++++++++------- .../resources/mapper/mes/MesReportWorkMapper.xml | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml b/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml index 97620f474..e232097c0 100644 --- a/op-modules/op-mes/src/main/resources/mapper/mes/MesMapper.xml +++ b/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 - left join( - 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 - ) 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' + from ( + select top 1 use_man,work_time,machine_code,report_code,product_code + from mes_report_work where del_flag = '0' and machine_code = #{equCode} and parent_order !='0' order by create_time desc + ) mr + 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' 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 5173b1c53..0fbd69669 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 @@ -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' and be.sap_name like concat('%', #{sapName}, '%') and be.workshop_code = #{workCenter}