From 385ed16dd57d926d86ca431ff3b0d50b394f2cba Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 11 Jan 2024 14:17:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=8A=B6=E6=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/mes/service/impl/IWCInterfaceServiceImpl.java  | 7 ++++---
 .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 8 --------
 2 files changed, 4 insertions(+), 11 deletions(-)

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 7abda12e4..224948f9c 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
@@ -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
         }
@@ -325,8 +325,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
             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 +339,7 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService {
 //                mesReportWorkMapper.updateOrderWorkStatus(rworkVo);
 //            }
         }
-        return R.ok();
+        return R.fail("子单报工失败");
     }
 
     /**
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 f5c9f4155..c82bc1285 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
@@ -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,