From a48348674653b726371c2a5f77d9a219dcdbf728 Mon Sep 17 00:00:00 2001 From: yxw Date: Wed, 15 Nov 2023 10:47:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E8=B4=A7=E6=A3=80=E9=AA=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8A=A5=E8=A1=A8=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pcn/apiservice/serviceimpl/busi/jx/JxOqcLastCheckService.java | 7 ------- .../estsh/i3plus/ext/mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxOqcLastCheckService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxOqcLastCheckService.java index d0d725f..2e63b66 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxOqcLastCheckService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/jx/JxOqcLastCheckService.java @@ -13,7 +13,6 @@ import cn.estsh.i3plus.ext.mes.pcn.pojo.repository.MesOqcLastCheckIfRepository; import cn.estsh.i3plus.ext.mes.pcn.pojo.repository.MesOutPutStatisticsOqcRepository; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtConstWords; import cn.estsh.i3plus.ext.mes.pcn.pojo.util.MesPcnExtEnumUtil; -import cn.estsh.i3plus.icloud.core.sdk.ICoreUtilCloud; import cn.estsh.i3plus.mes.pcn.api.iservice.busi.ISyncFuncService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; @@ -54,9 +53,6 @@ public class JxOqcLastCheckService implements IJxOqcLastCheckService { @Autowired private IJxOutPutStatisticsDao outPutStatisticsDao; - //@Autowired - //private ICoreUtilCloud sysOrderNoRuleCloud; - @Autowired private ISyncFuncService syncFuncService; @@ -64,9 +60,6 @@ public class JxOqcLastCheckService implements IJxOqcLastCheckService { private MesOqcLastCheckIfRepository oqcLastCheckIfRepository; @Autowired - private IJxOqcCheckService sxOqcCheckService; - - @Autowired private IBuOutPutStatisticsService buOutPutStatisticsService; @Override diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java index 832b033..d49fe8c 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/bean/MesOqcRuleNoteDetail.java @@ -108,5 +108,10 @@ public class MesOqcRuleNoteDetail extends BaseBean implements Serializable { @AnnoOutputColumn(refClass = MesPcnExtEnumUtil.OQC_BASE_TYPE.class, refForeignKey = "value", value = "description", hidden = true) private Integer baseType; + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam("系统同步标志") + public Integer systemSyncStatus = 2; + }