From 500bd5017b19473c8406982882deeb4e2339945a Mon Sep 17 00:00:00 2001 From: gsz Date: Thu, 1 Aug 2024 14:49:23 +0800 Subject: [PATCH] =?UTF-8?q?MesReportWorkByPreDayJob=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81+?= =?UTF-8?q?=E4=BA=A7=E7=94=9F=E6=96=B0=E5=B7=A5=E5=8D=95=E5=8F=B7=E5=89=8D?= =?UTF-8?q?=E5=8A=A0"A-"=E6=A0=87=E8=AF=86=E8=87=AA=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java | 3 +++ .../ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java index 4835e52..40e4602 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesReportWorkByPreDayJob.java @@ -4,6 +4,7 @@ package cn.estsh.i3plus.ext.mes.pcn.apiservice.schedulejob; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesConfigService; import cn.estsh.i3plus.ext.mes.pcn.api.busi.IMesWorkOrderService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn; @@ -100,6 +101,8 @@ public class MesReportWorkByPreDayJob extends BaseMesScheduleJob { } for (MesProductionRecord mesProductionRecord : mesProductionRecordList) { mesProductionRecord.setReportStatus(20); + mesProductionRecord.setSystemSyncStatus(1); + mesProductionRecord.setSystemSyncDatetime(TimeTool.getNowTime(true)); ConvertBean.serviceModelUpdate(mesProductionRecord, userName); } productionRecordRao.saveAll(mesProductionRecordList); diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java index 57a688d..652ca71 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkOrderService.java @@ -1024,7 +1024,7 @@ public class MesWorkOrderService implements IMesWorkOrderService { genSerialNoModel.setPartNo(workCenterCode); orderList = syncFuncService.syncSerialNo(genSerialNoModel,userName, organizeCode, 1).getResultList(); - String orderNo = orderList.get(0); + String orderNo = "A-"+orderList.get(0); DdlPackBean orderPackBean = DdlPackBean.getDdlPackBean(item.getOrganizeCode()); DdlPreparedPack.getStringEqualPack(orderNo, "workOrderNo", orderPackBean); if (mesWorkOrderRDao.isExitByHql(orderPackBean)) {