Merge remote-tracking branch 'origin/dev' into dev

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("副资源设置时间")

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 {

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 {

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 {
 

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("取消计划规则")

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("数据集成数据连接信息")

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("班次")

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("动态设置时间")

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("数据导出明细")

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("数据导出明细集合")

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("属性赋值规则")

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("排程运算规则")

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("数据导入明细")

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("数据导入明细集合")

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("库存")

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("物料运算规则")

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("物料")

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("物料设置时间")

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("工序输入")

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("工序输出")

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("工序资源")

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("工序")

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 ="物料编码")

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("加班日历")

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("父工作")

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("物料")

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("生产订单")

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("物料")

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("工艺路线")

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("日历")

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("资源")

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("规则明细")

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("规则组合")

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("销售订单")

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("取消计划规则")

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("运输时间")

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("标准工序")

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("系统参数")

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("工作")

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("工作输入")

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("工作输出")

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("工作关联")

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("工作资源")

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;
+    }
 }

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")

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", "工厂"),
+        ORGANIZATION(10, "工厂"),
-        PART("20", "物料"),
+        PART(20, "物料"),
-        CUST_CODE("30", "客户代码"),
+        CUST_CODE(30, "客户代码"),
-        CUST_PART_NO("40", "客户物料号"),
+        CUST_PART_NO(40, "客户物料号"),
-        WORK_CENTER("50", "产线");
+        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", "过程条码"),
+        SERIAL_SN(10, "过程条码"),
-        PRODUCT_SN("20", "产品条码"),
+        PRODUCT_SN(20, "产品条码"),
-        PACK_SN("30", "包装条码");
+        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) {

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", "工厂"),
+        ORGANIZATION(10, "工厂"),
-        PART("20", "物料"),
+        PART(20, "物料"),
-        CUST_CODE("30", "客户代码"),
+        CUST_CODE(30, "客户代码"),
-        CUST_PART_NO("40", "客户物料号"),
+        CUST_PART_NO(40, "客户物料号"),
-        WORK_CENTER("50", "产线");
+        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;
                 }
             }
@@ -191,19 +191,19 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MES_CODE_TYPE {
 
-        SERIAL_SN("10", "过程条码"),
+        SERIAL_SN(10, "过程条码"),
-        PRODUCT_SN("20", "产品条码"),
+        PRODUCT_SN(20, "产品条码"),
-        PACK_SN("30", "包装条码");
+        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) {

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

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("分类名称")

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;
 }

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("匹配值")

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);

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);
         }