sap预报工+计划批次bug+报工备注bug修复3

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

@@ -619,7 +619,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 				 from
 					 mes_report_work
 				 where upload_status != #{uploadStatus} and prod_type = #{prodType}
-				 and workorder_code =  #{workorderCode} and del_flag='0'and attr1 != '1'<!--attr1是预报工-->
+				 and workorder_code =  #{workorderCode} and del_flag='0'<!--  and attr1 != '1'  attr1是预报工-->
 				 <if test='machineCode!=""'>
 					and machine_code = #{machineCode}
 				 </if>