Merge remote-tracking branch 'origin/master'

op-modules/op-mes/src/main/java/com/op/mes/service/impl/IWCInterfaceServiceImpl.java

@@ -290,7 +290,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
      */
     @Override
     public R reportWork(MesReportWork mesReportWork) {
-        String belongWorkOrder = mesReportWork.getWorkorderCode();
+
         if(StringUtils.isNotBlank(mesReportWork.getFactoryCode())){//已经加上ds_
             DynamicDataSourceContextHolder.push(mesReportWork.getFactoryCode());// 这是数据源的key
         }
@@ -319,14 +319,20 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
             if(pHzWork==null){
                 return R.fail("未查询到母报工单");
             }
+            try {
+                Thread.sleep(3000);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
             //母工单报工
             logger.info("==========================母工单报工开始");
             pHzWork.setQuantityFeedback(sHzWorks.getQuantityFeedback());
             pHzWork.setSac1(sHzWorks.getSac1());
             R sapR = this.reportHzToSap(pHzWork);
             logger.info("==========================母工单报工结束"+JSONObject.toJSONString(sapR));
+            return sapR;
             //最终报工标识且sap报工成功：关闭子母工单
-            MesReportWork endReport = mesReportWorkMapper.getEndReport(pHzWork);
+//            MesReportWork endReport = mesReportWorkMapper.getEndReport(pHzWork);
 //-----改为由上位机触发
 //            if("1".equals(endReport.getEndReport())&&sapR.getCode()==200){
 //                MesReportWork rworkVo = new MesReportWork();
@@ -338,7 +344,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
 //                mesReportWorkMapper.updateOrderWorkStatus(rworkVo);
 //            }
         }
-        return R.ok();
+        return R.fail("子单报工失败");
     }
 
     /**

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

@@ -442,7 +442,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join base_shifts_t s on pow.shift_id = s.Shift_Id
 		left join pro_order_workorder pows on pows.parent_order = pow.workorder_code
 		left join mes_report_work mrw on mrw.workorder_code = pow.workorder_code
-		where pow.del_flag = '0' and pow.status = 'w2' and pow.parent_order ='0'
+		where pow.del_flag = '0' and mrw.upload_status != '1' and pow.parent_order ='0'
 		and mrw.upload_status != '1'
 		<if test="workorderCode != null  and workorderCode != ''">
 		   and pow.workorder_code like concat('%', #{workorderCode}, '%')
@@ -472,7 +472,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		select workorder_code_sap workorderCodeSap,
 		       workorder_code workorderCode
 		from pro_order_workorder
-		where belong_work_order = #{workorderCode} and del_flag = '0' and status = 'w2'
+		where belong_work_order = #{workorderCode} and del_flag = '0' <!--and status = 'w2'-->
         order by parent_order
 	</select>
 	<select id="getReportWorkHzList" resultType="com.op.mes.domain.MesReportWork">
@@ -562,14 +562,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			mrw.product_name productName,
 		    mrw.sac1,
 		    mrw.sac2
-		    <!--,
-			rte.tec_machine sac1,
-			rte.tec_man sac2,
-			rte.tec_depreciation sac3,
-			rte.tec_other sac4,
-			rte.tec_conf_acivity5 sac5,
-			rte.tec_conf_acivity6 sac6
-			-->
 		from (
 				 select
 					 workorder_code,