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 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" and #{productDateEnd} >= CONVERT(varchar(10),mrw.feedback_time, 120)