diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
index 7f6dd6d61..b105e0d3e 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java
@@ -358,9 +358,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
             mesReportWork.setMachineCode(mesReportWork.getMachineCode());
             MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork);
 
-//            if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
-//                sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
-//            }
+            if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
+                sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
+            }
 
             if(sHzWorks==null){
                 return R.fail("未查询到一层报工单");
@@ -386,9 +386,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
             mesReportWork.setMachineCode(mesReportWork.getMachineCode());
             MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork);
 
-//            if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
-//                sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
-//            }
+            if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
+                sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
+            }
 
             if(sHzWorks==null){
                 return R.fail("未查询到子报工单");
@@ -405,9 +405,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
                 mesReportWork.setMachineCode(mesReportWork.getMachineCode());
                 MesReportWork pHzWork = mesReportWorkMapper.getReportWorkHz(mesReportWork);
 
-//                if(pHzWork==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
-//                    pHzWork = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
-//                }
+                if(pHzWork==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
+                    pHzWork = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
+                }
 
                 if(pHzWork==null){
                     return R.fail("未查询到母报工单");
@@ -444,9 +444,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
                 mesReportWork.setMachineCode(mesReportWork.getMachineCode());
                 MesReportWork sHzWorks = mesReportWorkMapper.getReportWorkHz(mesReportWork);
 
-//                if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
-//                    sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
-//                }
+                if(sHzWorks==null){//再去查预报工的一条数，带出基本数据，其它全部赋值0
+                    sHzWorks = mesReportWorkMapper.getReportWorkHzAttr1(mesReportWork);
+                }
 
                 if (sHzWorks == null) {
                     return R.fail(workOrder.getWorkorderCode()+"未查询到报工单");
@@ -635,7 +635,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
         sapRFW.setAnzma(workOrder.getSapCode());//产线编号
         sapRFW.setRemark(workOrder.getRemark());//备注
         logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工请求：" + JSONObject.toJSONString(sapRFW));
-        R r = remoteSapService.sapRFWOrder(sapRFW);
+        R r = R.ok();//remoteSapService.sapRFWOrder(sapRFW);
         logger.info(workOrder.getWorkorderCodeSap() + "sap工单报工结果：" + r.getCode() + "," + r.getData() + "," + r.getMsg());
         //上传成功，更改mes_report_work状态
         if (r.getCode() == 200) {
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 2b1ec9c0b..5a2fb1aa7 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
@@ -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' or attr1 is null)  <!--attr1是预报工-->
 				 <if test='machineCode!=""'>
 					and machine_code = #{machineCode}
 				 </if>