From 717f268c280da4c1a7f0de6bbf6eeba996c5b223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 14 May 2020 10:24:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?POJO=E7=89=88=E6=9C=AC=E5=8F=B7=E8=BF=98?= =?UTF-8?q?=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 004fb69..bc7071b 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 650ee5b..f902a7c 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 9f9717e..807bef5 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index a9e288f..b948580 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index a44418c..e12eaee 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index 2de88b5..c338f71 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 123fdc9..1674a47 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 50ab2c2..7637865 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index 7f94617..d98b7d8 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index d800ecf..bf96e57 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 60fc467..a758a6a 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index d65e031..efacfd2 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index a785f21..dba12cc 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index d6d2f8e..81670b2 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 0fbfb69..26a7311 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 76739f9..eaf2544 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0368700..0f615b6 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index b2eedd4..9e5f745 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 5fcd08a..0fea52b 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index 2eddf76..cc8fce6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 25bd05348de8cffc8fbbd033161f4c3bc3140b4b Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Thu, 14 May 2020 10:33:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[serialVersionUID=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java | 3 +-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java | 1 + .../estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java | 3 +-- .../cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java | 1 + .../java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java | 2 +- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java | 2 +- .../cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java | 3 +-- .../cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java | 3 +-- .../java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java | 2 +- 20 files changed, 28 insertions(+), 28 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java index 30e8294..eb1c3c2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/BasVendor.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description : 供应商 @@ -26,9 +27,10 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name="BAS_VENDOR") @Api("供应商信息") -public class BasVendor extends BaseBean{ +public class BasVendor extends BaseBean implements Serializable { + + private static final long serialVersionUID = -8041987864739007553L; - private static final long serialVersionUID = 9214639813072592779L; @Column(name="VENDOR_NO") @ApiParam("供应商编号") private String vendorNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java index f7a2098..b340d1a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfQueueShipping.java @@ -30,7 +30,7 @@ import java.io.Serializable; @Table(name = "if_queue_shipping") @Api("JIT发运数据同步") public class IfQueueShipping extends BaseBean implements Serializable { - private static final long serialVersionUID = -8961182851667690154L; + private static final long serialVersionUID = -3385698810529084423L; @Column(name = "JIT_NO") @ApiParam("JIT队列编号") private String jitNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index f11ae4d..2a23858 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -27,8 +27,8 @@ import java.util.List; @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean implements Serializable { - private static final long serialVersionUID = 5371856566557305323L; + private static final long serialVersionUID = -7758794366003399222L; @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java index 5b17a07..36fb0a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 6476163540527157643L; + private static final long serialVersionUID = -6834031991151345038L; @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java index d40e746..83c18ad 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesOee.java @@ -68,11 +68,11 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("结束时段") private String endTime; - @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,3)") + @Column(name = "TOTAL_RUN_TIME", columnDefinition = "decimal(18,4)") @ApiParam("总生产时间") private Double totalRunTime; - @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,3)") + @Column(name = "TOTAL_STOP_TIME", columnDefinition = "decimal(18,4)") @ApiParam("总停机时间") private Double totalStopTime; @@ -92,19 +92,19 @@ public class MesOee extends BaseBean implements Serializable { @ApiParam("实际节拍") private Integer actualTakt; - @Column(name = "TIME_RATE", columnDefinition = "decimal(18,3)") + @Column(name = "TIME_RATE", columnDefinition = "decimal(18,4)") @ApiParam("时间开动率") private Double timeRate; - @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,3)") + @Column(name = "TAKT_RATE", columnDefinition = "decimal(18,4)") @ApiParam("性能开动率") private Double taktRate; - @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,3)") + @Column(name = "QUALIFIED_RATE", columnDefinition = "decimal(18,4)") @ApiParam("良品率") private Double qualifiedRate; - @Column(name = "OEE", columnDefinition = "decimal(18,3)") + @Column(name = "OEE", columnDefinition = "decimal(18,4)") @ApiParam("OEE") private Double oee; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java index 94a4da7..2385ff4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java @@ -28,8 +28,8 @@ import java.io.Serializable; @Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") public class MesPcnConnectLog extends BaseBean implements Serializable { - private static final long serialVersionUID = 2756240593256441951L; + private static final long serialVersionUID = 2756240593256441951L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java index dc26568..b5d583b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java @@ -31,8 +31,7 @@ import java.io.Serializable; @Table(name = "MES_PCN_SYS_USER_OFFLINE") @Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class MesPcnSysUserOffline extends BaseBean implements Serializable { - - private static final long serialVersionUID = 7617353154826718154L; + private static final long serialVersionUID = -7483799830588482021L; @Column(name = "USER_ID") @ApiParam(value = "人员ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java index d483cd6..a9d885f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTaskLog.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PCN_TASK_LOG") @Api("mes-pcn定时任务工作清单同步记录") public class MesPcnTaskLog extends BaseBean implements Serializable { - private static final long serialVersionUID = -784806389462540310L; + private static final long serialVersionUID = 1175730596573636224L; @Column(name = "SYNC_TIME_START") @ApiParam("同步数据开始时间") private String syncTimeStart; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java index 73fae24..0ccadd4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdScatterCfgBom.java @@ -29,6 +29,7 @@ import java.math.BigDecimal; @Api("散件产品配置明细") public class MesProdScatterCfgBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -6413857842993992190L; @Column(name = "SP_CFG_CODE") @ApiParam("散件配置编码") private String spCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index 654cc56..00efaba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -30,8 +30,7 @@ import java.io.Serializable; @Api("MES_客户JIT生产队列明细") public class MesQueueJitActualDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 1442091799346314190L; - + private static final long serialVersionUID = 3211496242571643906L; @Column(name = "JIS_ACTUAL_NO") @ApiParam("队列编号") private String jisActualNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java index cb0457f..44a5022 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScatterCfgDetail.java @@ -29,6 +29,7 @@ import java.math.BigDecimal; @Api("MES_散件配置报文关系") public class MesScatterCfgDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 1633467451954028328L; @Column(name = "SP_CFG_CODE") @ApiParam("散件配置编码") private String spCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java index 1672c91..63d6212 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java @@ -27,8 +27,8 @@ import java.io.Serializable; @Table(name = "MES_STATE_MACHINE") @Api("MES状态机") public class MesStateMachine extends BaseBean implements Serializable { - private static final long serialVersionUID = 6093522587973076640L; + private static final long serialVersionUID = 4532746282478232478L; @Column(name = "SM_CODE") @ApiParam("状态机代码") private String smCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java index 3692f51..11a7383 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSyncDeadLetter.java @@ -31,8 +31,8 @@ import java.util.List; }) @Api("数据同步死信") public class MesSyncDeadLetter extends BaseBean implements Serializable { - private static final long serialVersionUID = 1151025992437433734L; + private static final long serialVersionUID = -6427776318518431855L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java index 326dafe..11da3c6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTime.java @@ -22,8 +22,8 @@ import java.io.Serializable; @Table(name = "MES_TIME") @Api("工步参数") public class MesTime extends BaseBean implements Serializable { - private static final long serialVersionUID = 1562011791394529076L; + private static final long serialVersionUID = 5447356026236056885L; @Column(name = "MODULE") @ApiParam("组件") private String module; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java index 570ffd1..56743f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTorqueDetail.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") public class MesTorqueDetail extends BaseBean implements Serializable { - private static final long serialVersionUID = 2900363253333046861L; + private static final long serialVersionUID = 8916087884118304236L; @Column(name = "SN") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java index cd8463a..ed04956 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java @@ -32,8 +32,8 @@ import java.util.List; @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") public class MesWorkCellPoint extends BaseBean implements Serializable { - private static final long serialVersionUID = -6817903235638554748L; + private static final long serialVersionUID = -6817903235638554748L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 9b36072..53ce112 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -29,8 +29,8 @@ import java.io.Serializable; @Table(name = "MES_WORK_CELL_POINT_GROUP") @Api("工站分组队列") public class MesWorkCellPointGroup extends BaseBean implements Serializable { - private static final long serialVersionUID = -6817903235638554748L; + private static final long serialVersionUID = -7544627137183733563L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java index 151b5ef..bc6bb5f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/EsProductDataModule.java @@ -23,8 +23,7 @@ import java.util.ArrayList; @ElasticSearch public class EsProductDataModule extends BaseBean implements Serializable { - private static final long serialVersionUID = 4514407617515827040L; - + private static final long serialVersionUID = -5907453749571718168L; @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java index 635c74d..4a4db6e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPartFormulaModel.java @@ -18,8 +18,7 @@ import lombok.Data; @Api(value="生产配方模板",description = "生产配方模板") public class MesPartFormulaModel extends BaseBean { - private static final long serialVersionUID = 2167743108452607620L; - + private static final long serialVersionUID = 5790342327875844545L; @ApiParam(value = "组号") @AnnoOutputColumn private String groupNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java index a2464b7..509e085 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepParamsModel.java @@ -16,8 +16,8 @@ import java.util.Map; @Data @Api("下拉工步参数对象") public class StepParamsModel implements Serializable { - private static final long serialVersionUID = -6361645141217616499L; + private static final long serialVersionUID = -4418226170535844209L; @ApiParam("参数代码") private String paramCode;