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 55379f8b3..0263194de 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 @@ -117,10 +117,11 @@ mpd.quantity planQuantity, mrwc.parent_order parentOrder from mes_report_work_consume mrwc - left join pro_order_workorder pow on mrwc.workorder_code = pow.workorder_code - left join mes_prepare_detail mpd on mpd.parent_work_order = pow.belong_work_order - and mpd.material_code = mrwc.material_code - and mpd.del_flag = '0' + left join pro_order_workorder pow on mrwc.workorder_code = pow.workorder_code + left join mes_prepare mp on mp.workorder_code = pow.workorder_code and mp.del_flag='0' + left join mes_prepare_detail mpd on mpd.prepare_id = mp.prepare_id + and mpd.material_code = mrwc.material_code + and mpd.del_flag = '0' where mrwc.del_flag = '0' and pow.del_flag = '0' and mrwc.workorder_code = #{workorderCode} order by mrwc.recoil,mrwc.attr1