From b47f97fa054e1d24c3cee72164ee477237d88828 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 23 Oct 2019 22:39:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1050-2=20=E5=B7=A5=E4=BD=8D=E7=9B=91?= =?UTF-8?q?=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; From c56822dc405dd5f8e3b77031e7fd9b61fd437802 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Sat, 26 Oct 2019 11:26:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96=201050-5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java index 2d8f0f2..022e20c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java @@ -42,7 +42,7 @@ public class MesConfig extends BaseBean { @Column(name = "CFG_KEY") @ApiParam("配置key") - private String cfgkey; + private String cfgKey; @Column(name = "CFG_VALUE") @ApiParam("配置value") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java index e950b9c..3e61c2a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java @@ -42,7 +42,7 @@ public class MesConfig extends BaseBean { @Column(name = "CFG_KEY") @ApiParam("配置key") - private String cfgkey; + private String cfgKey; @Column(name = "CFG_VALUE") @ApiParam("配置value") From 848f6b2f23f1600caff4a4ae42c5b1f17d2f9f87 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Sat, 26 Oct 2019 19:03:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96=201050-6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 3 +++ .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 5 ++++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 5fbb803..41e5a23 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -82,6 +82,9 @@ public class MesPackage extends BaseBean { @ApiParam("备注") private String memo; + public MesPackage() { + } + public MesPackage(String packageNo, String partNo, String partNameRdd, Double qty, Double packSpecQty) { this.packageNo = packageNo; this.partNo = partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java index 9424b33..d3864d0 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java @@ -23,7 +23,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE") +@Table(name = "MES_PACKAGE_DETAIL") @Api("包装规格") public class MesPackageDetail extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index bb74b3e..6beeba3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -28,7 +28,6 @@ import javax.persistence.Transient; @Api("PLC配置表") public class MesPlc extends BaseBean { - @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; @@ -65,6 +64,10 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; + @Column(name = "DEVICE") + @ApiParam("驱动") + private String device; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 79eb8f3..1dd0077 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -66,6 +66,10 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; + @Column(name = "DEVICE") + @ApiParam("驱动") + private String device; + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; From 6de6d36e809009dceb63380e4b8db75dc9f33463 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 28 Oct 2019 21:22:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8A=BD?= =?UTF-8?q?=E5=8F=96=E5=8F=8D=E5=86=99=201105-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/pcn/bean/MesDataObject.java | 25 +++++++++++++++++++++- .../i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 13 ----------- .../estsh/i3plus/pojo/mes/bean/MesDataObject.java | 24 +++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 14 ------------ 4 files changed, 48 insertions(+), 28 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java index 1c9c4b8d2..015d53e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java @@ -31,7 +31,6 @@ public class MesDataObject extends BaseBean { @ApiParam("对象代码") private String objectCode; - @Column(name = "OBJECT_NAME") @ApiParam("对象名称") private String objectName; @@ -43,4 +42,28 @@ public class MesDataObject extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index c9f59b0..645c2d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -27,7 +27,6 @@ import javax.persistence.Table; @Api("对象结构") public class MesObjectCfg extends BaseBean { - @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -48,18 +47,6 @@ public class MesObjectCfg extends BaseBean { @ApiParam("列长度") private String fieldLength; - @Column(name = "FIELD_PK") - @ApiParam("主键标记") - private String fieldPk; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index c788f8a..debf5a3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -43,4 +43,28 @@ public class MesDataObject extends BaseBean { @Column(name = "OPERATE_TYPE") @ApiParam("操作类型") private Integer operateType; + + @Column(name = "FIELD_PK") + @ApiParam("主键") + private String fieldPk; + + @Column(name = "READ_FLAG_VALUE") + @ApiParam("读取标志值") + private String readFlagValue; + + @Column(name = "FEED_FIELD") + @ApiParam("反馈字段") + private String feedField; + + @Column(name = "FEED_VALUE") + @ApiParam("反馈值") + private String feedValue; + + @Column(name = "SELF_ADDITION") + @ApiParam("自增列") + private String selfAddition; + + @Column(name = "SELF_ADDITION_VALUE") + @ApiParam("自增列值") + private Long selfAdditionValue; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index e616922..b294abe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -27,7 +27,6 @@ import javax.persistence.Table; @Api("对象结构") public class MesObjectCfg extends BaseBean { - @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; @@ -48,19 +47,6 @@ public class MesObjectCfg extends BaseBean { @ApiParam("列长度") private String fieldLength; - @Column(name = "FIELD_PK") - @ApiParam("主键标记") - private String fieldPk; - - @Column(name = "FEED_FIELD") - @ApiParam("反馈字段") - private String feedField; - - @Column(name = "FEED_VALUE") - @ApiParam("反馈值") - private String feedValue; - - @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") private String pojoAttr;