From 85e35eede1e36d3e5baddc33f624f780e18b1c5a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 18 Nov 2019 19:53:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 59dfd14..e2b1412 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 @@ -191,19 +191,19 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_CODE_TYPE { - SERIAL_SN("10", "过程条码"), - PRODUCT_SN("20", "产品条码"), - PACK_SN("30", "包装条码"); + SERIAL_SN(10, "过程条码"), + PRODUCT_SN(20, "产品条码"), + PACK_SN(30, "包装条码"); - private String value; + private int value; private String description; - MES_CODE_TYPE(String value, String description) { + MES_CODE_TYPE(int value, String description) { this.value = value; this.description = description; } - public String getValue() { + public int getValue() { return value; } @@ -211,7 +211,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(String val) { + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { From 407fdbf217701d610428026278349226acef58c5 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 18 Nov 2019 20:11:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=88=A0=E9=99=A4=E5=87=BA=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BomTree.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 2 ++ 45 files changed, 93 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 21dd6e1..c5eec24 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,6 +19,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_ASSIST_RESOURCE_SET_TIME") @Api("副资源设置时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index dd36fb7..3576592 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.MappedSuperclass; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @MappedSuperclass @Api("订单基类") public class BaseOrder extends BaseCode { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index 456ed09..3759481 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.MappedSuperclass; @@ -17,6 +18,7 @@ import javax.persistence.MappedSuperclass; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @MappedSuperclass @Api("规则参数基类") public class BaseRule extends BaseAPS { 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 index a802118..b8f05fb 100644 --- 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 @@ -5,6 +5,7 @@ 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树 @@ -14,6 +15,7 @@ import lombok.Data; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Api("BOM树") public class BomTree extends BaseAPS { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java index 5d09632..23159bc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -16,6 +17,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_CANCEL_PLAN_RULE") @Api("取消计划规则") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 1f2edb3..067f76a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,6 +19,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_DATA_LINK") @Api("数据集成数据连接信息") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index ff9e9c0..54f2d8a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -17,6 +18,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_DAY_SHIFT") @Api("班次") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index 34c1a8e..ba3afb0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -19,6 +20,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_DYNAMIC_SET_TIME") @Api("动态设置时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index 9343571..5e49e94 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_EXPORT_DETAIL") @Api("数据导出明细") 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 458c9a5..1a44c20 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 @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_EXPORT_PROJECT") @Api("数据导出明细集合") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index 4e3677d..470db80 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -17,6 +18,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_FIELD_SET_RULE") @Api("属性赋值规则") 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 e65c965..1c3c598 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -17,6 +18,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_HEURISTIC_RULE") @Api("排程运算规则") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 872c9e3..8e0d4c5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_IMPORT_DETAIL") @Api("数据导入明细") 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 35e8af3..3c78c4c 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 @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -22,6 +23,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_IMPORT_PROJECT") @Api("数据导入明细集合") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 97056fa..ad08ede 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_INVENTORY") @Api("库存") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index 31e3941..9150118 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,6 +19,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_MAT_CALC_RULE") @Api("物料运算规则") 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 66199b2..e19681f 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 @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_MATERIAL") @Api("物料") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index facf9b4..6e01250 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -18,6 +19,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_MATERIAL_SET_TIME") @Api("物料设置时间") 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 3f4d265..b4b241c 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 @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OPER_INPUT") @Api("工序输入") 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 5e98d6e..c1f8984 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 @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -22,6 +23,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") 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 a877505..7d78809 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 @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") 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 5b1d730..9400f9c 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 @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OPERATION") @Api("工序") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java index b1a449a..493c332 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import java.util.Date; @@ -18,6 +19,7 @@ import java.util.Date; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Api("订单树") public class OrderTree extends BaseAPS { @ApiParam(value ="物料编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index 884adbd..b16377c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -19,6 +20,7 @@ import java.util.Date; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_OVERTIME_CALENDAR") @Api("加班日历") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index a81d45f..1539067 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PARENT_WORK") @Api("父工作") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 40b004b..620ba31 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PLAN_FEEDBACK") @Api("物料") 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 7175b15..8655079 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 @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PRODUCT_ORDER") @Api("生产订单") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 74a3b60..7cdd7b5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PRODUCT_ROUTING") @Api("物料") 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 21eed1b..e12badd 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 @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_PURCHASE_ORDER") @Api("工艺路线") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index cc889e3..fdac512 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_RES_CALENDAR") @Api("日历") 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 129a9db..b0963f9 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 @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_RESOURCE") @Api("资源") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index d019c4d..72f0ae6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_RULE_DETAIL") @Api("规则明细") 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 2b22bce..670f56a 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 @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_RULE_GROUP") @Api("规则组合") 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 66a5337..0dae95e 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 @@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import java.util.Date; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_SALES_ORDER") @Api("销售订单") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java index eea1979..53a30a4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -17,6 +18,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_SERIAL_NUMBER") @Api("取消计划规则") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index de87386..6fc2187 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EShippingTime; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_SHIPPING_TIME") @Api("运输时间") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 7e6aeb4..52d1f68 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -19,6 +20,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_STAND_OPERATION") @Api("标准工序") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 68e1ddf..acea2ca 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -20,6 +21,7 @@ import java.util.Date; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_SYS_PARAM") @Api("系统参数") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 4e64725..e14f224 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -24,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK") @Api("工作") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index e690ba2..ad465c2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -23,6 +24,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK_INPUT") @Api("工作输入") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index c947efd..51f4803 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import org.springframework.context.annotation.Bean; import javax.persistence.Column; @@ -24,6 +25,7 @@ import java.util.List; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK_OUTPUT") @Api("工作输出") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 13aa2cc..b0cb321 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_Work_Relation") @Api("工作关联") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 16a577f..67bac97 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; @@ -21,6 +22,7 @@ import javax.persistence.Table; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @Entity @Table(name = "APS_WORK_RESOURCE") @Api("工作资源") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index a300c90..1be31d5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -39,4 +39,9 @@ public abstract class BaseAPS extends BaseBean { public void setCustomField(String code, Object value) { customFields.put(code, value); } + + @Override + public boolean equals(Object obj) { + return this == obj; + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index 5d03f34..8fca466 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.common; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import io.swagger.annotations.ApiParam; import lombok.Data; +import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.MappedSuperclass; @@ -15,6 +16,7 @@ import javax.persistence.MappedSuperclass; * @Modify: **/ @Data +@EqualsAndHashCode(callSuper = true) @MappedSuperclass public abstract class BaseCode extends BaseAPS { @Column(name="CODE") From 3c3de4951270b610458c787f57d075ebb486232d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 18 Nov 2019 22:12:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90bug:6483=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 32 +++++++++++----------- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 22 +++++++-------- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java | 6 ++-- .../cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 6 ++-- .../i3plus/pojo/mes/bean/MesProductEncodeCfg.java | 4 +-- 5 files changed, 35 insertions(+), 35 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 e9e3ae3..f8940d1 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 @@ -375,21 +375,21 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_MATCH_TYPE { - ORGANIZATION("10", "工厂"), - PART("20", "物料"), - CUST_CODE("30", "客户代码"), - CUST_PART_NO("40", "客户物料号"), - WORK_CENTER("50", "产线"); + ORGANIZATION(10, "工厂"), + PART(20, "物料"), + CUST_CODE(30, "客户代码"), + CUST_PART_NO(40, "客户物料号"), + WORK_CENTER(50, "产线"); - private String value; + private int value; private String description; - MES_MATCH_TYPE(String value, String description) { + MES_MATCH_TYPE(int value, String description) { this.value = value; this.description = description; } - public String getValue() { + public int getValue() { return value; } @@ -397,7 +397,7 @@ public class MesEnumUtil { return description; } - public static String valueOfDescription(String val) { + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -414,19 +414,19 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_CODE_TYPE { - SERIAL_SN("10", "过程条码"), - PRODUCT_SN("20", "产品条码"), - PACK_SN("30", "包装条码"); + SERIAL_SN(10, "过程条码"), + PRODUCT_SN(20, "产品条码"), + PACK_SN(30, "包装条码"); - private String value; + private int value; private String description; - MES_CODE_TYPE(String value, String description) { + MES_CODE_TYPE(int value, String description) { this.value = value; this.description = description; } - public String getValue() { + public int getValue() { return value; } @@ -434,7 +434,7 @@ public class MesEnumUtil { return description; } - public static String valueOfDescription(String val) { + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { 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 e2b1412..d3a1cf1 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 @@ -142,21 +142,21 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_MATCH_TYPE { - ORGANIZATION("10", "工厂"), - PART("20", "物料"), - CUST_CODE("30", "客户代码"), - CUST_PART_NO("40", "客户物料号"), - WORK_CENTER("50", "产线"); + ORGANIZATION(10, "工厂"), + PART(20, "物料"), + CUST_CODE(30, "客户代码"), + CUST_PART_NO(40, "客户物料号"), + WORK_CENTER(50, "产线"); - private String value; + private int value; private String description; - MES_MATCH_TYPE(String value, String description) { + MES_MATCH_TYPE(int value, String description) { this.value = value; this.description = description; } - public String getValue() { + public int getValue() { return value; } @@ -164,7 +164,7 @@ public class MesPcnEnumUtil { return description; } - public static String valueOfDescription(String val) { + public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -175,9 +175,9 @@ public class MesPcnEnumUtil { } // 根据value返回枚举类型,主要在switch中使用 - public static MES_MATCH_TYPE getByValue(String value) { + public static MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { - if (mesMatchType.getValue().equals(value)) { + if (mesMatchType.getValue() == value) { return mesMatchType; } } 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 c3ae649..1859025 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 @@ -75,15 +75,15 @@ public class MesPart extends BaseBean { @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private String processMatchType; + private Integer processMatchType; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") - private String packageMatchType; + private Integer packageMatchType; @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") - private String productMatchType; + private Integer productMatchType; @Transient @ApiParam("分类名称") 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 397ff0b..216e157 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 @@ -79,13 +79,13 @@ public class MesPart extends BaseBean { @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private String processMatchType; + private Integer processMatchType; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") - private String packageMatchType; + private Integer packageMatchType; @Column(name = "PRODUCT_MATCH_TYPE") @ApiParam("产品编码匹配类型") - private String productMatchType; + private Integer productMatchType; } 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 5eac148..cd7e9ee 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 @@ -30,11 +30,11 @@ public class MesProductEncodeCfg extends BaseBean { @Column(name = "CODE_TYPE") @ApiParam("编码类型") - private String codeType; + private Integer codeType; @Column(name = "MATCH_TYPE") @ApiParam("匹配类型") - private String matchType; + private Integer matchType; @Column(name = "MATCH_VALUE") @ApiParam("匹配值") From fe962c1ab3746cb6921ff7d6ba48ea0affc43f9f Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Mon, 18 Nov 2019 22:15:02 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90bug:6483=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/mes/sqlpack/MesHqlPack.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9b67963..a9c0fd4 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 @@ -1700,10 +1700,10 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(mesProductEncodeCfg.getMatchValue(), "matchValue", packBean); } if (!StringUtils.isEmpty(mesProductEncodeCfg.getCodeType())) { - DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getCodeType(), "codeType", packBean); + DdlPreparedPack.getNumEqualPack(mesProductEncodeCfg.getCodeType(), "codeType", packBean); } if (!StringUtils.isEmpty(mesProductEncodeCfg.getMatchType())) { - DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getMatchType(), "matchType", packBean); + DdlPreparedPack.getNumEqualPack(mesProductEncodeCfg.getMatchType(), "matchType", packBean); } if (!StringUtils.isEmpty(mesProductEncodeCfg.getRuleCode())) { DdlPreparedPack.getStringEqualPack(mesProductEncodeCfg.getRuleCode(), "ruleCode", packBean); From d4422bee151782c193445b3922d0c435555797d5 Mon Sep 17 00:00:00 2001 From: qianhs Date: Tue, 19 Nov 2019 11:32:16 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=20PO=E8=AE=A2=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E6=9F=A5=E8=AF=A2=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E3=80=91=E3=80=90bug6493=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java | 15 +++++++++++++++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java index 70ea929..c9618cd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java @@ -493,6 +493,21 @@ public class DdlPreparedPack { } /** + * 两个提交用or拼接 + * + * @param data + * @param columnName + * @param packBean + */ + public static void getNotOrIsNull(Object data, String columnName, DdlPackBean packBean) { + if (data != null) { + packBean.addColumnQuery(columnName, " and (model." + columnName + " in (:m_" + columnName + ") " + + "or model." + columnName + " is null)", data); + } + } + + + /** * 封装in查询语句 * * @param data 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 15013e3..d405adc 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 @@ -213,7 +213,7 @@ public class WmsHqlPack { numList.add(0); numList.add(wmsPOMaster.getPriorRC()); numList.add(null); - DdlPreparedPack.getInPackList(numList, "priorRC", result); + DdlPreparedPack.getNotOrIsNull(numList, "priorRC", result); }else{ DdlPreparedPack.getNumEqualPack(wmsPOMaster.getPriorRC(), "priorRC", result); }