From 0ece26351169fb82c98107b2080835c51a4b386f Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 4 Sep 2024 14:08:35 +0800 Subject: [PATCH] =?UTF-8?q?42941=20mes=5Fqms=5Fscrap=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5nc=5Fjudger=E8=BF=99=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=9C=80=E8=A6=81=E8=B5=8B=E6=9C=80=E7=BB=88=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E4=BA=BA=E6=88=96=E8=80=85=E8=BF=94=E5=B7=A5=E6=8A=A5?= =?UTF-8?q?=E5=BA=9F=E4=BA=BA=E7=9A=84=E5=B7=A5=E5=8F=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/schedulejob/MesQmsScrapJob.java | 2 +- .../mes/apiservice/schedulejob/MesQmsSuspiciousJob.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java index e48673c..f6d52bd 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java @@ -85,7 +85,7 @@ public class MesQmsScrapJob extends BaseMesScheduleJob { for (MesPartInspection mesPartInspection : mesPartInspectionList) { mesPartInspection.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); - ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); +// ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); } partInspectionRepository.saveAll(mesPartInspectionList); } diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java index 9ef53e6..dee3c9f 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java @@ -80,13 +80,13 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob { // new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 1)) + " 00:00:00", // TimeTool.getToday() + " 00:00:00", "createDatetime", packBean, true); // 获取当前时间前1小时的时间 - LocalDateTime now = LocalDateTime.now(); - LocalDateTime oneHourAgo = now.minusHours(1); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - String formattedNow = now.format(formatter); - String formattedOneHourAgo = oneHourAgo.format(formatter); +// LocalDateTime now = LocalDateTime.now(); +// LocalDateTime oneHourAgo = now.minusHours(1); +// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); +// String formattedNow = now.format(formatter); +// String formattedOneHourAgo = oneHourAgo.format(formatter); +// DdlPreparedPack.timeBuilder(formattedOneHourAgo, formattedNow, "createDatetime", packBean, true); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "qmsSync", packBean); - DdlPreparedPack.timeBuilder(formattedOneHourAgo, formattedNow, "createDatetime", packBean, true); List mesPartInspectionList = partInspectionRepository.findByHqlWhere(packBean); if (!CollectionUtils.isEmpty(mesPartInspectionList)) { @@ -114,7 +114,7 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob { for (MesPartInspection mesPartInspection : mesPartInspectionList) { mesPartInspection.setQmsSync(1); - ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); +// ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); } partInspectionRepository.saveAll(mesPartInspectionList); }