From c283acfd7ce4753707487babc27a74f88d6d1a15 Mon Sep 17 00:00:00 2001 From: administrator Date: Thu, 4 Jul 2024 09:15:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=BD=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/schedulejob/MesWorkCellOperationLogJob.java | 1 - .../serviceimpl/busi/MesWorkCellScanMonitorLogServiceImpl.java | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesWorkCellOperationLogJob.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesWorkCellOperationLogJob.java index 69293d8..a7bedd8 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesWorkCellOperationLogJob.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/schedulejob/MesWorkCellOperationLogJob.java @@ -7,7 +7,6 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkCellScanMonitorLogServiceImpl.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkCellScanMonitorLogServiceImpl.java index d29e0ca..efa7865 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkCellScanMonitorLogServiceImpl.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesWorkCellScanMonitorLogServiceImpl.java @@ -43,13 +43,14 @@ public class MesWorkCellScanMonitorLogServiceImpl implements IMesWorkCellScanMon DdlPackBean logPackBean = DdlPackBean.getDdlPackBean(organizeCode); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"serviceFlag",logPackBean); DdlPreparedPack.getIsNotNull("mouldRecordId",logPackBean); + DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.ASC.getValue()}, new String[]{"createDatetime"}, logPackBean); List monitorLogs = monitorLogRao.findByHqlTopWhere(logPackBean, pageSize); if (!monitorLogs.isEmpty()) { for (MesWorkCellScanMonitorLog monitorLog : monitorLogs) { Long mouldRecordId = monitorLog.getMouldRecordId(); DdlPackBean recordPackBean = DdlPackBean.getDdlPackBean(organizeCode); - DdlPreparedPack.getNumEqualPack(mouldRecordId,"mouldRecordId",logPackBean); + DdlPreparedPack.getNumEqualPack(mouldRecordId,"mouldRecordId",recordPackBean); List recordList = productionRecordRao.findByHqlWhere(recordPackBean); //需要补录如下字段 if (!recordList.isEmpty()) { @@ -65,10 +66,11 @@ public class MesWorkCellScanMonitorLogServiceImpl implements IMesWorkCellScanMon monitorLog.setCustSn(custSnStr); monitorLog.setPartNo(partNoStr); monitorLog.setPartName(partNameStr); - ConvertBean.saveOrUpdate(monitorLog,"JOB"); + monitorLog.setServiceFlag(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); } + ConvertBean.saveOrUpdate(monitorLog,"JOB"); + monitorLogRao.update(monitorLog); } - monitorLogRao.saveAll(monitorLogs); } }