From b47f97fa054e1d24c3cee72164ee477237d88828 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 23 Oct 2019 22:39:19 +0800 Subject: [PATCH] =?UTF-8?q?1050-2=20=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 1 + .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java | 1 + .../main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java | 3 +++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java index f19880b..dcb2322 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") +@Deprecated public class MesPLCConfigure extends BaseBean { @Column(name = "IP") @ApiParam("设备ip") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index 1704282..ed592b5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN") @Api("产品条码表") -public class MesProduceSn extends BaseBean { +public class MesProduceSn extends BaseBean implements Serializable { + + private static final long serialVersionUID = 6641051790330191326L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java index 9c320e4..be9933d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java @@ -27,6 +27,7 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") +@Deprecated public class MesPLCConfigure extends BaseBean { @Column(name = "IP") @ApiParam("设备ip") diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index e6e47f3..3dafd66 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -18,6 +18,8 @@ import java.util.List; @Data public class StationRequestBean implements Serializable { + private static final long serialVersionUID = -8597212451891803174L; + @ApiParam("扫描信息") private String scanInfo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java index 34409f4..6b7eedd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java @@ -7,6 +7,9 @@ import java.io.Serializable; @Data public class StepModel implements Serializable { + + private static final long serialVersionUID = -5772746720347236465L; + @ApiParam("工步代码") private String stepCode;