From e5483140802b1ce498332804b541b2df76705ea5 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 10 Jan 2025 10:22:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=83=98=E6=88=BF=E7=BB=9F=E8=AE=A1=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8+=E4=BA=A7=E5=93=81=E8=BF=BD=E6=BA=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/mes/service/impl/IWCInterfaceServiceImpl.java | 8 ++++++-- .../src/main/resources/mapper/mes/MesReportWorkMapper.xml | 4 ++-- 2 files changed, 8 insertions(+), 4 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 ff454e87..48a3a815 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 @@ -831,7 +831,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } workOrder.setUploadTime(nowTime); mesReportWorkMapper.updateSyncSapStatus(workOrder); - //mesReportWorkMapper.updateOrderWorkStatus(workOrder); + //如果是暂停的工单报工，向sap报工结束后，工单状态->w3 + workOrder.setStatus("w3"); + mesReportWorkMapper.updateOrderWorkStatus(workOrder); return r; // return R.ok();//测试 } @@ -892,7 +894,9 @@ public class IWCInterfaceServiceImpl implements IWCSInterfaceService { } workOrder.setUploadTime(nowTime); mesReportWorkMapper.updateSyncSapStatus(workOrder); - + //如果是暂停的工单报工，向sap报工结束后，工单状态->w3 + workOrder.setStatus("w3"); + mesReportWorkMapper.updateOrderWorkStatus(workOrder); return r; // return R.ok();//测试 } 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 08e7707c..542c6b44 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 @@ -1407,8 +1407,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update pro_order_workorder set status = #{status}, update_by = #{updateBy}, - update_time = #{updateTime} - where belong_work_order = #{workorderCode} + update_time = GETDATE() + where belong_work_order = #{workorderCode} and status = 'w4' and parent_order = '0'