From f4f581d23728f44c3e687ef0bed25fa51fb73f99 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 3 Aug 2024 11:12:36 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=20=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/serviceimpl/report/MesEquipmentLogDetailService.java | 4 ++-- .../apiservice/serviceimpl/report/MesWorkCellMonitorLogService.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java index 03f2065..984eda0 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/report/MesEquipmentLogDetailService.java @@ -27,10 +27,10 @@ public class MesEquipmentLogDetailService extends BaseMesService Date: Sat, 3 Aug 2024 21:34:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B5=8B1=E7=9A=84=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E8=B7=9F=E7=BD=97=20=E5=8F=8C=202=E4=BA=BA?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/apiservice/controller/busi/MesWhiteListController.java | 5 +++-- .../i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java | 6 ++++-- .../i3plus/ext/mes/apiservice/schedulejob/MesQmsSuspiciousJob.java | 4 +++- .../java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java | 7 +++++++ 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesWhiteListController.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesWhiteListController.java index 6e672f4..da6ffbd 100644 --- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesWhiteListController.java +++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/busi/MesWhiteListController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.ext.mes.apiservice.controller.busi; import cn.estsh.i3plus.ext.mes.api.base.*; import cn.estsh.i3plus.ext.mes.api.busi.IMaximoService; import cn.estsh.i3plus.ext.mes.pojo.model.MaximoParamModel; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; @@ -191,8 +192,8 @@ public class MesWhiteListController extends MesBaseController { qmsScrapService.doQmsScrapByPartInspection(mesPartInspectionList,organizeCode); for (MesPartInspection mesPartInspection : mesPartInspectionList) { - mesPartInspection.setSystemSyncStatus(1); - mesPartInspection.setSystemSyncDatetime(TimeTool.getNowTime(true)); + mesPartInspection.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + 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/MesQmsScrapJob.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/schedulejob/MesQmsScrapJob.java index 6905562..33d761b 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 @@ -1,7 +1,9 @@ package cn.estsh.i3plus.ext.mes.apiservice.schedulejob; import cn.estsh.i3plus.ext.mes.api.base.IMesQmsScrapService; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.mes.apiservice.schedulejob.BaseMesScheduleJob; +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.enumutil.CommonEnumUtil; @@ -82,8 +84,8 @@ public class MesQmsScrapJob extends BaseMesScheduleJob { qmsScrapService.doQmsScrapByPartInspection(mesPartInspectionList,organizeCode); for (MesPartInspection mesPartInspection : mesPartInspectionList) { - mesPartInspection.setSystemSyncStatus(1); - mesPartInspection.setSystemSyncDatetime(TimeTool.getNowTime(true)); + mesPartInspection.setSystemSyncStatus(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + 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 1482100..d252011 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 @@ -1,7 +1,9 @@ package cn.estsh.i3plus.ext.mes.apiservice.schedulejob; import cn.estsh.i3plus.ext.mes.api.base.IMesQmsSuspiciousService; +import cn.estsh.i3plus.ext.mes.pojo.util.MesExtConstWords; import cn.estsh.i3plus.mes.apiservice.schedulejob.BaseMesScheduleJob; +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.enumutil.CommonEnumUtil; @@ -102,7 +104,7 @@ public class MesQmsSuspiciousJob extends BaseMesScheduleJob { for (MesPartInspection mesPartInspection : mesPartInspectionList) { mesPartInspection.setQmsSync(1); - mesPartInspection.setSystemSyncDatetime(TimeTool.getNowTime(true)); + ConvertBean.serviceModelUpdate(mesPartInspection, MesExtConstWords.JOB); } partInspectionRepository.saveAll(mesPartInspectionList); } diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java index bbe5937..92cf96a 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java @@ -127,6 +127,8 @@ public class MesExtConstWords { public static final String LOG_TYPE = "logType"; //信息类型 public static final String MESSAGE_TYPE = "messageType"; + //信息 + public static final String MESSAGE = "message"; //枚举代码 public static final String ENUM_CODE = "enumCode"; //组件类型 @@ -230,4 +232,9 @@ public class MesExtConstWords { // 分表配置 public static final String MES_SHARDING_TABLES_OBJECT_CFG = "MES_SHARDING_TABLES_OBJECT_CFG"; + // 工位扫描日志报表临时文件 + public static final String MES_WCSML_REPORT_TMP_DATA = "MES_WCSML_REPORT_TMP_DATA"; + public static final String CONDITION_U = "CONDITION"; + public static final String DATA_U = "DATA"; + } From 6cde8fa37c8032d830643d186e22839f9550491c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 3 Aug 2024 22:42:01 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=97=A5=E5=BF=97model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesWorkCellScanMonitorConditionModel.java | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesWorkCellScanMonitorConditionModel.java b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesWorkCellScanMonitorConditionModel.java index 7723d7c..99bc265 100644 --- a/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesWorkCellScanMonitorConditionModel.java +++ b/modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/model/report/MesWorkCellScanMonitorConditionModel.java @@ -19,6 +19,9 @@ public class MesWorkCellScanMonitorConditionModel { @ApiParam(value = "组织代码") private String organizeCode; + @ApiParam(value = "操作人") + private String userInfo; + @ApiParam(value = "产线") private String workCenterCode; @@ -43,6 +46,9 @@ public class MesWorkCellScanMonitorConditionModel { @ApiParam("扫描/读取信息") private String scanInfo; + @ApiParam("信息") + private String message; + @ApiParam("生产工单号") private String workOrderNo; @@ -103,5 +109,35 @@ public class MesWorkCellScanMonitorConditionModel { return this; } + @Override + public String toString() { + + return "MesWorkCellScanMonitorConditionModel{" + + "organizeCode='" + organizeCode + '\'' + + ", userInfo='" + userInfo + '\'' + + ", workCenterCode='" + workCenterCode + '\'' + + ", workCellCode='" + workCellCode + '\'' + + ", equipId='" + equipId + '\'' + + ", equipmentCode='" + equipmentCode + '\'' + + ", equipVariableId='" + equipVariableId + '\'' + + ", equipVariableName='" + equipVariableName + '\'' + + ", mouldRecordId='" + mouldRecordId + '\'' + + ", scanInfo='" + scanInfo + '\'' + + ", message='" + message + '\'' + + ", workOrderNo='" + workOrderNo + '\'' + + ", productSn='" + productSn + '\'' + + ", partNo='" + partNo + '\'' + + ", stepCode='" + stepCode + '\'' + + ", logTypes='" + logTypes + '\'' + + ", messageType='" + messageType + '\'' + + ", limit='" + limit + '\'' + + ", ascOrDesc='" + ascOrDesc + '\'' + + ", createDateTimeStart='" + createDateTimeStart + '\'' + + ", createDateTimeEnd='" + createDateTimeEnd + '\'' + + '}'; + + + } + }