From 473f78963162982ad2e56db0534a3be0c45c61d5 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Tue, 12 Sep 2023 13:56:18 +0800
Subject: [PATCH] =?UTF-8?q?sap=E6=8A=A5=E5=B7=A5=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=AE=A2=E5=8D=95=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=8A=A5=E5=B7=A5=E7=8A=B6=E6=80=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/mes/mapper/MesReportWorkMapper.java   | 2 ++
 .../com/op/mes/service/impl/MesPrepareServiceImpl.java     | 6 ++++++
 .../src/main/resources/mapper/mes/MesReportWorkMapper.xml  | 7 ++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
index e9c23eb12..630d214d4 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/mapper/MesReportWorkMapper.java
@@ -76,4 +76,6 @@ public interface MesReportWorkMapper {
     String getTitleName(MesDailyReport mesDailyReport);
 
     List<SysFactoryDto> getWorkcenterList(MesDailyReport mesDailyReport);
+
+	public void updateWorkOrderStatus(MesReportWork work);
 }
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java
index 0fe86094f..eab339260 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesPrepareServiceImpl.java
@@ -277,6 +277,12 @@ public class MesPrepareServiceImpl implements IMesPrepareService {
             }
             work.setUploadTime(DateUtils.getNowDate());
             mesReportWorkMapper.updateSyncSapStatus(work);
+            //关闭订单
+            remoteSapService.sapCloseOrder(work.getOrderCode());
+            //pro_work_order status->w4报工
+            work.setStatus("w4");
+            work.setUpdateTime(DateUtils.getNowDate());
+            mesReportWorkMapper.updateWorkOrderStatus(work);
         }
     }
     public static void main(String args[]) {
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 2b9e2ce29..7b2b11dfa 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
@@ -157,7 +157,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="productDateEnd != null "> and #{productDateEnd} >= CONVERT(varchar(10),mrw.feedback_time, 120)</if>
 	</select>
     <select id="getReportWorkList" resultType="com.op.mes.domain.MesReportWork">
-		select ow.workorder_code_sap workorderCodeSap,
+		select ow.order_code orderCode,
+			   ow.workorder_code workorderCode,
+		       ow.workorder_code_sap workorderCodeSap,
 			   ow.route_code routeCode,
 			   rte.tec_machine sac1,
 			   rte.tec_man sac2,
@@ -331,6 +333,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		</trim>
 		where id = #{id}
 	</update>
+	<update id="updateWorkOrderStatus">
+		update pro_order_workorder set status = #{status} where workorder_code = #{workorderCode}
+	</update>
 
 	<delete id="deleteMesReportWorkById" parameterType="String">
 		delete from mes_report_work where id = #{id}