Merge remote-tracking branch 'origin/master'

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

@@ -110,7 +110,8 @@
         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
-		where mrwc.del_flag = '0' and pow.del_flag = '0' and mpd.del_flag = '0'
+                                                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
 	</select>