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 ff454e876..48a3a815b 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 08e7707cd..542c6b44b 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'