From 09339a6e1f980daaa1241de0633c6782f1fb3f88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 16 Jan 2020 19:05:59 +0800 Subject: [PATCH 01/32] =?UTF-8?q?=E3=80=901405=20=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E5=9C=A8=E7=89=A9=E5=93=81=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=8F=8A=E4=BB=93=E5=BA=93=E7=BA=A7=E5=88=AB=E7=9A=84=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 2 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 50 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index a9b133d..e9f1cd8 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -196,7 +196,7 @@ public class WmsMoveDetails extends BaseBean { @Column(name = "CONSIGNATION") @ApiParam("是否寄售 1-是 2-否") - private Integer consignation; + private Integer consignation = 2; public Integer getIsSnapshot() { return isSnapshot == null ? 0 : isSnapshot.intValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index cdf4f66..49aa95c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -2744,4 +2744,54 @@ public class WmsHqlPack { getStringBuilderPack(searchElementFunction, result); return result; } + + /** + * 物料组信息分页查询条件 + * + * @param wmsPartGroup + * @return + */ + public static DdlPackBean packHqlWmsPartGroup(WmsPartGroup wmsPartGroup) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupNo(), "partGroupNo", result); + DdlPreparedPack.getStringLikerPack(wmsPartGroup.getPartGroupName(), "partGroupName", result); + + getStringBuilderPack(wmsPartGroup, result); + + return result; + } + + /** + * 物料组物流路线信息分页查询条件 + * + * @param wmsPartGroupRoute + * @return + */ + public static DdlPackBean packHqlWmsPartGroupRoute(WmsPartGroupRoute wmsPartGroupRoute) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsPartGroupRoute.getPartGroupNo(), "partGroupNo", result); + + getStringBuilderPack(wmsPartGroupRoute, result); + + return result; + } + + /** + * 物料组物流路线信息分页查询条件 + * + * @param wmsPartGroupDetails + * @return + */ + public static DdlPackBean packHqlWmsPartGroupDetails(WmsPartGroupDetails wmsPartGroupDetails) { + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(wmsPartGroupDetails.getPartGroupNo(), "partGroupNo", result); + + getStringBuilderPack(wmsPartGroupDetails, result); + + return result; + } + } From 5feae0dd1a10468b3143fb539b811fb24e6cc284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 16 Jan 2020 19:06:54 +0800 Subject: [PATCH 02/32] =?UTF-8?q?=E3=80=901405=20=E7=89=A9=E6=B5=81?= =?UTF-8?q?=E8=B7=AF=E7=BA=BF=E5=9C=A8=E7=89=A9=E5=93=81=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E5=8F=8A=E4=BB=93=E5=BA=93=E7=BA=A7=E5=88=AB=E7=9A=84=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/WmsPartGroup.java | 39 ++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPartGroupDetails.java | 43 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsPartGroupRoute.java | 43 ++++++++++++++++++++++ .../repository/WmsPartGroupDetailsRepository.java | 16 ++++++++ .../wms/repository/WmsPartGroupRepository.java | 16 ++++++++ .../repository/WmsPartGroupRouteRepository.java | 16 ++++++++ 6 files changed, 173 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java new file mode 100644 index 0000000..9641130 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroup.java @@ -0,0 +1,39 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 物料组信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PART_GROUP") +@Api("物料组信息") +public class WmsPartGroup extends BaseBean{ + + private static final long serialVersionUID = 9214639813072864436L; + @Column(name="PART_GROUP_NO") + @ApiParam("物料组编号") + private String partGroupNo; + + @Column(name="PART_GROUP_NAME") + @ApiParam("物料组名称") + private String partGroupName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java new file mode 100644 index 0000000..d2e7f87 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupDetails.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 物料组明细信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PART_GROUP_DETAILS") +@Api("物料组明细信息") +public class WmsPartGroupDetails extends BaseBean{ + + private static final long serialVersionUID = 9214639813072864444L; + @Column(name="PART_GROUP_NO") + @ApiParam("物料组编号") + private String partGroupNo; + + @Column(name = "PART_NO") + @ApiParam(value = "物料编号") + private String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam(value = "物料名称") + private String partNameRdd; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java new file mode 100644 index 0000000..80cc3af --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartGroupRoute.java @@ -0,0 +1,43 @@ +package cn.estsh.i3plus.pojo.wms.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 物料组物流路线信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 14:21 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="WMS_PART_GROUP_ROUTE") +@Api("物料组物流路线信息") +public class WmsPartGroupRoute extends BaseBean{ + + private static final long serialVersionUID = 9214639813072864438L; + @Column(name="PART_GROUP_NO") + @ApiParam("物料组编号") + private String partGroupNo; + + @Column(name = "ROUTING_CODE") + @ApiParam(value = "线路代码") + private String routingCode; + + @Column(name = "ROUTING_NAME") + @ApiParam(value = "线路名称") + private String routingName; +} \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java new file mode 100644 index 0000000..253c463 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupDetailsRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupDetails; +import org.springframework.stereotype.Repository; + +/** + * @Description :物料组明细信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 15:17 + * @Modify: + **/ +@Repository +public interface WmsPartGroupDetailsRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java new file mode 100644 index 0000000..ddd376a --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroup; +import org.springframework.stereotype.Repository; + +/** + * @Description :物料组信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 15:17 + * @Modify: + **/ +@Repository +public interface WmsPartGroupRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java new file mode 100644 index 0000000..c7e779f --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPartGroupRouteRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPartGroupRoute; +import org.springframework.stereotype.Repository; + +/** + * @Description :物料组物流路线信息 + * @Reference : + * @Author : jessica.chen + * @CreateDate : 2020-01-15 15:17 + * @Modify: + **/ +@Repository +public interface WmsPartGroupRouteRepository extends BaseRepository { +} From bf71cd07d014c2071fb20da2e5cddadb41da6050 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 16 Jan 2020 21:41:53 +0800 Subject: [PATCH 03/32] =?UTF-8?q?JIS=E5=8F=91=E8=BF=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 +++------------------- .../i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 28 ++++++------- .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 5 +++ .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 4 ++ .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 20 ++++++++-- .../pojo/mes/pcn/model/StationResultBean.java | 3 ++ .../estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 28 ++++++------- .../i3plus/pojo/mes/bean/MesQueueJisDetail.java | 4 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 +- 10 files changed, 73 insertions(+), 76 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 067cb20..a5c7c54 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -50,14 +50,14 @@ public class MesEnumUtil { * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_PATTERN_TYPE { + public enum JIS_PATTERN_TYPE { ONE_PROD(10, "单产品发运"), MANY_PROD(20, "多产品发运"); private int value; private String description; - MES_JIS_PATTERN_TYPE(int value, String description) { + JIS_PATTERN_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -3419,7 +3419,8 @@ public class MesEnumUtil { EXP_TEXT("exp_text", "异常文本"), FILE("file", "定制内容文件"), IMAGE("image", "图片"), - BUTTON("button", "按钮"); + BUTTON("button", "按钮"), + TABLES("tables", "多个表格"); private String value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 674878a..8baa6a5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -16,49 +16,14 @@ public class MesPcnEnumUtil { * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_PATTERN_TYPE { + public enum JIS_PATTERN_TYPE { ONE_PROD(10, "单产品发运"), MANY_PROD(20, "多产品发运"); private int value; private String description; - MES_JIS_PATTERN_TYPE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * JIS发运是否按主队列顺序扫描 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_SCAN_TYPE { - TRUE(10, "是"), - FALSE(20, "否"); - - private int value; - private String description; - - MES_JIS_SCAN_TYPE(int value, String description) { + JIS_PATTERN_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -86,7 +51,7 @@ public class MesPcnEnumUtil { * JIS发运队列状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIS_STATUS { + public enum JIS_QUEUE_STATUS { TRUE(10, "已发运"), FALSE(20, "未发运"); @@ -94,7 +59,7 @@ public class MesPcnEnumUtil { private int value; private String description; - MES_QUEUE_JIS_STATUS(int value, String description) { + JIS_QUEUE_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -2516,7 +2481,8 @@ public class MesPcnEnumUtil { EXP_TEXT("exp_text", "异常文本"), FILE("file", "定制内容文件"), IMAGE("image", "图片"), - BUTTON("button", "按钮"); + BUTTON("button", "按钮"), + TABLES("tables", "多个表格"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 6635e25..293fc07 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; @Column(name = "PATTERN_DESC") @ApiParam("描述") private String patternDesc; - @Column(name = "TOP_NO") - @ApiParam("一次显示TOP数") - private Integer topNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; @Column(name = "PATTERN_TYPE") @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_TYPE") - @ApiParam("是否按主队列顺序扫描") - private Integer scanType; + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java index b833dfc..c08acfd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :JIS发运队列 @@ -61,4 +62,8 @@ public class MesQueueJis extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Transient + @ApiParam("颜色") + private String color; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java index e8243ed..86cddfb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "FINAL_STATUS") + @ApiParam("明细整体状态") + private Integer finalStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java index 7a32f8b..b0cb953 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -42,24 +42,37 @@ public class QueueJisModel implements Serializable { @ApiParam("产品条码") private String serialNumber; + @ApiParam("明细整体状态") + private Integer finalStatus; + @ApiParam("状态名称") private String statusName; @ApiParam("明细状态名称") private String detailStatusName; + @ApiParam("明细整体状态名称") + private Integer finalStatusName; + + @ApiParam("颜色") + private String color; + public String getStatusName() { - return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status); + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); } public String getDetailStatusName() { - return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus); + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); + } + + public String getFinalStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); } public QueueJisModel() { } - public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) { + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { this.jisNo = jisNo; this.vinCode = vinCode; this.carNo = carNo; @@ -71,6 +84,7 @@ public class QueueJisModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.detailStatus = detailStatus; this.serialNumber = serialNumber; + this.finalStatus = finalStatus; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java index e86fd56..978fd4b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -49,4 +49,7 @@ public class StationResultBean implements Serializable { @ApiParam("图片路径") private String imageUrl; + + @ApiParam("多个数据集") + private List> stationResultBeans; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index b7a7b64..87400b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理队列数") + private Integer handleNo; @Column(name = "PATTERN_DESC") @ApiParam("描述") private String patternDesc; - @Column(name = "TOP_NO") - @ApiParam("一次显示TOP数") - private Integer topNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; @Column(name = "PATTERN_TYPE") @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_TYPE") - @ApiParam("是否按主队列顺序扫描") - private Integer scanType; + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index db45636..03f8870 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "FINAL_STATUS") + @ApiParam("发运整体状态") + private Integer finalStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index dbf4e42..9a46d75 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2105,8 +2105,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(patternJis.getPatternNo())) { DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean); } - if (!StringUtils.isEmpty(patternJis.getTopNo())) { - DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean); + if (!StringUtils.isEmpty(patternJis.getQueueNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getQueueNo(), "queueNo", packBean); } if (!StringUtils.isEmpty(patternJis.getHandleNo())) { DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean); From 51d60a107ae2b27eb341b40ec5f08362ee52d037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 17 Jan 2020 10:18:04 +0800 Subject: [PATCH 04/32] =?UTF-8?q?SAP=E6=8C=87=E4=BB=A4=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=8D=95=E5=8F=B7=E6=9F=A5=E8=AF=A2(=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=EF=BC=9A=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86;?= =?UTF-8?q?=E7=8E=B0=E5=9C=A8=EF=BC=9A=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86?= =?UTF-8?q?)=E8=8E=B7=E5=8F=96=E8=A1=8C=E5=8F=B7=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=B0sap=5Forder=5Flock=E8=A1=A8=EF=BC=9B=20=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=EF=BC=9ASAP=E8=A6=81=E7=9A=84=E6=98=AF=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E8=A1=8C=E5=8F=B7=EF=BC=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=8F=AF=E8=83=BD=E6=98=AF=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E7=9A=84=E6=8B=86=E5=88=86=E6=88=96=E8=80=85?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=89=80=E5=BE=97=EF=BC=8C=E8=A1=8C=E5=8F=B7?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E5=AE=9A=E5=87=86=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 111 ++++++++++----------- .../pojo/wms/repository/WmsConfigRepository.java | 2 + 2 files changed, 54 insertions(+), 59 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index b3eb04f..ed0a748 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -174,6 +174,7 @@ public class WmsEnumUtil { return tmp; } } + /** * 主表信息 单据类型 */ @@ -700,9 +701,9 @@ public class WmsEnumUtil { KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"), KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"), FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"), - KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"), - PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"), - UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用"); + KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"), + PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"), + UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"); private int value; private String code; @@ -897,7 +898,7 @@ public class WmsEnumUtil { VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"), VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"), KT_PICK_RC("KT_PICK_RC", "坤泰拣货"), - UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用"); + UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用"); private String value; private String description; @@ -1037,7 +1038,7 @@ public class WmsEnumUtil { INSTOCKED(40, "入库"), PICKED(50, "配料"), OUT_STOCK(60, "出库"), - SCRAP(70,"报废"), + SCRAP(70, "报废"), COMMING(80, "在途"); private int value; @@ -1470,6 +1471,7 @@ public class WmsEnumUtil { return valueOf(val); } } + /** * 库存移动单状态状态:10=新建,20=已处理,30=处理出错 */ @@ -2936,64 +2938,56 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum IMPORT_ORDER_TYPE { - PO("PO", "要货计划"), - ASN("ASN", "ASN"), - INSTRUCTIONS("INSTRUCTIONS", "指令"), - SCATTERED_OUT("C00", "零星出库指令"), - SCATTERED_INT("C01", "零星入指令"), - NC_DISMANTLING_PICKING("C02", "NC拆解领料"), - NC_DISMANTLING_RETURN("C03", "NC拆解退料"), - NC_SCRAPPED("C04", "NC报废指令"), - NOT_JIS("NOTJIS", "非JIS指令"), - STOCK_DUMP("D00", "库存转储指令"), - NC_INSTOCK("D01", "NC入库指令"), - SMRR("B00", "SMRR退货"), - DMR("B01", "DMR退货"), - OUT_SOURCING("A00", "委外发料指令"), - OUT_REBACK("A01", "委外退料指令"), - OUT_RETURN_SOURCING("A02", "委外返工发料指令"), - OUT_RETURN_("A03", "委外返工退料指令"), - SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"), - CS("CS", "盘点指令"), - CS_ADUJUST("CS_ADUJUST", "盘点调差指令"); + PO("1", "PO", "要货计划"), + ASN("2", "ASN", "ASN"), + INSTRUCTIONS("3", "INSTRUCTIONS", "指令"), + SCATTERED_OUT("C00", "C00", "零星出库指令"), + SCATTERED_INT("C01", "C01", "零星入指令"), + NC_DISMANTLING_PICKING("C02", "C02", "NC拆解领料"), + NC_DISMANTLING_RETURN("C03", "C03", "NC拆解退料"), + NC_SCRAPPED("C04", "C04", "NC报废指令"), + NOT_JIS("NOTJIS", "NOTJIS", "非JIS指令"), + STOCK_DUMP("D00", "D00", "库存转储指令"), + NC_INSTOCK("D01", "D01", "NC入库指令"), + SMRR("B00", "B00", "SMRR退货"), + DMR("B01", "B01", "DMR退货"), + OUT_SOURCING("A00", "A00", "委外发料指令"), + OUT_REBACK("A01", "A01", "委外退料指令"), + OUT_RETURN_SOURCING("A02", "A02", "委外返工发料指令"), + OUT_RETURN_("A03", "A03", "委外返工退料指令"), + SALES_RETURN_REBACK("SALES_RETURN", "SALES_RETURN", "销售退货指令"), + CS("CS", "CS", "盘点指令"), + CS_ADUJUST("CS_ADUJUST", "CS_ADUJUST", "盘点调差指令"); private String value; + private String code; private String description; - IMPORT_ORDER_TYPE(String value, String description) { + IMPORT_ORDER_TYPE(String value, String code, String description) { this.value = value; + this.code = code; this.description = description; } - public String getDescription() { - return description; + public String getValue() { + return value; } public String getCode() { - return value; + return code; } - public String getValue() { - return value; + public String getDescription() { + return description; } - public static IMPORT_ORDER_TYPE codeOf(String value) { + public static IMPORT_ORDER_TYPE codeOf(String code) { for (int i = 0; i < values().length; i++) { - if (values()[i].value.equals(value)) { + if (values()[i].code.equals(code)) { return values()[i]; } } return null; } - - public static String getDes(String val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } } /** @@ -3083,7 +3077,6 @@ public class WmsEnumUtil { } - /** * 任务数据来源：检查子数据 */ @@ -3496,7 +3489,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WMS_STOCK_TYPE { - SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码"); + SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码"); private int value; private String description; @@ -4488,8 +4481,8 @@ public class WmsEnumUtil { WAIT_RECEIVING(10, "待收货"), RECEIVING(20, "收货中"), COMPLETE_RECEIVING(30, "收货完成"), - CLOSE(40,"已关闭"), - CANCEL(50,"已取消"), + CLOSE(40, "已关闭"), + CANCEL(50, "已取消"), UN_RECEIVED(60, "延迟未收货"); private int value; @@ -4580,9 +4573,9 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_ORDER_MASTER_STATUS { - CREATE(10,"CREATE", "创建"), - PLANNED(20,"PLANNED", "已计划"), - CLOSE(30,"CLOSE", "已关闭"); + CREATE(10, "CREATE", "创建"), + PLANNED(20, "PLANNED", "已计划"), + CLOSE(30, "CLOSE", "已关闭"); private int value; private String code; @@ -4668,8 +4661,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PULL_TASK_DETAILS_STATUS { - BE_HANDLE(10,"BE_HANDLE", "待处理"), - CANCELLATION(20,"CANCELLATION", "已处理"); + BE_HANDLE(10, "BE_HANDLE", "待处理"), + CANCELLATION(20, "CANCELLATION", "已处理"); private int value; private String code; @@ -4720,10 +4713,10 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PULL_TASK_MASTER_STATUS { - CREATE(10,"CREATE", "创建"), - ENABLED(20,"ENABLED", "已启动"), - COMPLETE(30,"COMPLETE", "已完成"), - CLOSE(40,"CLOSE", "已关闭"); + CREATE(10, "CREATE", "创建"), + ENABLED(20, "ENABLED", "已启动"), + COMPLETE(30, "COMPLETE", "已完成"), + CLOSE(40, "CLOSE", "已关闭"); private int value; private String code; @@ -4804,8 +4797,8 @@ public class WmsEnumUtil { } /** - * WEB页面字段类型 - * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 + * WEB页面字段类型 + * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum FIELD_TYPE { @@ -4881,7 +4874,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_COMMIT_MODE { - JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交"); + JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), REF_GROUP(30, 30, "关联分组号提交"); private int value; private int code; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java index da71990..97dad56 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsConfigRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; +import org.springframework.stereotype.Repository; /** * @Description : 系统配置 @@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsConfig; * @CreateDate : 2019-03-07 10:00 * @Modify: **/ +@Repository public interface WmsConfigRepository extends BaseRepository { /** From 9e0158e749c5f2e94727353de64b9d4ec742ecd8 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 17 Jan 2020 11:43:19 +0800 Subject: [PATCH 05/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9test=E5=88=86=E6=94=AFP?= =?UTF-8?q?OM=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 19 +++++++++++-------- .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 17 ++++++++++------- .../cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 13 +++++++++---- .../cn/estsh/i3plus/pojo/aps/holders/EOperInput.java | 2 +- .../cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/model/APSPager.java | 1 + .../src/main/resources/relations/OperInput.xml | 2 +- .../src/main/resources/relations/OperOutput.xml | 2 +- .../estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 2 +- 10 files changed, 38 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 53389da..e9c592a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -34,21 +34,24 @@ public class OperInput extends BaseAPS { @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) private Long operationId; - @Column(name="MATERIAL_ID") + @Column(name="INPUT_MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(relation = "Material", notEmpty = true) - private Long materialId; + @FieldAnnotation(relation = "InputMaterial", notEmpty = true) + private Long inputMaterialId; @Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输入量") + @FieldAnnotation(defaultValue = "1.0") private Double inputCount; @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") + @FieldAnnotation(defaultValue = "1.0") private Double yield; @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") + @FieldAnnotation(defaultValue = "0.0") private Double fixScrapCount; @Column(name="CONS_TYPE") @@ -73,13 +76,13 @@ public class OperInput extends BaseAPS { BeanRelation.set(this, EOperInput.Operation, oper); } - public Material getMaterial() { - return BeanRelation.get(this, EOperInput.Material); + public Material getInputMaterial() { + return BeanRelation.get(this, EOperInput.InputMaterial); } - public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; - BeanRelation.set(this, EOperInput.Material, material); + public void setInputMaterial(Material material) { + this.inputMaterialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperInput.InputMaterial, material); } @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 86c4996..476d45b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -33,21 +33,24 @@ public class OperOutput extends BaseAPS { @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) private Long operationId; - @Column(name="MATERIAL_ID") + @Column(name="OUTPUT_MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(relation = "Material", notEmpty = true) - private Long materialId; + private Long outputMaterialId; @Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单位输出量") + @FieldAnnotation(defaultValue = "1.0") private Double outputCount; @Column(name="YIELD", columnDefinition = "decimal(18,8)") @ApiParam(value ="成品率") + @FieldAnnotation(defaultValue = "1.0") private Double yield; @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="固定报废数") + @FieldAnnotation(defaultValue = "0.0") private Double fixScrapCount; public Operation getOperation() { @@ -59,13 +62,13 @@ public class OperOutput extends BaseAPS { BeanRelation.set(this, EOperOutput.Operation, oper); } - public Material getMaterial() { - return BeanRelation.get(this, EOperOutput.Material); + public Material getOutputMaterial() { + return BeanRelation.get(this, EOperOutput.OutputMaterial); } - public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; - BeanRelation.set(this, EOperOutput.Material, material); + public void setOutputMaterial(Material material) { + this.outputMaterialId = material != null ? material.getId() : 0l; + BeanRelation.set(this, EOperOutput.OutputMaterial, material); } @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 7eb002d..4743f7d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductOrder; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -51,6 +52,7 @@ public class ProductOrder extends BaseOrder { @Column(name="SPECIFY_ROUTING") @ApiParam(value ="指定工艺路线") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting") private String specifyRouting; @Column(name="RECALC_COUNT") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index 510e091..e0786d8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -211,7 +211,12 @@ public class BeanInfo { } public static Set> getBeanClasses() { - return beanInfos.keySet(); + Set> beanClasses = new HashSet<>(); + for (Map.Entry, BeanInfo> entry : beanInfos.entrySet()) { + beanClasses.add(entry.getKey()); + } + + return beanClasses; } public static BeanInfo getBeanInfo(Class cls) { @@ -234,9 +239,9 @@ public class BeanInfo { public static List> getChildClasses(Class cls) { List> beanClasses = new ArrayList<>(); - List beanInfos = getBeanInfo(cls).childsBeanInfos; - for (BeanInfo beanInfo : beanInfos) { - beanClasses.add(beanInfo.getBeanClass()); + List childBeanInfos = getBeanInfo(cls).childsBeanInfos; + for (BeanInfo childBeanInfo : childBeanInfos) { + beanClasses.add(childBeanInfo.getBeanClass()); } return beanClasses; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java index 4ee6467..9ce8642 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java @@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EOperInput { Operation, - Material, + InputMaterial, WorkInputs } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java index 898f576..df02363 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java @@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EOperOutput { Operation, - Material, + OutputMaterial, WorkOutputs } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java index 51f1ba0..6376ea3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java @@ -40,4 +40,5 @@ public class APSPager extends Pager { } private String filter; private List sorts; + private String query; } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml index e2d484c..1107e5c 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml index 5a7f843..2f030d9 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index f7f6ab7..5338751 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -333,7 +333,7 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RESOURCE_LOCK_TYPE { - NONE("NONE", "不锁定"), // + NONE("NONE", "不锁定"), PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"), PRODUCE_END("PRODUCE_END", "后工序生产结束时刻"); From 4ae13f827012633110ad4ab6cf978e6c1f05675c Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 17 Jan 2020 12:55:28 +0800 Subject: [PATCH 06/32] =?UTF-8?q?task=20`1408`=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/mes/pcn/model/ProductDataModel.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java new file mode 100644 index 0000000..727e482 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProductDataModel { + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +} From bc1825fd35c0f4f83ef46b372fb052ebecbf5323 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 17 Jan 2020 14:31:34 +0800 Subject: [PATCH 07/32] =?UTF-8?q?=E3=80=90mes=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8CmesModel=E4=BF=AE=E6=94=B9,pcn=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +-- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +-- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java | 6 +++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 067cb20..de4c9cb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -4022,8 +4022,7 @@ public class MesEnumUtil { public enum MONITOR_TASK_OBJECT_TYPE { PLC(10, "PLC"), - DB(20, "DB"), - OTHER(30, "其他"); + DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 674878a..c5e0e37 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2695,8 +2695,7 @@ public class MesPcnEnumUtil { public enum MONITOR_TASK_OBJECT_TYPE { PLC(10, "PLC"), - DB(20, "DB"), - OTHER(30, "其他"); + DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 62cb029..1ad0189 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -89,6 +89,9 @@ public class MesPlcModel implements Serializable { @ApiParam("驱动") private String device; + @ApiParam("对象代码") + private String objectCode; + public MesPlcModel() { } @@ -96,7 +99,7 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -122,5 +125,6 @@ public class MesPlcModel implements Serializable { this.analysisRule = analysisRule; this.isAnalysis = isAnalysis; this.device = device; + this.objectCode = objectCode; } } From db3b06071d3cbff78a2bd54fd345af8bba217dc5 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 17 Jan 2020 14:42:15 +0800 Subject: [PATCH 08/32] =?UTF-8?q?=E3=80=90=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index a5eefa3..716509d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -4022,8 +4022,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"), - DB(20, "DB"); + PLC(10, "PLC"); +// DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 42e6cd9..fd2bc47 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2660,8 +2660,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"), - DB(20, "DB"); + PLC(10, "PLC"); +// DB(20, "DB"); private int value; private String description; From d3c817529f73bde6a0e0815c5c3ae91a6d427643 Mon Sep 17 00:00:00 2001 From: luweihao Date: Fri, 17 Jan 2020 15:12:17 +0800 Subject: [PATCH 09/32] =?UTF-8?q?task=20`1408`=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/mes/model/ProductDataModel.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataModel.java diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataModel.java new file mode 100644 index 0000000..6d1ad77 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductDataModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.mes.model; + + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Api("产品包装model") +public class ProductDataModel { + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +} From db6522fba3976e622dc9f07dda94ff5c8bde00b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Fri, 17 Jan 2020 17:18:45 +0800 Subject: [PATCH 10/32] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=8E=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java index 442e993..99b223f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamictable/WmsSearchElement.java @@ -74,4 +74,14 @@ public class WmsSearchElement extends BaseBean { * 搜索组连接符 */ private String groupConnector; + + /** + * 开始时间字符串 + */ + private String startDateTimeStr; + + /** + * 结束时间字符串 + */ + private String endDateTimeStr; } From cf203390b8729e1cfbb5941005c4322674dd7937 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 19 Jan 2020 11:54:06 +0800 Subject: [PATCH 11/32] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=AE=B5=E7=BC=96=E8=BE=91=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java | 7 ++++++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 91456a6..ca8b7f2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -61,14 +61,17 @@ public class Material extends BaseAPS { @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String purchaseLeadTime; @Column(name="MANUF_LEAD_TIME") @ApiParam(value ="制造提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String manufLeadTime; @Column(name="SHIPMENT_LEAD_TIME") @ApiParam(value ="配送提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String shipmentLeadTime; @Column(name="UNIT_PURCHASE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index e9c592a..11cedff 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -61,10 +61,12 @@ public class OperInput extends BaseAPS { @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxSpaceTime; @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; public Operation getOperation() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 0568af5..b6923c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -46,27 +46,32 @@ public class OperResource extends BaseAPS { @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - @FieldAnnotation(notEmpty = true) + @FieldAnnotation(notEmpty = true, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String postTime; @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPrevSdTime; @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPostSdTime; @Column(name="PRIORITY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index d115131..274574b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -77,10 +77,12 @@ public class Operation extends BaseAPS { @Column(name="MAX_SPACE_TIME") @ApiParam(value ="最大时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxSpaceTime; @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; public ProductRouting getProductRouting() { From 415ae5a45bbced07c572e9ea26b8a88afea961b1 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Sun, 19 Jan 2020 15:55:18 +0800 Subject: [PATCH 12/32] =?UTF-8?q?=E3=80=907457=201.=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E4=B8=A4=E6=AD=A5?= =?UTF-8?q?=E5=8F=91=E8=BF=90=EF=BC=8C=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=90=8E=EF=BC=8C=E5=9C=A8=E5=81=9A=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E6=AD=A5=E5=8F=91=E8=BF=90=E5=87=BA=E5=BA=93=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E6=89=AB=E6=8F=8F=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=9A=84=E5=AE=A2=E6=88=B7=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E3=80=82=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index f3856c7..dbd5e1f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -184,6 +184,10 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam(value = "标签") private String tag; + @Transient + @ApiParam("物料编号组") + public String[] partNos; + public int getOrderStatusVal() { return this.orderStatus == null ? 0 : this.orderStatus; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 189877c..8c32ae6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1906,6 +1906,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result); + DdlPreparedPack.getNumEqualPack(wmsDocMovementSn.getSnType(), "snType", result); getStringBuilderPack(wmsDocMovementSn, result); From 30cb7f7b9de609ef884a28528ed2038cc9a0a5c0 Mon Sep 17 00:00:00 2001 From: jokelone Date: Sun, 19 Jan 2020 20:41:36 +0800 Subject: [PATCH 13/32] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=8E=BB=E9=99=A4JIT=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index fd2bc47..1526981 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -1735,8 +1735,8 @@ public class MesPcnEnumUtil { STANDARD_ORDER(10, "标准工单"), BTS_ORDER(20, "BTS工单"), ATTEMPT_ORDER(30, "试制工单"), - BH_ORDER(40, "B&H工单"), - JIT_ORDER(50, "JIT工单"); + BH_ORDER(40, "B&H工单"); +// JIT_ORDER(50, "JIT工单"); private int value; private String description; From 3f77135a177768aabe5517d1f2f02cfa4d125441 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 20 Jan 2020 10:16:21 +0800 Subject: [PATCH 14/32] =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 38 +++++++++++++++++++++- .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 2 +- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 716509d..bc83711 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -3379,7 +3379,8 @@ public class MesEnumUtil { TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), - STOP_PCS_CTL("stopPcsCtl", "停止监控"); + STOP_PCS_CTL("stopPcsCtl", "停止监控"), + RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); private String value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 1526981..6bd6523 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2441,9 +2441,9 @@ public class MesPcnEnumUtil { TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), RUNNING_INFO("runningInfo", "执行信息"), + STOP_PCS_CTL("stopPcsCtl", "停止监控"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); - private String value; private String description; @@ -2770,4 +2770,40 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 质量状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PASS_FAIL { + + PASS(1, "合格"), + FAIL(2, "不合格"); + + private int value; + private String description; + + PASS_FAIL(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java index b0cb953..bdb5567 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -52,7 +52,7 @@ public class QueueJisModel implements Serializable { private String detailStatusName; @ApiParam("明细整体状态名称") - private Integer finalStatusName; + private String finalStatusName; @ApiParam("颜色") private String color; From ab3ad4c2d5642779c2abe9bda2a3af7d43f8da4f Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 20 Jan 2020 11:28:33 +0800 Subject: [PATCH 15/32] =?UTF-8?q?task=20=20=E5=8E=BB=E9=99=A4=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=95=B0=E6=8D=AE=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 35c9d9f..16d0d8b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -10,7 +10,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import org.springframework.context.annotation.Lazy; import javax.persistence.*; From 5f25e311bbb229e38048aecf1ba6e094b51e3574 Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 20 Jan 2020 13:58:56 +0800 Subject: [PATCH 16/32] =?UTF-8?q?mes-pcn=20pojo=E6=B7=BB=E5=8A=A0serializa?= =?UTF-8?q?ble?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 6 ++++-- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java | 5 +++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java | 4 +++- 97 files changed, 292 insertions(+), 99 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java index 9118124..eb147e3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.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; import java.math.BigDecimal; /** @@ -27,8 +28,9 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_DISMENTLE_RECORD") @Api("物料拆解表") -public class IfDismantleRecord extends BaseBean { +public class IfDismantleRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -6010207359066736962L; @Column(name = "DISMANTLE_ID") @ApiParam("拆解编号") private String dismantleId; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java index cf17f2d..5e7684b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PACKAGE_DETAIL") @Api("包装明细表") -public class IfPackageDetail extends BaseBean { +public class IfPackageDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -1873101288426218272L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java index 23e442e..367bb1c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") @Api("生产报工表") -public class IfProductOffLine extends BaseBean { +public class IfProductOffLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 200629529131241418L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java index df5d1dc..ac19407 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION") @Api("mes系统业务动作") -public class MesAction extends BaseBean { +public class MesAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -6451213228967727835L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java index c1c1a82..eafb489 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION_IF") @Api("动作接口配置") -public class MesActionIf extends BaseBean { +public class MesActionIf extends BaseBean implements Serializable { + private static final long serialVersionUID = -5058215339453766620L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java index a6ab494..b38452f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作方法 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION_METHOD") @Api("系统业务动作方法") -public class MesActionMethod extends BaseBean { +public class MesActionMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = 6249418690993577108L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java index 00732f2..85de33f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :生产区域 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_AREA") @Api("生产区域") -public class MesArea extends BaseBean { +public class MesArea extends BaseBean implements Serializable { + private static final long serialVersionUID = 1047604067591557689L; @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java index e8245d3..7471095 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java @@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :BOM清单 @@ -29,7 +30,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BOM") @Api("BOM清单") -public class MesBom extends BaseBean { +public class MesBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -1772273641263268564L; @Column(name = "PART_NO") @ApiParam("父零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java index b73cd80..a9c205e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工位投料信息 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CELL_FEED") @Api("工位投料信息") -public class MesCellFeed extends BaseBean { +public class MesCellFeed extends BaseBean implements Serializable { + private static final long serialVersionUID = 2412657464618960515L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; 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 022e20c..f8b9558 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :配置表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONFIG") @Api("mes配置表") -public class MesConfig extends BaseBean { +public class MesConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = -5759669472714287000L; @Column(name = "CFG_CODE") @ApiParam("配置代码") private String cfgCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java index 3a8061e..8e9a363 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUST_PROD_LINE") @Api("客户产线代码") -public class MesCustProdLine extends BaseBean { +public class MesCustProdLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 3049432665592161513L; @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java index 75178c5..21f2ad1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes客户表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER") @Api("客户信息") -public class MesCustomer extends BaseBean { +public class MesCustomer extends BaseBean implements Serializable { + private static final long serialVersionUID = 167635887082538926L; @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java index 0a93045..0c5f49c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes客户表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER_PART") @Api("客户零件关系") -public class MesCustomerPart extends BaseBean { +public class MesCustomerPart extends BaseBean implements Serializable { + private static final long serialVersionUID = -4731252848471949263L; @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; 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 015d53e..8bded7d 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DATA_OBJECT") @Api("数据对象") -public class MesDataObject extends BaseBean { +public class MesDataObject extends BaseBean implements Serializable { + private static final long serialVersionUID = -1419262751765770535L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java index 597b60a..93ea185 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DATASOURCE") @Api("地址清单") -public class MesDatasource extends BaseBean { +public class MesDatasource extends BaseBean implements Serializable { + private static final long serialVersionUID = -7387559860198655900L; @Column(name = "DS_CODE") @ApiParam("数据源代码") private String dsCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java index c91d9c7..2214411 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.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; import java.util.List; /** @@ -28,8 +29,9 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DEFECT") @Api("缺陷表") -public class MesDefect extends BaseBean { +public class MesDefect extends BaseBean implements Serializable { + private static final long serialVersionUID = -6771813937279359333L; @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java index 5d312e2..d4f287f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DEFECT_CAUSE") @Api("缺陷原因表") -public class MesDefectCause extends BaseBean { +public class MesDefectCause extends BaseBean implements Serializable { + private static final long serialVersionUID = -3867250593038812861L; @Column(name = "DC_CODE") @ApiParam("缺陷原因代码") private String dcCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java index 2b6489c..a97ccef 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -28,7 +29,8 @@ import java.util.List; @Index(columnList = "CREATE_DATE_TIME") }) @Api("不良信息记录表") -public class MesDefectRecord extends BaseBean { +public class MesDefectRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2828208776424343584L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java index 209c69a..14151ff 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.math.BigDecimal; /** @@ -28,8 +29,9 @@ import java.math.BigDecimal; @Index(columnList = "CREATE_DATE_TIME") }) @Api("物料拆解记录表") -public class MesDismantleRecord extends BaseBean { +public class MesDismantleRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -7924346039878218038L; @Column(name = "DISMANTLE_ID") @ApiParam("拆解编号") private String dismantleId; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java index d80c3db..df432f3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :生产设备 @@ -30,7 +31,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQUIPMENT") @Api("生产设备") -public class MesEquipment extends BaseBean { +public class MesEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 7269069290035250108L; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java index da30dc1..655c2f4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") -public class MesEsop extends BaseBean { +public class MesEsop extends BaseBean implements Serializable { + private static final long serialVersionUID = -4869646502033099294L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java index 951539b..cc17b50 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务事件 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EVENT") @Api("系统业务事件") -public class MesEvent extends BaseBean { +public class MesEvent extends BaseBean implements Serializable { + private static final long serialVersionUID = -5604724665202938464L; @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java index fe29e51..2a16eb0 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务事件动作 @@ -31,7 +32,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EVENT_ACTION") @Api("系统业务事件动作") -public class MesEventAction extends BaseBean { +public class MesEventAction extends BaseBean implements Serializable { + private static final long serialVersionUID = 3964084375279916831L; @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java index 7df328e..f128453 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FI_CFG") @Api("首检件配置") -public class MesFiCfg extends BaseBean { +public class MesFiCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 1791614973371037158L; @Column(name = "WORK_CENTER_CODE") @ApiParam("产线") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java index eea9e56..a90ed92 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FILE") @Api("文件表") -public class MesFile extends BaseBean { +public class MesFile extends BaseBean implements Serializable { + private static final long serialVersionUID = 7017379708394714424L; @Column(name = "FILE_NAME") @ApiParam("文件名称") private String fileName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java index 96102ec..243e6a9 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :物料关键数据 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KP_DATA") @Api("生产区域") -public class MesKpData extends BaseBean { +public class MesKpData extends BaseBean implements Serializable { + private static final long serialVersionUID = -3332582267186642790L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java index 73990e7..9ca9ac7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KPSN_RULE") @Api("关键件条码校验规则") -public class MesKpsnRule extends BaseBean { +public class MesKpsnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = 8238308232531730720L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java index 761a2f6..589c237 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -25,9 +26,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") -public class MesLabelTemplate extends BaseBean { +public class MesLabelTemplate extends BaseBean implements Serializable { - private static final long serialVersionUID = 5371856566557305323L; + + private static final long serialVersionUID = 3797103812377146878L; @Column(name = "TEMPLATE_CODE") @ApiParam(value = "模板代码") private String templateCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java index 63552ba..253f29a 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 打印模板参数 @@ -26,9 +27,9 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") -public class MesLabelTemplateParam extends BaseBean { +public class MesLabelTemplateParam extends BaseBean implements Serializable { - private static final long serialVersionUID = 6476163540527157643L; + private static final long serialVersionUID = -3595706874099358555L; @Column(name = "TEMPLATE_ID") @ApiParam(value = "模板ID", access = "模板ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java index 0316985..e8daace 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务方法 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_METHOD") @Api("系统业务方法") -public class MesMethod extends BaseBean { +public class MesMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -3629909409034083767L; @Column(name = "METHOD_CODE") @ApiParam("方法代码") private String methodCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java index cba8ef5..3e81c47 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.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 : @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_MONITOR_TASK") @Api("监听任务") -public class MesMonitorTask extends BaseBean { +public class MesMonitorTask extends BaseBean implements Serializable { + private static final long serialVersionUID = -8614480099840448294L; @Column(name = "TASK_NO") @ApiParam("任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java index baa40e9..891dc65 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.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 : @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_MONITOR_TASK_DETAIL") @Api("监听任务明细") -public class MesMonitorTaskDetail extends BaseBean { +public class MesMonitorTaskDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -4811270359386960747L; @Column(name = "TASK_NO") @ApiParam("任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java index 9285d25..9fc51c2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_NUMBER_RULE") @Api("条码生成规则") -public class MesNumberRule extends BaseBean { +public class MesNumberRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -4039194855353751178L; @Column(name = "RULE_CODE") @ApiParam("规则代码") private String ruleCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java index 1abc81c..3938dbe 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_NUMBER_SERIALNO") @Api("编码序号") -public class MesNumberSerialno extends BaseBean { +public class MesNumberSerialno extends BaseBean implements Serializable { + private static final long serialVersionUID = -3024166851634742872L; @Column(name = "CURRENT_NUMBER_PREFIX") @ApiParam("当前编号前缀") private String currentNumberPrefix; 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 fc8ee12..5b7c166 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_OBJECT_CFG") @Api("对象结构") -public class MesObjectCfg extends BaseBean { +public class MesObjectCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -3640782210450491835L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; 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 dcb2322..38c0363 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :PLC设备信息配置表 @@ -28,7 +29,8 @@ import javax.persistence.Table; @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") @Deprecated -public class MesPLCConfigure extends BaseBean { +public class MesPLCConfigure extends BaseBean implements Serializable { + private static final long serialVersionUID = 8274445475806774L; @Column(name = "IP") @ApiParam("设备ip") private String ipAddress; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java index 96f9229..7ca973d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :包装规格 @@ -28,7 +29,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACK_SPEC") @Api("包装规格") -public class MesPackSpec extends BaseBean { +public class MesPackSpec extends BaseBean implements Serializable { + private static final long serialVersionUID = -788654193624068327L; @Column(name = "SPEC_CODE") @ApiParam("包装规格代码") private String specCode; 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 39d5e93..b912f5c 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -23,7 +24,8 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格") -public class MesPackage extends BaseBean { +public class MesPackage extends BaseBean implements Serializable { + private static final long serialVersionUID = 2292859018089339608L; @Column(name = "PACKAGE_NO") @ApiParam("包装编号") private String packageNo; 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 88c635c..0684e76 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 @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格明细") -public class MesPackageDetail extends BaseBean { +public class MesPackageDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 8162606304720621672L; @Column(name = "PACKAGE_NO") @ApiParam("包装编码") private String packageNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java index ddcdc82..72084e3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") -public class MesPackageTravel extends BaseBean { +public class MesPackageTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -2808747095415676213L; @Column(name = "PACKAGE_NO") @ApiParam("包装编码") private String packageNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java index 78b1e77..81365ef 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :物料信息 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART") @Api("物料信息") -public class MesPart extends BaseBean { +public class MesPart extends BaseBean implements Serializable { + private static final long serialVersionUID = 3936033255397936854L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java index af18170..949a02f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :零件种类 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_CATEGORY") @Api("零件种类") -public class MesPartCategory extends BaseBean { +public class MesPartCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = 9076081904146489470L; @Column(name = "CATEGORY_CODE") @ApiParam("分类代码") private String categoryCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 293fc07..9c8adca 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运模式 @@ -28,8 +29,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesPatternJis extends BaseBean { +public class MesPatternJis extends BaseBean implements Serializable { + private static final long serialVersionUID = 1119289554542499312L; @Column(name = "PATTERN_NO") @ApiParam("模式编号") private String patternNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java index 247c8d9..c19bfa3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN") @Api("PCN节点") -public class MesPcn extends BaseBean { +public class MesPcn extends BaseBean implements Serializable { + private static final long serialVersionUID = -7570827672640277097L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java index aa394cc..faa7f92 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") -public class MesPcnConnectLog extends BaseBean { +public class MesPcnConnectLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -4153357131289178766L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java index e3e82aa..4d321f8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") -public class MesPcnSyncCfg extends BaseBean { +public class MesPcnSyncCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -6869288362923390521L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java index 8ea5d25..a82b8d4 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYNC_ERRORLOG") @Api("MES_PCN同步异常日志") -public class MesPcnSyncErrorLog extends BaseBean { +public class MesPcnSyncErrorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -2249754641660006488L; @Column(name = "PCN_CODE") @ApiParam("PCN代码") private String pcnCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java index 53fad7f..78d3caa 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -27,8 +28,9 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYS_USER_OFFLINE") @Api(value = "账号离线登陆表", description = "账号离线登陆表。") -public class MesPcnSysUserOffline extends BaseBean { +public class MesPcnSysUserOffline extends BaseBean implements Serializable { + private static final long serialVersionUID = 7617353154826718154L; @Column(name = "USER_ID") @ApiParam(value = "人员ID", example = "-1") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java index 0160b54..8288401 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes-pcn定时任务工作清单 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") -public class MesPcnTask extends BaseBean { +public class MesPcnTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 4777357978430670966L; @Column(name = "TASK_CODE") @ApiParam("任务代码") private String taskCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java index c46fe73..f0ee69f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes-pcn定时任务工作清单同步记录 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_TASK_LOG") @Api("mes-pcn定时任务工作清单同步记录") -public class MesPcnTaskLog extends BaseBean { +public class MesPcnTaskLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -784806389462540310L; @Column(name = "SYNC_TIME_START") @ApiParam("同步数据开始时间") private String syncTimeStart; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java index ff1c82d..bb13a85 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -25,7 +26,8 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产主计划") -public class MesPlanOrder extends BaseBean { +public class MesPlanOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 8571104279843276872L; @Column(name = "ORDER_NO") @ApiParam("生产计划单号") private String orderNo; 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 d995e03..cb03681 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 @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC") @Api("PLC配置表") -public class MesPlc extends BaseBean { +public class MesPlc extends BaseBean implements Serializable { + private static final long serialVersionUID = -5346536604317095818L; @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java index 2a88530..752400b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROCESS") @Api("工序") -public class MesProcess extends BaseBean { +public class MesProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = -2619648674238082872L; @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java index 984e6d6..8114387 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :产品绑定记录表 @@ -28,7 +29,8 @@ import javax.persistence.*; @Index(columnList = "KP_SN") }) @Api("产品绑定记录表") -public class MesProdBindRecord extends BaseBean { +public class MesProdBindRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -4319604821328717354L; @Column(name = "SERIAL_NUMBER") @ApiParam(value = "产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java index 5ac78dc..4ff20da 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品配置 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG") @Api("产品配置") -public class MesProdCfg extends BaseBean { +public class MesProdCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 7487874316722319947L; @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java index cbb3f3d..fd4cf72 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :产品配置明细 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG_DETAIL") @Api("产品配置明细") -public class MesProdCfgDetail extends BaseBean { +public class MesProdCfgDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -8362302529703401583L; @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java index 18efe0e..a68bcec 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_PACK") @Api("产品包装关系") -public class MesProdPack extends BaseBean { +public class MesProdPack extends BaseBean implements Serializable { + private static final long serialVersionUID = -2621135811864108025L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java index d345465..4e8c76d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_ROUTE_CFG") @Api("产品类流程配置表") -public class MesProdRouteCfg extends BaseBean { +public class MesProdRouteCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -3768632071281056796L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java index effd957..169af24 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_ROUTE_OPT_PARAM") @Api("产品流程配置操作参数表") -public class MesProdRouteOptParam extends BaseBean { +public class MesProdRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -932364659894292000L; @Column(name = "PROD_ROUTE_CFG_ID") @ApiParam("产品流程ID") private Long prodRouteCfgId; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java index 131674e..5520632 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CATEGORY") @Api("系统业务动作") -public class MesProduceCategory extends BaseBean { +public class MesProduceCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = 4593983703007675620L; @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCategoryCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java index 984b9bf..aeda2b0 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.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,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CTGY_PICTURE") @Api("产品类型图片表") -public class MesProduceCtgyPicture extends BaseBean { +public class MesProduceCtgyPicture extends BaseBean implements Serializable { + private static final long serialVersionUID = -7223382567320219332L; @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCtgyCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java index 7a17c7d..5d8ce41 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 产品条码履历实体类 @@ -29,7 +30,8 @@ import javax.persistence.*; @Index(columnList = "MODIFY_DATE_TIME") }) @Api("产品条码履历表") -public class MesProduceSnTravel extends BaseBean { +public class MesProduceSnTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -1692487592284871549L; @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java index 5db9c07..600bfc2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :生产数据 @@ -30,7 +31,8 @@ import javax.persistence.*; @Index(columnList = "MODIFY_DATE_TIME") }) @Api("生产数据") -public class MesProductData extends BaseBean { +public class MesProductData extends BaseBean implements Serializable { + private static final long serialVersionUID = -2365404168777050771L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java index 20fa8b6..b5b9fa2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -28,8 +29,9 @@ import java.util.List; @Index(columnList = "SN") }) @Api("质量过程检测数据") -public class MesQcCheckData extends BaseBean { +public class MesQcCheckData extends BaseBean implements Serializable { + private static final long serialVersionUID = 3600528549583720850L; @Column(name = "CHECK_ID") @ApiParam("检测id") private String checkId; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java index 9c96abd..be9bfe8 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.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; import java.util.List; /** @@ -28,8 +29,9 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") -public class MesQcCheckStandard extends BaseBean { +public class MesQcCheckStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 1590320231495124712L; @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java index c08acfd..7d4bd81 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :JIS发运队列 @@ -28,8 +29,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_JIS") @Api("JIS发运队列") -public class MesQueueJis extends BaseBean { +public class MesQueueJis extends BaseBean implements Serializable { + private static final long serialVersionUID = 8028683333028906395L; @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java index 86cddfb..ef3b7d1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运队列明细 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_JIS_DETAIL") @Api("JIS发运队列明细") -public class MesQueueJisDetail extends BaseBean { +public class MesQueueJisDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 829273008952400763L; @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index c098cd9..e93c938 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.*; @Index(columnList = "CUST_FLAG_NO") }) @Api("生产队列主表") -public class MesQueueOrder extends BaseBean { +public class MesQueueOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 6538031118299400711L; @Column(name = "ORDER_NO") @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index f058270..1af12f5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.*; @Index(columnList = "ORDER_NO") }) @Api("生产队列明细") -public class MesQueueOrderDetail extends BaseBean { +public class MesQueueOrderDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 1548933241804083457L; @Column(name = "ORDER_NO") @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java index b9d4630..3f3458c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -28,7 +29,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") -public class MesRawPartSn extends BaseBean { +public class MesRawPartSn extends BaseBean implements Serializable { + private static final long serialVersionUID = 5504323561257182116L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java index 9753ac8..785f350 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :维修 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_REPAIR") @Api("维修") -public class MesRepair extends BaseBean { +public class MesRepair extends BaseBean implements Serializable { + private static final long serialVersionUID = -7520365696308295804L; @Column(name = "REPAIR_CODE") @ApiParam("维修代码") private String repairCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java index e6974e9..e6da731 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -28,8 +29,9 @@ import java.util.List; @Index(columnList = "CREATE_DATE_TIME") }) @Api("维修信息记录表") -public class MesRepairRecord extends BaseBean { +public class MesRepairRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2453726410779076150L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java index 6838d51..f8b2802 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :流程表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE") @Api("流程表") -public class MesRoute extends BaseBean { +public class MesRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = -7622507229961050740L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java index 6dd7933..11ba452 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcess.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS") @Api("流程工序关系") -public class MesRouteProcess extends BaseBean { +public class MesRouteProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = 3477334942090180010L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java index d531539..b1da58f 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRouteProcessCell.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS_CELL") @Api("工序工作单元对照") -public class MesRouteProcessCell extends BaseBean { +public class MesRouteProcessCell extends BaseBean implements Serializable { + private static final long serialVersionUID = -703779336699805482L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java index c42611a..a77b075 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrap.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :报废原因 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SCRAP") @Api("报废原因") -public class MesScrap extends BaseBean { +public class MesScrap extends BaseBean implements Serializable { + private static final long serialVersionUID = -6202113707752178624L; @Column(name = "SCRAP_CODE") @ApiParam("报废代码") private String scrapCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java index f7cad22..97ac5d3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -29,8 +30,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("报废信息记录表") -public class MesScrapRecord extends BaseBean { +public class MesScrapRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -8519832449647086195L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java index 89cad0e..13874ae 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT") @Api("班次信息") -public class MesShift extends BaseBean { +public class MesShift extends BaseBean implements Serializable { + private static final long serialVersionUID = -1174268061355263705L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java index 9af574d..7aac2d7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftGroup.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT_GROUP") @Api("班组") -public class MesShiftGroup extends BaseBean { +public class MesShiftGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 8962836866086379111L; @Column(name = "GROUP_CODE") @ApiParam("班组代码") private String groupCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java index 5c7dad6..9b5cd41 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShiftRest.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT_REST") @Api("班次休息信息") -public class MesShiftRest extends BaseBean { +public class MesShiftRest extends BaseBean implements Serializable { + private static final long serialVersionUID = -8712815093203320523L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java index 36a7f61..b376b32 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStationBom.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :工序物料清单 @@ -29,7 +30,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STATION_BOM") @Api("工序物料清单") -public class MesStationBom extends BaseBean { +public class MesStationBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -4693067673094931011L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java index 76c3318..0998015 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStep.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,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STEP") @Api("工步") -public class MesStep extends BaseBean { +public class MesStep extends BaseBean implements Serializable { + private static final long serialVersionUID = -2157306767211269786L; @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java index 1c938ef..dd5a834 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesStepParam.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STEP_PARAM") @Api("工步参数") -public class MesStepParam extends BaseBean { +public class MesStepParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -147541368320233093L; @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java index 37dd09d..47c1867 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTime.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; @Data @Entity @@ -20,8 +21,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_TIME") @Api("工步参数") -public class MesTime extends BaseBean { +public class MesTime extends BaseBean implements Serializable { + private static final long serialVersionUID = 1562011791394529076L; @Column(name = "MODULE") @ApiParam("组件") private String module; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java index cac23de..43a0b61 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTorqueDetail.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :扭矩信息记录表 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_TORQUE_DETAIL") @Api("扭矩信息记录表") -public class MesTorqueDetail extends BaseBean { +public class MesTorqueDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 2900363253333046861L; @Column(name = "SN") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java index d7e20a0..b7d0b46 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesTypeCfg.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_TYPE_CFG") @Api("类型信息表") -public class MesTypeCfg extends BaseBean { +public class MesTypeCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -1699612238800419597L; @Column(name = "TYPE_CODE") @ApiParam("类型代码") private String typeCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java index 0160465..f958bd1 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheck.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WC_CHECK") @Api("开线检查") -public class MesWcCheck extends BaseBean { +public class MesWcCheck extends BaseBean implements Serializable { + private static final long serialVersionUID = 8057329890155185557L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java index a5e339d..e03e8e2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -28,8 +29,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("开线检查记录") -public class MesWcCheckRecord extends BaseBean { +public class MesWcCheckRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -2173902677953303765L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java index 6a2aa0d..feeef17 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcEquipment.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,7 +26,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WC_EQUIPMENT") @Api("工作单元设备关系表") -public class MesWcEquipment extends BaseBean { +public class MesWcEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 2088600237918553286L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java index efd99e5..87af76c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCell.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL") @Api("工作单元") -public class MesWorkCell extends BaseBean { +public class MesWorkCell extends BaseBean implements Serializable { + private static final long serialVersionUID = -493313481197504121L; @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java index 811c01c..3ef3027 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -28,8 +29,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("工位监控异常信息") -public class MesWorkCellMonitorLog extends BaseBean { +public class MesWorkCellMonitorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -5634446206963213556L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java index 97f8525..87a0f2e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParam.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") -public class MesWorkCellParam extends BaseBean { +public class MesWorkCellParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -3659425774085368499L; @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java index 89717dc..c0d5a20 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellParamCfg.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_PARAM_CFG") @Api("工作单元参数配置") -public class MesWorkCellParamCfg extends BaseBean { +public class MesWorkCellParamCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 1739991089354361293L; @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java index 5a4c0f1..74c2a09 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellPoint.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") -public class MesWorkCellPoint extends BaseBean { +public class MesWorkCellPoint extends BaseBean implements Serializable { + private static final long serialVersionUID = 2881841596678871526L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java index bde424e..4ba402c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCenter.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CENTER") @Api("工作中心") -public class MesWorkCenter extends BaseBean { +public class MesWorkCenter extends BaseBean implements Serializable { + private static final long serialVersionUID = -1119897685621371682L; @Column(name = "WORK_CENTER_CODE") @ApiParam("工作中心代码") private String workCenterCode; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 4a52798..4a4d542 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -25,7 +26,8 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产工单") -public class MesWorkOrder extends BaseBean { +public class MesWorkOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 8065877030194822855L; @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java index acaf12d..e06560c 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,8 @@ import javax.persistence.*; @Index(columnList = "CREATE_DATE_TIME") }) @Api("生产工单日志") -public class MesWorkOrderLog extends BaseBean { +public class MesWorkOrderLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -7018645997937147427L; @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; From 5fc59129bdef84f1f04e0b6317dfe8e657063980 Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 20 Jan 2020 14:10:10 +0800 Subject: [PATCH 17/32] =?UTF-8?q?=E3=80=90mes-pojo=20=E7=BB=A7=E6=89=BFSer?= =?UTF-8?q?ializable=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPLCConfigure.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java | 4 +++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPoint.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java | 4 +++- 118 files changed, 351 insertions(+), 118 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index e84cc53..98d4fc0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.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; import java.math.BigDecimal; /** @@ -27,8 +28,9 @@ import java.math.BigDecimal; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_DISMENTLE_RECORD") @Api("物料拆解表") -public class IfDismantleRecord extends BaseBean { +public class IfDismantleRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -4111096221719995107L; @Column(name = "DISMANTLE_ID") @ApiParam("拆解编号") private String dismantleId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java index 8e4e221..d08568e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfPackageDetail.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PACKAGE_DETAIL") @Api("包装明细表") -public class IfPackageDetail extends BaseBean { +public class IfPackageDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -5412635747424111476L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java index 686f3de..5d8e27c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfProductOffLine.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_PRODUCT_OFF_LINE") @Api("生产报工表") -public class IfProductOffLine extends BaseBean { +public class IfProductOffLine extends BaseBean implements Serializable { + private static final long serialVersionUID = -4960147948435537306L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java index f66ba69..df240bc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfWmsPpm.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "IF_WMS_PPM") @Api("WMS PPM 接口表") -public class IfWmsPpm extends BaseBean { +public class IfWmsPpm extends BaseBean implements Serializable { + private static final long serialVersionUID = -4767432446545933514L; @Column(name = "YEAR") @ApiParam("年") private String year; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java index 184d48e..d58ab5f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesAction.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION") @Api("mes系统业务动作") -public class MesAction extends BaseBean { +public class MesAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -8961182851667690154L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java index bbd7782..7f2a912 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionIf.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION_IF") @Api("动作接口配置") -public class MesActionIf extends BaseBean { +public class MesActionIf extends BaseBean implements Serializable { + private static final long serialVersionUID = -8087788887938933153L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java index 0a7ad5a..68d952f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesActionMethod.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作方法 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ACTION_METHOD") @Api("系统业务动作方法") -public class MesActionMethod extends BaseBean { +public class MesActionMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -6918114443014306607L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java index b8cc379..856d009 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,7 +32,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_AREA") @Api("生产区域") -public class MesArea extends BaseBean { +public class MesArea extends BaseBean implements Serializable { + private static final long serialVersionUID = 4320604250440221043L; @Column(name = "AREA_CODE") @ApiParam("区域代码") private String areaCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java index 4b20366..f2bf9b4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBom.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :BOM清单 @@ -29,7 +30,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BOM") @Api("BOM清单") -public class MesBom extends BaseBean { +public class MesBom extends BaseBean implements Serializable { + private static final long serialVersionUID = 6781011059554785782L; @Column(name = "PART_NO") @ApiParam("父零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 1b7c85c..62e0e18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes按钮状态配置表 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_BUTTON_STATUS") @Api("按钮状态配置表") -public class MesButtonStatus extends BaseBean { +public class MesButtonStatus extends BaseBean implements Serializable { + private static final long serialVersionUID = 1076891253916045865L; @Column(name = "BUTTON_CODE") @ApiParam("按钮代码") private String buttonCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index 5505b11..a775b40 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :工位投料信息 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CELL_FEED") @Api("工位投料信息") -public class MesCellFeed extends BaseBean { +public class MesCellFeed extends BaseBean implements Serializable { + private static final long serialVersionUID = 1947971369479107782L; @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/MesConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java index 3e61c2a..d385b72 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :配置表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CONFIG") @Api("mes配置表") -public class MesConfig extends BaseBean { +public class MesConfig extends BaseBean implements Serializable { + private static final long serialVersionUID = 2462824203686013806L; @Column(name = "CFG_CODE") @ApiParam("配置代码") private String cfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 7483771..4d63bfa 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -24,8 +25,9 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("客户信息") -public class MesCustOrder extends BaseBean { +public class MesCustOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 4990079075654538033L; @Column(name = "ORDER_NO") @ApiParam("订单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index 0c0caea..c8da995 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUST_PROD_LINE") @Api("客户产线代码") -public class MesCustProdLine extends BaseBean { +public class MesCustProdLine extends BaseBean implements Serializable { + private static final long serialVersionUID = 7865628597341120516L; @Column(name = "CUST_PROD_LINE_CODE") @ApiParam("客户产线代码") private String custProdLineCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index 8be5b29..cbd6a59 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes客户表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER") @Api("客户产线代码") -public class MesCustomer extends BaseBean { +public class MesCustomer extends BaseBean implements Serializable { + private static final long serialVersionUID = 6049359006918853570L; @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index b66a21c..a943c4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes客户表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_CUSTOMER_PART") @Api("客户零件关系") -public class MesCustomerPart extends BaseBean { +public class MesCustomerPart extends BaseBean implements Serializable { + private static final long serialVersionUID = 2600442373171403668L; @Column(name = "CUSTOMER_CODE") @ApiParam("客户代码") private String customerCode; 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 6670060..7e0b93f 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 @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DATA_OBJECT") @Api("数据对象") -public class MesDataObject extends BaseBean { +public class MesDataObject extends BaseBean implements Serializable { + private static final long serialVersionUID = -6422621561140177350L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java index ebe9d58..cfea1ba 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDatasource.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DATASOURCE") @Api("地址清单") -public class MesDatasource extends BaseBean { +public class MesDatasource extends BaseBean implements Serializable { + private static final long serialVersionUID = 4318109359733890067L; @Column(name = "DS_CODE") @ApiParam("数据源代码") private String dsCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index 58110f3..9157fa8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DEFECT") @Api("缺陷表") -public class MesDefect extends BaseBean { +public class MesDefect extends BaseBean implements Serializable { + private static final long serialVersionUID = -317846359848236696L; @Column(name = "DEFECT_CODE") @ApiParam("缺陷代码") private String defectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java index b98052e..fb28c44 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectCause.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_DEFECT_CAUSE") @Api("缺陷原因表") -public class MesDefectCause extends BaseBean { +public class MesDefectCause extends BaseBean implements Serializable { + private static final long serialVersionUID = -4078847071878784152L; @Column(name = "DC_CODE") @ApiParam("缺陷原因代码") private String dcCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java index 270686e..d034489 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; import java.util.Date; /** @@ -31,7 +32,8 @@ import java.util.Date; @Index(columnList = "CREATE_DATE_TIME") }) @Api("不良信息记录表") -public class MesDefectRecord extends BaseBean { +public class MesDefectRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -6672562641463628050L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java index d75e2d4..6fff826 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -30,8 +31,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("物料拆解记录表") -public class MesDismantleRecord extends BaseBean { +public class MesDismantleRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -7921777462483107776L; @Column(name = "DISMANTLE_ID") @ApiParam("拆解编号") private String dismantleId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java index 713dc90..2bcd8d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquNotifyObjectCfg.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :设备通知对象配置 @@ -25,7 +26,8 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name="MES_EQU_NOTIFY_OBJECT_CFG") @Api("设备通知对象配置") -public class MesEquNotifyObjectCfg extends BaseBean { +public class MesEquNotifyObjectCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 952143489409789623L; @Column(name="NOTIFY_OBJECT_CODE") @ApiParam("对象代码") private String notifyObjectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 6b6fbc2..5de7a4a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -28,8 +29,9 @@ import java.util.List; @Index(columnList = "TASK_NO") }) @Api("设备作业任务") -public class MesEquTask extends BaseBean { +public class MesEquTask extends BaseBean implements Serializable { + private static final long serialVersionUID = -3351277499164455197L; @Column(name = "TASK_NO") @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index 8f3b70f..43dfa07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -28,8 +29,9 @@ import java.util.List; @Index(columnList = "EQUIPMENT_CODE") }) @Api("设备作业任务明细") -public class MesEquTaskDetail extends BaseBean { +public class MesEquTaskDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 3317290109159353376L; @Column(name = "TASK_NO") @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java index 4d4d1b6..53438d6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskNotifyCfg.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :设备作业通知配置 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name="MES_EQU_TASK_NOTIFY_CFG") @Api("设备作业通知配置") -public class MesEquTaskNotifyCfg extends BaseBean { +public class MesEquTaskNotifyCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -5074890809083209298L; @Column(name="TASK_TYPE") @ApiParam("作业类型") private Integer taskType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 89d70d6..7e86112 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :设备周期作业计划 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK_PLAN") @Api("设备周期作业计划") -public class MesEquTaskPlan extends BaseBean { +public class MesEquTaskPlan extends BaseBean implements Serializable { + private static final long serialVersionUID = 6583606304459518148L; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java index 2ecea3c..8d4a7b8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskRepairRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :设备维修作业记录 @@ -27,8 +28,9 @@ import javax.persistence.*; @Index(columnList = "EQUIPMENT_CODE") }) @Api("设备维修作业记录") -public class MesEquTaskRepairRecord extends BaseBean { +public class MesEquTaskRepairRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 5431970816367411649L; @Column(name = "TASK_NO") @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java index 038ee6e..7e79763 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandard.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :设备作业要求 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK_STANDARD") @Api("设备作业要求") -public class MesEquTaskStandard extends BaseBean { +public class MesEquTaskStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 8619366076594894497L; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java index b3c3b6e..e506922 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskStandardRecord.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description :设备点检保养作业记录 @@ -27,8 +28,9 @@ import javax.persistence.*; @Index(columnList = "EQUIPMENT_CODE") }) @Api("设备点检保养作业记录") -public class MesEquTaskStandardRecord extends BaseBean { +public class MesEquTaskStandardRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -4122427049015017390L; @Column(name = "TASK_NO") @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java index 1fa153b..15f8628 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquipment.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :生产设备 @@ -30,7 +31,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQUIPMENT") @Api("生产设备") -public class MesEquipment extends BaseBean { +public class MesEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 5167143191710128193L; @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java index b7aa754..723251f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEsop.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ESOP") @Api("作业指导书信息表(ODS)") -public class MesEsop extends BaseBean { +public class MesEsop extends BaseBean implements Serializable { + private static final long serialVersionUID = -2025246159538929513L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java index 9716989..c8905c5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEvent.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务事件 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EVENT") @Api("系统业务事件") -public class MesEvent extends BaseBean { +public class MesEvent extends BaseBean implements Serializable { + private static final long serialVersionUID = -2941486161983912085L; @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java index 0f90cc4..51b0507 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEventAction.java @@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务事件动作 @@ -31,7 +32,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EVENT_ACTION") @Api("系统业务事件动作") -public class MesEventAction extends BaseBean { +public class MesEventAction extends BaseBean implements Serializable { + private static final long serialVersionUID = 1188871471049646861L; @Column(name = "EVENT_CODE") @ApiParam("事件代码") private String eventCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java index 888bb7a..213bebc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultCause.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_CAUSE") @Api("mes设备故障原因表") -public class MesFaultCause extends BaseBean { +public class MesFaultCause extends BaseBean implements Serializable { + private static final long serialVersionUID = 1229825197241375978L; @Column(name = "FC_CODE") @ApiParam("故障原因代码") private String fcCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java index 06d07d8..7cdfd96 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultMethod.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_METHOD") @Api("mes设备故障方法表") -public class MesFaultMethod extends BaseBean { +public class MesFaultMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -1366849757709967125L; @Column(name = "FM_CODE") @ApiParam("故障方法代码") private String fmCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java index b3ec52c..f9c2852 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFaultPhenomenon.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FAULT_PHENOMENON") @Api("mes设备故障现象表") -public class MesFaultPhenomenon extends BaseBean { +public class MesFaultPhenomenon extends BaseBean implements Serializable { + private static final long serialVersionUID = 4373435095236791300L; @Column(name = "FP_CODE") @ApiParam("故障现象代码") private String fpCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java index 0ee50ab..24228ca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFiCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FI_CFG") @Api("首检件配置") -public class MesFiCfg extends BaseBean { +public class MesFiCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 6919161447256638470L; @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/MesFile.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java index c1d30dd2..9df7aa3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesFile.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_FILE") @Api("文件表") -public class MesFile extends BaseBean { +public class MesFile extends BaseBean implements Serializable { + private static final long serialVersionUID = 5057339077996828057L; @Column(name = "FILE_NAME") @ApiParam("文件名称") private String fileName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java index 1845202..7ef9e84 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesIf.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_IF") @Api("接口清单") -public class MesIf extends BaseBean { +public class MesIf extends BaseBean implements Serializable { + private static final long serialVersionUID = 7711015387041039390L; @Column(name = "IF_CODE") @ApiParam("接口代码") private String ifCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java index d140412..e036e8a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyAction.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KEY_ACTION") @Api("关键动作") -public class MesKeyAction extends BaseBean { +public class MesKeyAction extends BaseBean implements Serializable { + private static final long serialVersionUID = -7873249749411068317L; @Column(name = "ACTION_CODE") @ApiParam("动作代码") private String actionCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java index 1812e98..b17f81d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKeyData.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KEY_DATA") @Api("设备关键数据") -public class MesKeyData extends BaseBean { +public class MesKeyData extends BaseBean implements Serializable { + private static final long serialVersionUID = 3843016083013276333L; @Column(name = "KEY_DATA_CODE") @ApiParam("关键数据代码") private String keyDataCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java index 155c5c2..f3bd22c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpData.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,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KP_DATA") @Api("物料关键数据关系") -public class MesKpData extends BaseBean { +public class MesKpData extends BaseBean implements Serializable { + private static final long serialVersionUID = 8243089140216459544L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java index 25545e4..e0c9fca 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.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,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_KPSN_RULE") @Api("关键件条码校验规则") -public class MesKpsnRule extends BaseBean { +public class MesKpsnRule extends BaseBean implements Serializable { + private static final long serialVersionUID = 2592621267902381297L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; 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 6ee033d..ffac585 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 @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -25,7 +26,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LABEL_TEMPLATE") @Api(value = "打印模板", description = "打印模板") -public class MesLabelTemplate extends BaseBean { +public class MesLabelTemplate extends BaseBean implements Serializable { private static final long serialVersionUID = 5371856566557305323L; @Column(name = "TEMPLATE_CODE") 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 f64074e..c106bb2 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 @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 打印模板参数 @@ -26,7 +27,7 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_LABEL_TEMPLATE_PARAM") @Api(value = "打印模板参数", description = "打印模板参数") -public class MesLabelTemplateParam extends BaseBean { +public class MesLabelTemplateParam extends BaseBean implements Serializable { private static final long serialVersionUID = 6476163540527157643L; @Column(name = "TEMPLATE_ID") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index 9cb2acc..604d661 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务方法 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_METHOD") @Api("系统业务方法") -public class MesMethod extends BaseBean { +public class MesMethod extends BaseBean implements Serializable { + private static final long serialVersionUID = -3254086662292709833L; @Column(name = "METHOD_CODE") @ApiParam("方法代码") private String methodCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java index 166a822..3025972 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.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 : @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_MONITOR_TASK") @Api("监听任务") -public class MesMonitorTask extends BaseBean { +public class MesMonitorTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 4606062283853607814L; @Column(name = "TASK_NO") @ApiParam("任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java index 643be95..c2ef72e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTaskDetail.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 : @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_MONITOR_TASK_DETAIL") @Api("监听任务明细") -public class MesMonitorTaskDetail extends BaseBean { +public class MesMonitorTaskDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -8703163858851139587L; @Column(name = "TASK_NO") @ApiParam("任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index edbbdeb..cac557d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_NUMBER_RULE") @Api("条码生成规则") -public class MesNumberRule extends BaseBean { +public class MesNumberRule extends BaseBean implements Serializable { + private static final long serialVersionUID = -7547623897602721464L; @Column(name = "RULE_CODE") @ApiParam("规则代码") private String ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java index 1c68f28..d4551a2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_NUMBER_SERIALNO") @Api("编码序号") -public class MesNumberSerialno extends BaseBean { +public class MesNumberSerialno extends BaseBean implements Serializable { + private static final long serialVersionUID = -6004402998083665263L; @Column(name = "CURRENT_NUMBER_PREFIX") @ApiParam("当前编号前缀") private String currentNumberPrefix; 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 d9ead26..dfe9551 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 @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_OBJECT_CFG") @Api("对象结构") -public class MesObjectCfg extends BaseBean { +public class MesObjectCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 55753384888695913L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java index 87f07f9..10e85f2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :MES_对象与dao对应关系 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_OBJECT_DAO") @Api("MES_对象与dao对应关系") -public class MesObjectDao extends BaseBean { +public class MesObjectDao extends BaseBean implements Serializable { + private static final long serialVersionUID = 2286752362359060L; @Column(name = "OBJECT_CODE") @ApiParam("对象代码") private String objectCode; 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 be9933d..f54e7b6 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 @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :PLC设备信息配置表 @@ -28,7 +29,8 @@ import javax.persistence.Table; @Table(name = "MES_PLC_CONFIGURE") @Api("PLC设备信息配置表") @Deprecated -public class MesPLCConfigure extends BaseBean { +public class MesPLCConfigure extends BaseBean implements Serializable { + private static final long serialVersionUID = 2609782937477343108L; @Column(name = "IP") @ApiParam("设备ip") private String ipAddress; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java index 6db75b4..1880189 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackSpec.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :包装规格 @@ -29,7 +30,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACK_SPEC") @Api("包装规格") -public class MesPackSpec extends BaseBean { +public class MesPackSpec extends BaseBean implements Serializable { + private static final long serialVersionUID = -5750996334546906547L; @Column(name = "SPEC_CODE") @ApiParam("包装规格代码") private String specCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index ec8810e..94a9281 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -23,7 +24,8 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格") -public class MesPackage extends BaseBean { +public class MesPackage extends BaseBean implements Serializable { + private static final long serialVersionUID = 5275923991324889995L; @Column(name = "PACKAGE_NO") @ApiParam("包装编号") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index e358ca6..de95f5d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装规格明细") -public class MesPackageDetail extends BaseBean { +public class MesPackageDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 6980459490465566975L; @Column(name = "PACKAGE_NO") @ApiParam("包装编码") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java index 589f3f6..19434f5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")}) @Api("包装履历表") -public class MesPackageTravel extends BaseBean { +public class MesPackageTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -6425620221708201986L; @Column(name = "PACKAGE_NO") @ApiParam("包装编码") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 65ba2cc..3b117e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :物料信息 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART") @Api("物料信息") -public class MesPart extends BaseBean { +public class MesPart extends BaseBean implements Serializable { + private static final long serialVersionUID = -7731182105899332283L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java index c54eb24..f356754 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartCategory.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :零件种类 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_CATEGORY") @Api("零件种类") -public class MesPartCategory extends BaseBean { +public class MesPartCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = 106841156414035968L; @Column(name = "CATEGORY_CODE") @ApiParam("分类代码") private String categoryCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java index 0bac54e..a399ef3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartObject.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,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_OBJECT") @Api("物料对象配置表") -public class MesPartObject extends BaseBean { +public class MesPartObject extends BaseBean implements Serializable { + private static final long serialVersionUID = 5548158596994937446L; @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java index 2512950..ac42795 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartScheduleBom.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PART_SCHEDULE_BOM") @Api("生产排程清单") -public class MesPartScheduleBom extends BaseBean { +public class MesPartScheduleBom extends BaseBean implements Serializable { + private static final long serialVersionUID = -1189509386674221628L; @Column(name = "PART_NO") @ApiParam("排程物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index 87400b0..62553f7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运模式 @@ -28,8 +29,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PATTERN_JIS") @Api("JIS发运模式") -public class MesPatternJis extends BaseBean { +public class MesPatternJis extends BaseBean implements Serializable { + private static final long serialVersionUID = 216398440591829755L; @Column(name = "PATTERN_NO") @ApiParam("模式编号") private String patternNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index 9dac636..bc3f570 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN") @Api("PCN节点") -public class MesPcn extends BaseBean { +public class MesPcn extends BaseBean implements Serializable { + private static final long serialVersionUID = -9150091413555406397L; @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/MesPcnConnectLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnConnectLog.java index b33cb55..7e00e8e 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 @@ -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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_CONNECT_LOG") @Api("PCN节点连接日志") -public class MesPcnConnectLog extends BaseBean { +public class MesPcnConnectLog extends BaseBean implements Serializable { + 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/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index 2cf0ddf..2f33165 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -28,7 +29,7 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYNC_CFG") @Api("MES_PCN_同步配置") -public class MesPcnSyncCfg extends BaseBean { +public class MesPcnSyncCfg extends BaseBean implements Serializable { private static final long serialVersionUID = 7270930330576127126L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java index 0c83b33..01015d5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_SYNC_ERRORLOG") @Api("MES_PCN同步异常日志") -public class MesPcnSyncErrorLog extends BaseBean { +public class MesPcnSyncErrorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -6031591772505958774L; @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/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 80deb8f..6217557 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes-pcn定时任务工作清单 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PCN_TASK") @Api("mes-pcn定时任务工作清单") -public class MesPcnTask extends BaseBean { +public class MesPcnTask extends BaseBean implements Serializable { + private static final long serialVersionUID = 4129717677965409395L; @Column(name = "TASK_CODE") @ApiParam("任务代码") private String taskCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 08c7787..955791a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -25,7 +26,8 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产主计划") -public class MesPlanOrder extends BaseBean { +public class MesPlanOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = 6773005820598583458L; @Column(name = "ORDER_NO") @ApiParam("生产计划单号") private String orderNo; 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 98c4796..7d9c0b6 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 @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description: @@ -28,8 +29,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PLC") @Api("PLC配置表") -public class MesPlc extends BaseBean { +public class MesPlc extends BaseBean implements Serializable { + private static final long serialVersionUID = -7172265186837551268L; @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java index b2df5e6..a60fa3d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROCESS") @Api("工序") -public class MesProcess extends BaseBean { +public class MesProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = -615476712907856558L; @Column(name = "PROCESS_CODE") @ApiParam("工序代码") private String processCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index f9f2eaf..81f7d5e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品绑定记录表 @@ -34,7 +35,8 @@ import javax.persistence.Table; @Index(columnList = "ITEM_PART_NO") }) @Api("产品绑定记录表") -public class MesProdBindRecord extends BaseBean { +public class MesProdBindRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -6984193022328810942L; @Column(name = "SERIAL_NUMBER") @ApiParam(value = "产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java index 0bf480c..f77984a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfg.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品配置 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG") @Api("产品配置") -public class MesProdCfg extends BaseBean { +public class MesProdCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -1301835558902463754L; @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java index 3a83eaf..151a929 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :产品配置明细 @@ -28,7 +29,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG_DETAIL") @Api("产品配置明细") -public class MesProdCfgDetail extends BaseBean { +public class MesProdCfgDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -5678006170645940563L; @Column(name = "PROD_CFG_CODE") @ApiParam("产品配置代码") private String prodCfgCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java index c7b115c..42b3801 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgType.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :产品配置类型 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_CFG_TYPE") @Api("产品配置类型") -public class MesProdCfgType extends BaseBean { +public class MesProdCfgType extends BaseBean implements Serializable { + private static final long serialVersionUID = -1726288926948811617L; @Column(name = "PROD_CFG_TYPE_CODE") @ApiParam("产品配置类型代码") private String prodCfgTypeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index f8808b2..f5438ae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_PACK") @Api("产品包装关系") -public class MesProdPack extends BaseBean { +public class MesProdPack extends BaseBean implements Serializable { + private static final long serialVersionUID = -5748484568201154400L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index 8ef8f1e..d33cc8e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_ROUTE_CFG") @Api("产品类流程配置表") -public class MesProdRouteCfg extends BaseBean { +public class MesProdRouteCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -3903152693262813917L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 313d7e7..074dea2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.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,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PROD_ROUTE_OPT_PARAM") @Api("产品流程配置操作参数表") -public class MesProdRouteOptParam extends BaseBean { +public class MesProdRouteOptParam extends BaseBean implements Serializable { + private static final long serialVersionUID = -5043197912658757665L; @Column(name = "PROD_ROUTE_CFG_ID") @ApiParam("产品流程ID") private Long prodRouteCfgId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java index a648835..622dc1f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCategory.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CATEGORY") @Api("系统业务动作") -public class MesProduceCategory extends BaseBean { +public class MesProduceCategory extends BaseBean implements Serializable { + private static final long serialVersionUID = -992595557921651448L; @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCategoryCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java index bd45841..4a8a103 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceCtgyPicture.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,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_CTGY_PICTURE") @Api("产品类型图片表") -public class MesProduceCtgyPicture extends BaseBean { +public class MesProduceCtgyPicture extends BaseBean implements Serializable { + private static final long serialVersionUID = 4199856772441042802L; @Column(name = "PRODUCE_CTGY_CODE") @ApiParam("产品类型代码") private String produceCtgyCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 440f2b9..3a0cbbb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.math.BigDecimal; /** @@ -30,8 +31,9 @@ import java.math.BigDecimal; @Index(columnList = "PART_NO") }) @Api("产品条码表") -public class MesProduceSn extends BaseBean { +public class MesProduceSn extends BaseBean implements Serializable { + private static final long serialVersionUID = -1630924042562178494L; @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index a423281..ef63c50 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description : 产品条码履历实体类 @@ -30,7 +31,8 @@ import javax.persistence.*; @Index(columnList = "MODIFY_DATE_TIME") }) @Api("产品条码履历表") -public class MesProduceSnTravel extends BaseBean { +public class MesProduceSnTravel extends BaseBean implements Serializable { + private static final long serialVersionUID = -1807953720033107108L; @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java index 35c9d9f..2961158 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate; import org.springframework.context.annotation.Lazy; import javax.persistence.*; +import java.io.Serializable; /** * @Description :生产数据 @@ -34,7 +35,8 @@ import javax.persistence.*; }) @ElasticSearch @Api("生产数据") -public class MesProductData extends BaseBean { +public class MesProductData extends BaseBean implements Serializable { + private static final long serialVersionUID = 4514407617515827040L; @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/MesProductEncodeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java index f3a2b64..83bd787 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductEncodeCfg.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,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCT_ENCODE_CFG") @Api("产品编码配置") -public class MesProductEncodeCfg extends BaseBean { +public class MesProductEncodeCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 5608141802461306170L; @Column(name = "CODE_TYPE") @ApiParam("编码类型") private Integer codeType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java index 1235730..743751a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.List; /** @@ -29,8 +30,9 @@ import java.util.List; @Index(columnList = "PART_NO") }) @Api("质量过程检测数据") -public class MesQcCheckData extends BaseBean { +public class MesQcCheckData extends BaseBean implements Serializable { + private static final long serialVersionUID = -8044433561607606170L; @Column(name = "CHECK_ID") @ApiParam("检测id") private String checkId; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java index 338075d..b4f6388 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckStandard.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,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QC_CHECK_STANDARD") @Api("质量检测标准") -public class MesQcCheckStandard extends BaseBean { +public class MesQcCheckStandard extends BaseBean implements Serializable { + private static final long serialVersionUID = 3977375527789854590L; @Column(name = "PART_NO") @ApiParam("物料编码") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java index 0180221..1ad2431 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQualityStandardCfg.java @@ -15,6 +15,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -31,8 +32,9 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUALITY_STANDARD_CFG") @Api("质量标准配置") -public class MesQualityStandardCfg extends BaseBean { +public class MesQualityStandardCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -4529686898125790351L; @Column(name = "STANDARD_TYPE") @ApiParam("标准类型") private Integer standardType; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java index 87f6946..a2d6034 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJis.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运队列 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_JIS") @Api("JIS发运队列") -public class MesQueueJis extends BaseBean { +public class MesQueueJis extends BaseBean implements Serializable { + private static final long serialVersionUID = -2712958514118946868L; @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index 03f8870..f3defbd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :JIS发运队列明细 @@ -27,8 +28,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_JIS_DETAIL") @Api("JIS发运队列明细") -public class MesQueueJisDetail extends BaseBean { +public class MesQueueJisDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = -3242843412307565585L; @Column(name = "JIS_NO") @ApiParam("主队列编号") private String jisNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index d98293c..81604e5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -30,7 +31,8 @@ import java.util.List; @Index(columnList = "CUST_FLAG_NO") }) @Api("生产队列主表") -public class MesQueueOrder extends BaseBean { +public class MesQueueOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = -7459452106180601417L; @Column(name = "ORDER_NO") @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index c57ba78..dff413d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -26,7 +27,8 @@ import javax.persistence.*; @Index(columnList = "ORDER_NO") }) @Api("生产队列明细") -public class MesQueueOrderDetail extends BaseBean { +public class MesQueueOrderDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 7840873844253353896L; @Column(name = "ORDER_NO") @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java index 57862f5..cf7ee95 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -28,7 +29,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")}) @Api("原材料信息") -public class MesRawPartSn extends BaseBean { +public class MesRawPartSn extends BaseBean implements Serializable { + private static final long serialVersionUID = 1590983555938105569L; @Column(name = "PART_NO") @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java index 08f1544..d2514e3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepair.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :维修 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_REPAIR") @Api("维修") -public class MesRepair extends BaseBean { +public class MesRepair extends BaseBean implements Serializable { + private static final long serialVersionUID = 5304257976947321917L; @Column(name = "REPAIR_CODE") @ApiParam("维修代码") private String repairCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java index b382132..0026eeb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -31,8 +32,9 @@ import javax.persistence.Table; @Index(columnList = "PART_NO") }) @Api("维修信息记录表") -public class MesRepairRecord extends BaseBean { +public class MesRepairRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -1758374702271940323L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index 5c55d35..ca98cbe 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Lob; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :流程表 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE") @Api("流程表") -public class MesRoute extends BaseBean { +public class MesRoute extends BaseBean implements Serializable { + private static final long serialVersionUID = -3616935751787295145L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index 2f84f21..d24696d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS") @Api("流程工序关系") -public class MesRouteProcess extends BaseBean { +public class MesRouteProcess extends BaseBean implements Serializable { + private static final long serialVersionUID = -1248219638779313299L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index ce83ab3..0e3e719 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.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,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS_CELL") @Api("工序工作单元对照") -public class MesRouteProcessCell extends BaseBean { +public class MesRouteProcessCell extends BaseBean implements Serializable { + private static final long serialVersionUID = 4823057491756814599L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java index 0c745c8..7eab5e8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.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,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_ROUTE_PROCESS_STEP") @Api("流程工序工步关系") -public class MesRouteProcessStep extends BaseBean { +public class MesRouteProcessStep extends BaseBean implements Serializable { + private static final long serialVersionUID = 6325935706401770213L; @Column(name = "ROUTE_CODE") @ApiParam("流程代码") private String routeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java index a9fb72c..81a7105 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrap.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :报废原因 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SCRAP") @Api("报废原因") -public class MesScrap extends BaseBean { +public class MesScrap extends BaseBean implements Serializable { + private static final long serialVersionUID = 2850681183524213132L; @Column(name = "SCRAP_CODE") @ApiParam("报废代码") private String scrapCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java index 8138447..6129a7b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.java @@ -12,6 +12,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Description: @@ -29,8 +30,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("报废信息记录表") -public class MesScrapRecord extends BaseBean { +public class MesScrapRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = -5451178133547076360L; @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 2a285ea..34f25ed 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT") @Api("班次信息") -public class MesShift extends BaseBean { +public class MesShift extends BaseBean implements Serializable { + private static final long serialVersionUID = 4001070186534674096L; @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/MesShiftGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java index 9ef9467..1d7c663 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftGroup.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT_GROUP") @Api("班组") -public class MesShiftGroup extends BaseBean { +public class MesShiftGroup extends BaseBean implements Serializable { + private static final long serialVersionUID = 3409573116624543569L; @Column(name = "GROUP_CODE") @ApiParam("班组代码") private String groupCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java index 6d82d9e..c7e212a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShiftRest.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Description :mes系统业务动作 @@ -27,7 +28,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_SHIFT_REST") @Api("班次休息信息") -public class MesShiftRest extends BaseBean { +public class MesShiftRest extends BaseBean implements Serializable { + private static final long serialVersionUID = 5486276486536860088L; @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/MesStationBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java index 89abdff..0ad8795 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStationBom.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Description :工位物料清单 @@ -29,7 +30,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STATION_BOM") @Api("工位物料清单") -public class MesStationBom extends BaseBean { +public class MesStationBom extends BaseBean implements Serializable { + private static final long serialVersionUID = 1817387724628691734L; @Column(name = "PART_NO") @ApiParam("零件号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index 7d08328..32fa323 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STEP") @Api("工步") -public class MesStep extends BaseBean { +public class MesStep extends BaseBean implements Serializable { + private static final long serialVersionUID = -1106608189453496947L; @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index fbda6ca..b2ca5cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.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,7 +27,8 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_STEP_PARAM") @Api("工步参数") -public class MesStepParam extends BaseBean { +public class MesStepParam extends BaseBean implements Serializable { + private static final long serialVersionUID = 6709455994477993263L; @Column(name = "STEP_CODE") @ApiParam("工步代码") private String stepCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java index d2a2158..a1a92cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesTypeCfg.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,8 +27,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_TYPE_CFG") @Api("类型信息表") -public class MesTypeCfg extends BaseBean { +public class MesTypeCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = 7666533200631763797L; @Column(name = "TYPE_CODE") @ApiParam("类型代码") private String typeCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java index dc37069..ff626d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheck.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -26,8 +27,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WC_CHECK") @Api("开线检查") -public class MesWcCheck extends BaseBean { +public class MesWcCheck extends BaseBean implements Serializable { + private static final long serialVersionUID = 7937744978114334701L; @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/MesWcCheckRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java index 9beab8f..5d7bced 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -28,8 +29,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("开线检查记录") -public class MesWcCheckRecord extends BaseBean { +public class MesWcCheckRecord extends BaseBean implements Serializable { + private static final long serialVersionUID = 6919654845394560128L; @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/MesWcEquipment.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java index 4cc2a15..cb619b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcEquipment.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -25,8 +26,9 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WC_EQUIPMENT") @Api("工作单元设备关系表") -public class MesWcEquipment extends BaseBean { +public class MesWcEquipment extends BaseBean implements Serializable { + private static final long serialVersionUID = 188390912605665500L; @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/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index 7fd8998..1140404 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -30,7 +31,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL") @Api("工作单元") -public class MesWorkCell extends BaseBean { +public class MesWorkCell extends BaseBean implements Serializable { + private static final long serialVersionUID = 8552890090536989486L; @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java index 7806868..06dc991 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -13,6 +13,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Index; import javax.persistence.Table; +import java.io.Serializable; /** * @Author: Wynne.Lu @@ -28,8 +29,9 @@ import javax.persistence.Table; @Index(columnList = "CREATE_DATE_TIME") }) @Api("工位监控异常信息") -public class MesWorkCellMonitorLog extends BaseBean { +public class MesWorkCellMonitorLog extends BaseBean implements Serializable { + private static final long serialVersionUID = 1432794181428753903L; @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/MesWorkCellParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java index 0baae07..eb03cdc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParam.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,8 +28,9 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_PARAM") @Api("mes工作单元参数") -public class MesWorkCellParam extends BaseBean { +public class MesWorkCellParam extends BaseBean implements Serializable { + private static final long serialVersionUID = 1017369816822438021L; @Column(name = "PARAM_CODE") @ApiParam("参数代码") private String paramCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java index 68d7afa..8c33b9c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellParamCfg.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,8 @@ import javax.persistence.Transient; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_PARAM_CFG") @Api("工作单元参数配置") -public class MesWorkCellParamCfg extends BaseBean { +public class MesWorkCellParamCfg extends BaseBean implements Serializable { + private static final long serialVersionUID = -8507576103087989740L; @Column(name = "WORK_CELL_CODE") @ApiParam("工作单元代码") private String workCellCode; 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 0abb9dd..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 @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -30,8 +31,9 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CELL_POINT") @Api("工站队列") -public class MesWorkCellPoint extends BaseBean { +public class MesWorkCellPoint extends BaseBean implements Serializable { + 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/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 4caea9d..f57305a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -14,6 +14,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.io.Serializable; import java.util.List; /** @@ -30,7 +31,8 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_CENTER") @Api("工作中心") -public class MesWorkCenter extends BaseBean { +public class MesWorkCenter extends BaseBean implements Serializable { + private static final long serialVersionUID = 5583253625290231595L; @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/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 557402d..1e50789 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -25,7 +26,8 @@ import javax.persistence.*; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) @Api("生产工单") -public class MesWorkOrder extends BaseBean { +public class MesWorkOrder extends BaseBean implements Serializable { + private static final long serialVersionUID = -3566003375267865064L; @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index c9d175e..1f91275 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.io.Serializable; /** * @Description: @@ -27,7 +28,8 @@ import javax.persistence.*; @Index(columnList = "CREATE_DATE_TIME") }) @Api("生产工单日志") -public class MesWorkOrderLog extends BaseBean { +public class MesWorkOrderLog extends BaseBean implements Serializable { + private static final long serialVersionUID = -5859382100462830988L; @Column(name = "ORDER_NO") @ApiParam("工单号") private String orderNo; From 22eaa30dab0538d8a747b065b5bc3c687813b775 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 20 Jan 2020 18:52:36 +0800 Subject: [PATCH 18/32] =?UTF-8?q?=E3=80=90=E6=94=B6=E8=B4=A7=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=A4=9A=E6=94=B6=E4=BA=86=E9=9B=B6?= =?UTF-8?q?=E4=BB=B6=E5=8F=B7=EF=BC=8C=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E5=90=8E=E5=86=8D=E6=89=AB=E6=8F=8F=E5=8D=95=E5=8F=B7=EF=BC=8C?= =?UTF-8?q?=E8=AF=A5=E9=9B=B6=E4=BB=B6=E5=8F=B7=E6=98=8E=E7=BB=86=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=98=BE=E7=A4=BA=E5=9C=A8=E4=B8=8B=E6=96=B9=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=B8=AD=E3=80=82=E3=80=91=E3=80=90bug7423=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/form/WmsPackageModel.java | 20 ++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 +++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java new file mode 100644 index 0000000..c9c9845 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/form/WmsPackageModel.java @@ -0,0 +1,20 @@ +package cn.estsh.i3plus.pojo.model.form; + +import cn.estsh.i3plus.pojo.wms.bean.WmsPackage; +import lombok.Data; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : qianHuaSheng + * @CreateDate : 2019-06-06 15:40 + * @Modify: + **/ +@Data +public class WmsPackageModel { + + List wmsPackageList; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8c32ae6..b50ab64 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -186,9 +186,10 @@ public class WmsHqlPack { DdlPackBean packBean = new DdlPackBean(); //查询参数封装 DdlPreparedPack.getNumEqualPack(wmsPackage.getOrganizeCode(), "organizeCode", packBean); - DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo(), "packageNo", packBean); + DdlPreparedPack.getNumEqualPack(wmsPackage.getPrintStatus(), "printStatus", packBean); + DdlPreparedPack.getStringLikePack(wmsPackage.getPackageNo()==null?"":wmsPackage.getPackageNo()+"%", "packageNo", packBean); DdlPreparedPack.getStringEqualPack(wmsPackage.getPackSpec(), "packSpec", packBean); - DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo(), "pocketNo", packBean); + DdlPreparedPack.getStringLikePack(wmsPackage.getPocketNo()==null?"":wmsPackage.getPocketNo()+"%", "pocketNo", packBean); DdlPreparedPack.getNumEqualPack(wmsPackage.getPackLevel(), "packLevel", packBean); DdlPreparedPack.getNumEqualPack(wmsPackage.getIsValid()==null?CommonEnumUtil.IS_VAILD.VAILD.getValue():wmsPackage.getIsValid(), "isValid", packBean); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean); From acc907dd28166ed7677be1e569439af9c221aa16 Mon Sep 17 00:00:00 2001 From: luweihao Date: Tue, 21 Jan 2020 09:48:51 +0800 Subject: [PATCH 19/32] =?UTF-8?q?task=20`1295`=20mes=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 +++-- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) 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 6eb2592..6c7b997 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 @@ -24,10 +24,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})} +) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 3a0cbbb..7619062 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -25,11 +25,11 @@ import java.math.BigDecimal; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Table(name = "MES_PRODUCE_SN", indexes = { - @Index(columnList = "SERIAL_NUMBER"), @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})}) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { From e14e813230a1320b943a97f8673ae9546ffa5c02 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 21 Jan 2020 13:36:23 +0800 Subject: [PATCH 20/32] =?UTF-8?q?=E3=80=907476=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E8=80=81=E6=A0=87=E7=AD=BE=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8c32ae6..fd72780 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1294,6 +1294,7 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result); DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result); DdlPreparedPack.getStringLikerPack(wmsStockSn.getSn(), "sn", result); + DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getCustSn(), "custSn", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result); DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result); if (wmsStockSn.getIsValid() != null) { From e1225bbccdc0f269e8a15ac40e9abb4aae01d420 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 21 Jan 2020 15:01:29 +0800 Subject: [PATCH 21/32] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=BB=84=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BomTree.java | 50 ---------------------- .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 1 + .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 1 + .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 2 + .../pojo/aps/converter/CustomDateDeserializer.java | 11 +++-- .../i3plus/pojo/aps/model/RuleGroupProgress.java | 16 +++++++ 10 files changed, 43 insertions(+), 54 deletions(-) delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java deleted file mode 100644 index 122226c..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java +++ /dev/null @@ -1,50 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.bean; - -import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; -import cn.estsh.i3plus.pojo.aps.common.BaseAPS; -import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * @Description :BOM树 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-09-17 - * @Modify: - **/ -@Data -@EqualsAndHashCode(callSuper = true) -@Api("BOM树") -@ExcludeImportExport -public class BomTree extends BaseAPS { - - @ApiParam(value ="物料类型") - private ApsEnumUtil.MATERIAL_TYPE type; - - @ApiParam(value ="备料类型") - private ApsEnumUtil.PREPARE_TYPE prepareType; - - @ApiParam(value ="补充类型") - private ApsEnumUtil.REPLENISHMENT_TYPE replType; - - @ApiParam(value ="采购提前期") - private String purchaseLeadTime; - - @ApiParam(value ="制造提前期") - private String manufLeadTime; - - @ApiParam(value ="配送提前期") - private String shipmentLeadTime; - - @ApiParam(value ="单位采购量") - private Integer unitPurchase; - - @ApiParam(value ="单位制造量") - private Integer unitManuf; - - @ApiParam(value ="单位配送量") - private Integer unitShipment; -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 1c3c598..4199073 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -42,5 +43,6 @@ public class HeuristicRule extends BaseRule { @Column(name="BATCH_PERIOD") @ApiParam(value ="组炉区间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String batchPeriod; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index ca8b7f2..7c7c313 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -139,6 +139,7 @@ public class Material extends BaseAPS { @Column(name="ORDER_BATCH_PERIOD") @ApiParam(value ="订单合并期间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String orderBatchPeriod; @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 4743f7d..37548d8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -74,6 +74,7 @@ public class ProductOrder extends BaseOrder { @Column(name="SPECIFY_LEAD_TIME") @ApiParam(value ="指定提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String specifyLeadTime; @Column(name="CALC_LEAD_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index bbf7a04..b6687d9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -40,6 +41,7 @@ public class PurchaseOrder extends BaseOrder { @Column(name="SPECIFY_LEAD_TIME") @ApiParam(value ="指定提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String specifyLeadTime; @Column(name="CALC_LEAD_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 963ff6f..515cd7b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -60,10 +60,12 @@ public class Resource extends BaseAPS { @Column(name="PREV_BUFFER") @ApiParam(value ="前缓冲时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String prevBuffer; @Column(name="POST_BUFFER") @ApiParam(value ="后缓冲时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String postBuffer; @Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)") @@ -80,14 +82,17 @@ public class Resource extends BaseAPS { @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPrevSdTime; @Column(name="MAX_PRODUCE_SD_TIME") @ApiParam(value ="最大生产中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxProduceSdTime; @Column(name="MAX_POST_SD_TIME") @ApiParam(value ="最大后设置中断时间") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPostSdTime; @Column(name="ROUND_TYPE") @@ -117,6 +122,7 @@ public class Resource extends BaseAPS { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间长度") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String lockTime; @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 9c126d1..85b3191 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -37,6 +37,12 @@ public class RuleGroup extends BaseAPS { @ApiParam(value ="序号") private Integer orderNumber; + @ApiParam(value ="当前执行的规则序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的规则名称") + private transient String curDetailName; + @JsonBackReference public List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 0dae95e..d973fb4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -41,6 +42,7 @@ public class SalesOrder extends BaseOrder { @Column(name="SPECIFY_LEAD_TIME") @ApiParam(value ="指定提前期") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String specifyLeadTime; @Column(name="CALC_LEAD_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java index 20863b2..35cc4ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; +import org.springframework.util.StringUtils; import java.io.IOException; import java.text.ParseException; @@ -15,10 +16,12 @@ public class CustomDateDeserializer extends JsonDeserializer { @Override public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException { - try { - return DATETIME_FORMATOR.parse(jsonParser.getText()); - } catch (ParseException e) { - e.printStackTrace(); + String text = jsonParser.getText(); + if (!StringUtils.isEmpty(text)) { + try { + return DATETIME_FORMATOR.parse(text); + } catch (ParseException e) { + } } return null; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java new file mode 100644 index 0000000..c6e4ba3 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +/** + * @Description : 进度条显示信息。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-01-21 + * @Modify: + **/ +@Data +public class RuleGroupProgress { + private String message; + private String progress; +} From 54cd3cfc45540a57602c6138771d3903ec49fe74 Mon Sep 17 00:00:00 2001 From: jokelone Date: Tue, 21 Jan 2020 15:32:53 +0800 Subject: [PATCH 22/32] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=94=AF=E4=B8=80=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java | 2 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 8 ++++++-- .../estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java | 15 ++++++++------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java | 8 ++++++-- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 +++-- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java | 7 +++++-- .../i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java | 9 ++++++--- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 10 +++++++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java | 7 +++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 4 +++- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 7 +++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java | 14 +++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java | 7 +++++-- .../cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 +++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 6 ++++-- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 10 +++++++--- 19 files changed, 94 insertions(+), 52 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index b5e57f6..116abff 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -62,7 +62,7 @@ public abstract class BaseBean implements Serializable { this.id = id; } - @Column(name="ORGANIZE_CODE") + @Column(name="ORGANIZE_CODE", nullable = false) @ApiParam(value ="组织代码") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) // @AnnoOutputColumn(hidden = true) 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 b912f5c..6c1beda 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 @@ -22,11 +22,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) + } +) @Api("包装规格") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 2292859018089339608L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; 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 0684e76..863a6fd 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 @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,16 +22,20 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) + } +) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 8162606304720621672L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java index bb13a85..bb60da6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java @@ -24,11 +24,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) + } +) @Api("生产主计划") public class MesPlanOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 8571104279843276872L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; 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 6c7b997..472f846 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 @@ -27,14 +27,15 @@ import java.io.Serializable; @Index(columnList = "PRODUCT_SN"), @Index(columnList = "CREATE_DATE_TIME") }, uniqueConstraints = { - @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})} + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) + } ) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = 6641051790330191326L; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java index e93c938..c8dcab7 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java @@ -25,11 +25,14 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER", indexes = { @Index(columnList = "CUST_FLAG_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) + } +) @Api("生产队列主表") public class MesQueueOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 6538031118299400711L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java index 1af12f5..a266608 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java @@ -25,15 +25,18 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") -}) +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + } +) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 1548933241804083457L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 4a4d542..f2162b2 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -24,15 +24,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) + } +) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 8065877030194822855L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java index 4d63bfa..8382b3e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.java @@ -23,12 +23,15 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +}) @Api("客户信息") public class MesCustOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 4990079075654538033L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("订单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 5de7a4a..8c1b09f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -27,12 +27,14 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK", indexes = { @Index(columnList = "TASK_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO"}) }) @Api("设备作业任务") public class MesEquTask extends BaseBean implements Serializable { private static final long serialVersionUID = -3351277499164455197L; - @Column(name = "TASK_NO") + @Column(name = "TASK_NO", nullable = false) @ApiParam("作业任务编号") private String taskNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java index 43dfa07..e164c36 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -27,16 +27,18 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_EQU_TASK_DETAIL", indexes = { @Index(columnList = "EQUIPMENT_CODE") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "TASK_NO", "EQUIPMENT_CODE"}) }) @Api("设备作业任务明细") public class MesEquTaskDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 3317290109159353376L; - @Column(name = "TASK_NO") + @Column(name = "TASK_NO", nullable = false) @ApiParam("作业任务编号") private String taskNo; - @Column(name = "EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE", nullable = false) @ApiParam("设备代码") private String equipmentCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 94a9281..79fe8cb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -22,11 +22,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"}) +}) @Api("包装规格") public class MesPackage extends BaseBean implements Serializable { private static final long serialVersionUID = 5275923991324889995L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编号") private String packageNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java index de95f5d..5c44dcd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.java @@ -9,10 +9,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -25,16 +22,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")}) +@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"}) +}) @Api("包装规格明细") public class MesPackageDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 6980459490465566975L; - @Column(name = "PACKAGE_NO") + @Column(name = "PACKAGE_NO", nullable = false) @ApiParam("包装编码") private String packageNo; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java index 955791a..01be425 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlanOrder.java @@ -24,11 +24,14 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) +}) @Api("生产主计划") public class MesPlanOrder extends BaseBean implements Serializable { private static final long serialVersionUID = 6773005820598583458L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("生产计划单号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java index 81f7d5e..9f84b79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdBindRecord.java @@ -10,10 +10,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.format.annotation.DateTimeFormat; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Index; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -33,11 +30,14 @@ import java.io.Serializable; @Index(columnList = "KP_SN"), @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "ITEM_PART_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER", "KP_SN"}) }) @Api("产品绑定记录表") public class MesProdBindRecord extends BaseBean implements Serializable { private static final long serialVersionUID = -6984193022328810942L; - @Column(name = "SERIAL_NUMBER") + // 联合唯一索引必须加:, nullable = false + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam(value = "产品条码") private String serialNumber; @@ -65,7 +65,7 @@ public class MesProdBindRecord extends BaseBean implements Serializable { @ApiParam("原材料零件号") private String itemPartNo; - @Column(name = "KP_SN") + @Column(name = "KP_SN", nullable = false) @ApiParam("原材料条码") private String kpSn; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 7619062..c0f20d1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -29,12 +29,13 @@ import java.math.BigDecimal; @Index(columnList = "CREATE_DATE_TIME"), @Index(columnList = "PART_NO") }, uniqueConstraints = { - @UniqueConstraint(columnNames = {"SERIAL_NUMBER"})}) + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"}) +}) @Api("产品条码表") public class MesProduceSn extends BaseBean implements Serializable { private static final long serialVersionUID = -1630924042562178494L; - @Column(name = "SERIAL_NUMBER") + @Column(name = "SERIAL_NUMBER", nullable = false) @ApiParam("过程条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java index 81604e5..8b8a70c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrder.java @@ -29,11 +29,13 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER", indexes = { @Index(columnList = "CUST_FLAG_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"}) }) @Api("生产队列主表") public class MesQueueOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -7459452106180601417L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index dff413d..589f92e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -25,15 +25,17 @@ import java.io.Serializable; @EqualsAndHashCode(callSuper = true) @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = { @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) }) @Api("生产队列明细") public class MesQueueOrderDetail extends BaseBean implements Serializable { private static final long serialVersionUID = 7840873844253353896L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("主队列编号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 1e50789..30d074e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -24,15 +24,19 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")}) +@Table(name = "MES_WORK_ORDER", indexes = { + @Index(columnList = "ORDER_NO") +}, uniqueConstraints = { + @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"}) +}) @Api("生产工单") public class MesWorkOrder extends BaseBean implements Serializable { private static final long serialVersionUID = -3566003375267865064L; - @Column(name = "ORDER_NO") + @Column(name = "ORDER_NO", nullable = false) @ApiParam("工单号") private String orderNo; - @Column(name = "PART_NO") + @Column(name = "PART_NO", nullable = false) @ApiParam("物料号") private String partNo; From 44648e4218d0d0c13244f42c34d1a2e6382e4e48 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 21 Jan 2020 17:45:17 +0800 Subject: [PATCH 23/32] =?UTF-8?q?=E3=80=901396=20=E4=BA=9A=E5=A4=AA-?= =?UTF-8?q?=E9=A2=86=E6=96=99=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E7=9C=8B?= =?UTF-8?q?=E6=9D=BF=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 38 ++++++++++++++++++++++ .../pojo/wms/bean/WmsDocMovementDetails.java | 5 +++ 2 files changed, 43 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index e789365..c8c1bab 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -4945,4 +4945,42 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 领料看板执行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PICKING_EXECUTE_STATUS { + IN_PROGRESS(1, "执行中"), EXPIRED(2, "已超期"), NORMAL(3, "正常"); + + private int value; + private String description; + + PICKING_EXECUTE_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 379fd9d..4493f44 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -218,6 +218,11 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam(value = "汇总拣货数量", example = "0") public Double sumPickQty; + @Transient + @ApiParam("执行状态") + @AnnoOutputColumn(refClass = WmsEnumUtil.PICKING_EXECUTE_STATUS.class, refForeignKey = "value", value = "description") + private Integer executeStatus; + public String getRecommondLot() { return recommondLot == null ? "无" : this.recommondLot; } From 4583b87bf5615f2678dedf378f18749bad54fe51 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Jan 2020 09:13:51 +0800 Subject: [PATCH 24/32] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java | 6 ++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index b8563c0..8183437 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -38,6 +38,12 @@ public class ExportProject extends BaseAPS { @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; + @ApiParam(value ="当前执行的明细序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的明细名称") + private transient String curDetailName; + public DataLink getLink() { return BeanRelation.get(this, EExportProject.Link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 7d8f02d..6cc2b67 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -37,6 +37,12 @@ public class ImportProject extends BaseAPS { @FieldAnnotation(relation = "Link", notEmpty = true) private Long linkId; + @ApiParam(value ="当前执行的明细序号") + private transient Integer curDetailNumber; + + @ApiParam(value ="当前执行的明细名称") + private transient String curDetailName; + public DataLink getLink() { return BeanRelation.get(this, EImportProject.Link); } From 03de37cf7cf82f66ce79b1358b94fe8c292f3b63 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 22 Jan 2020 10:41:03 +0800 Subject: [PATCH 25/32] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=BF=9B=E5=BA=A6=E6=98=8E=E7=BB=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java index c6e4ba3..6a67f59 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java @@ -12,5 +12,5 @@ import lombok.Data; @Data public class RuleGroupProgress { private String message; - private String progress; + private Long progress; } From 4ccda480614a4d060240d15ba5435824d32db199 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 22 Jan 2020 15:20:47 +0800 Subject: [PATCH 26/32] =?UTF-8?q?=E3=80=90=20PDA=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=EF=BC=8C=E6=89=AB=E6=8F=8F=E5=90=8E?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=8F=90=E7=A4=BA=E7=9A=84=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E3=80=91=E3=80=90bug7409=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java index c6d2d19..3f75a3f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsLogInfoSendToMqModel.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.WmsActionLogData; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -16,6 +18,7 @@ public class WmsLogInfoSendToMqModel implements Serializable { private int handleType; @ApiParam("日志对象DAO层") private String baseRepository; + @JsonDeserialize(as = WmsActionLogData.class) @ApiParam("日志对象（新增）") private BaseBean logBean; @ApiParam("查询条件名称（修改）") From 591f865bf385f3ebc07f08b21cc413908fcd7eb6 Mon Sep 17 00:00:00 2001 From: qianhs Date: Mon, 3 Feb 2020 17:21:36 +0800 Subject: [PATCH 27/32] =?UTF-8?q?=E3=80=90=E6=88=90=E5=93=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=E9=9C=80=E8=A6=81=E5=B8=A6=E5=87=BA=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=85=88=E7=94=A8=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=89=80=E5=B1=9E=E7=9A=84=E5=AE=A2=E6=88=B7=E5=8F=91?= =?UTF-8?q?=E5=BE=80=E5=9C=B0+=E9=9B=B6=E4=BB=B6=E5=8F=B7=E5=8E=BBWMS=5FCU?= =?UTF-8?q?STOMER=5FPART=E8=A1=A8=E4=B8=AD=E6=89=BE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=89=BE?= =?UTF-8?q?=E4=B8=8D=E5=88=B0=E5=86=8D=E7=94=A8=E5=AE=A2=E6=88=B7+?= =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=8F=B7=E5=8E=BB=E6=89=BE=E3=80=82=E3=80=91?= =?UTF-8?q?=E3=80=90bug7501=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index d812406..aa9a3fe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -118,4 +118,8 @@ public class WmsDocMovementSn extends BaseBean { @Transient @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") public Integer itemStatus; + + @Transient + @ApiParam("客户零件号") + private String customerPartNo; } From e1114d67d2e693a6ed538a6bc8e0a502407cf0c5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Wed, 5 Feb 2020 10:24:09 +0800 Subject: [PATCH 28/32] =?UTF-8?q?=E3=80=90=E9=9D=99=E6=80=81=E7=9B=98?= =?UTF-8?q?=E7=82=B9=E8=A7=A3=E5=86=BB=E8=B0=83=E5=B7=AE=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=8B=BE=E9=80=89=E4=BA=86=E6=89=80=E6=9C=89?= =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8D=95=EF=BC=8C=E7=8E=B0=E5=9C=A8=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E4=B8=80=E4=B8=AA=E5=8D=95=E5=AD=90=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=8D=95=E5=AD=90=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E8=B0=83?= =?UTF-8?q?=E5=B7=AE=EF=BC=8C=E9=9C=80=E8=A6=81=E5=9C=A8=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=97=B6=E5=B0=86=E6=89=80=E6=9C=89=E7=9B=98=E7=82=B9=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E5=B7=AE=E8=8C=83=E5=9B=B4=E9=83=BD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=87=BA=E6=9D=A5=EF=BC=8C=E7=84=B6=E5=90=8E=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=80=A7=E8=B0=83=E5=B7=AE=E6=89=80=E6=9C=89=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=91=E3=80=90bug7485=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsCSOrderMasterModel.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 25 ++++++++++++++++++++++ .../i3plus/pojo/wms/bean/WmsDocMovementSn.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 4 ++++ 4 files changed, 37 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java index 9330c69..c492ccd 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsCSOrderMasterModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.model.wms; +import cn.estsh.i3plus.pojo.wms.bean.WmsCSAdjustRange; import cn.estsh.i3plus.pojo.wms.bean.WmsCSOrderMaster; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -19,6 +20,9 @@ public class WmsCSOrderMasterModel implements Serializable { @ApiParam("盘点订单主表") public List wmsCSOrderMasterList; + @ApiParam("盘点调差表") + public List wmsCSAdjustRangeList; + @ApiParam("工厂代码") public String organizeCode; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index a8c2c3b..5b08a41 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -110,4 +110,29 @@ public class QadBop implements Serializable { @Column(name="CREATE_DATE_TIME") @ApiParam("创建时间") public String createDateTime; + + @Transient + @ApiParam("收货时是供应商编号，发运时是客户发往地") + public String inAddr; + + @Transient + @ApiParam("工厂代码") + public String inSite; + + public QadBop(String bopCode, String bopDesc, String bopDomain, String parentPart, String parentReturnPart, String bopdwQty, String subBopCode, String subBopPart, String subItemPart, String subQty, String subUnit, String createDateTime, String inAddr, String inSite) { + this.bopCode = bopCode; + this.bopDesc = bopDesc; + this.bopDomain = bopDomain; + this.parentPart = parentPart; + this.parentReturnPart = parentReturnPart; + this.bopdwQty = bopdwQty; + this.subBopCode = subBopCode; + this.subBopPart = subBopPart; + this.subItemPart = subItemPart; + this.subQty = subQty; + this.subUnit = subUnit; + this.createDateTime = createDateTime; + this.inAddr = inAddr; + this.inSite = inSite; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java index aa9a3fe..81cd4b4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java @@ -122,4 +122,8 @@ public class WmsDocMovementSn extends BaseBean { @Transient @ApiParam("客户零件号") private String customerPartNo; + + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index 06afc0f..6c78826 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -146,6 +146,10 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "特殊批次") private String fixLotNo = ""; + @Transient + @ApiParam("父层级packcode对应的可回用零件号") + private String parentReturnPart; + public WmsPoSn(){} public WmsPoSn(String orderNo,String earliestReceTime,String latestReceTime){ From 96e0e3756fff2c2d723d0b2fd0ef3417d0468fcb Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 6 Feb 2020 14:33:29 +0800 Subject: [PATCH 29/32] =?UTF-8?q?=E3=80=90=207507=20=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E6=94=B6=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E3=80=91bug7507?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 4493f44..dce4072 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -151,6 +151,11 @@ public class WmsDocMovementDetails extends BaseBean { @Column(name = "LOT_NO") @ApiParam("批次") public String lotNo; + + @Column(name="SRC_ITEM", columnDefinition="varchar(50) default ''",nullable=false) + @ApiParam("源单行号") + public String srcItem; + @Transient @ApiParam("实际批次") private String actualLot; From 9c754e581659d0c07ddd3692e91f37eb39504265 Mon Sep 17 00:00:00 2001 From: qianhs Date: Fri, 7 Feb 2020 14:08:28 +0800 Subject: [PATCH 30/32] =?UTF-8?q?=E3=80=90=20=E5=8F=91=E8=BF=90=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=2020300=EF=BC=8C=2020390=20=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=BE=80=20ref=5Fitem=20=E5=AD=97=E6=AE=B5=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=80=BC=E3=80=91=E3=80=90bug7506?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java index 5b08a41..24eb89b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QadBop.java @@ -119,6 +119,10 @@ public class QadBop implements Serializable { @ApiParam("工厂代码") public String inSite; + public QadBop(){ + + } + public QadBop(String bopCode, String bopDesc, String bopDomain, String parentPart, String parentReturnPart, String bopdwQty, String subBopCode, String subBopPart, String subItemPart, String subQty, String subUnit, String createDateTime, String inAddr, String inSite) { this.bopCode = bopCode; this.bopDesc = bopDesc; From 1c144eca4d06316dfbd196fac690a97cd1f0a4f5 Mon Sep 17 00:00:00 2001 From: luweihao Date: Mon, 10 Feb 2020 10:41:29 +0800 Subject: [PATCH 31/32] =?UTF-8?q?=E7=A7=BB=E9=99=A4mespcn=E4=B9=90?= =?UTF-8?q?=E8=A7=82=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 5 +++++ 5 files changed, 26 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java index a9c205e..60e2d1d 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Version; import java.io.Serializable; /** @@ -66,6 +67,11 @@ public class MesCellFeed extends BaseBean implements Serializable { @ApiParam("供应商代码") private String supplierCode; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public Integer lockVersion; + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } 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 6c7b997..e013a4e 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 @@ -125,6 +125,11 @@ public class MesProduceSn extends BaseBean implements Serializable { @Column(name = "TRAY_NO") @ApiParam("托盘号") private String trayNo; +// +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public transient Integer lockVersion; @Transient @ApiParam("返回信息") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java index 4a4d542..da598d0 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrder.java @@ -148,6 +148,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public transient Integer lockVersion; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index 7619062..4b46c64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -130,6 +130,11 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("操作类型") private Integer operateType; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public transient Integer lockVersion; + @Transient @ApiParam("返回信息") private String resultMsg; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 1e50789..2c6349f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -148,6 +148,11 @@ public class MesWorkOrder extends BaseBean implements Serializable { @ApiParam("首检生成数量") private Double fiGenerateQty; +// @Version +// @Column(name = "LOCK_VERSION") +// @ApiParam(value = "乐观锁", example = "1") +// public transient Integer lockVersion; + /********************** 冗余字段 *********************************/ @Transient @ApiParam(value = "工作中心名称") From 54b167256fa01a998fcb6b09c9fb84e8635f0cfe Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 11 Feb 2020 14:30:03 +0800 Subject: [PATCH 32/32] =?UTF-8?q?=E3=80=90=207510=20=E9=A2=86=E6=96=99?= =?UTF-8?q?=EF=BC=8C=E5=8F=91=E8=BF=90=E4=B8=80=E6=AD=A5=E6=B3=95=E5=81=9A?= =?UTF-8?q?=E5=AE=8C=E4=B9=8B=E5=90=8E=E5=9C=A8=E5=8D=95=E6=8D=AE=E5=AD=90?= =?UTF-8?q?=E8=A1=A8=E8=AF=A6=E6=83=85=E4=B8=AD=E6=9D=A1=E7=A0=81=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E4=BB=BB=E7=84=B6=E4=B8=BA=E5=BE=85=E5=A4=84=E7=90=86?= =?UTF-8?q?=E3=80=82=20=E3=80=91bug7510?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index dce4072..9c02389 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -156,6 +156,10 @@ public class WmsDocMovementDetails extends BaseBean { @ApiParam("源单行号") public String srcItem; + @Column(name = "CUST_ORDER_NO") + @ApiParam("客户订单号") + public String custOrderNo; + @Transient @ApiParam("实际批次") private String actualLot;