Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_ASSIST_RESOURCE_SET_TIME")
 @Api("副资源设置时间")
 public class AssistResourceSetTime extends BaseAPS {
+    private static final long serialVersionUID = 901172392855536686L;
     @Column(name="RES_CODE")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -34,6 +34,7 @@ import java.util.List;
 @ExcludeImportExport
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class BaseOrder extends BaseAPS {
+    private static final long serialVersionUID = -2571085172798608026L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java

@@ -24,6 +24,7 @@ import javax.persistence.MappedSuperclass;
 @Api("规则参数基类")
 @ExcludeImportExport
 public class BaseRule extends BaseAPS {
+    private static final long serialVersionUID = -1818853814377611968L;
     @Column(name="CODE")
     @ApiParam(value ="规则编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java

@@ -22,6 +22,7 @@ import javax.persistence.Table;
 @Table(name = "APS_CANCEL_PLAN_RULE")
 @Api("取消计划规则")
 public class CancelPlanRule extends BaseRule {
+    private static final long serialVersionUID = 2674055522875545446L;
     @Column(name="WORK_FILTERS")
     @ApiParam(value ="工作筛选")
     private String workFilters;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_DATA_LINK")
 @Api("数据集成数据连接信息")
 public class DataLink extends BaseAPS {
+    private static final long serialVersionUID = 8324774871058505466L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("班次")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class DayShift extends BaseAPS {
+    private static final long serialVersionUID = 7964370027924366093L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_DYNAMIC_SET_TIME")
 @Api("动态设置时间")
 public class DynamicSetTime extends BaseAPS {
+    private static final long serialVersionUID = -1696499471488104793L;
     @Column(name="RES_CODE")
     @ApiParam(value ="资源代码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api("数据导出明细")
 public class ExportDetail extends BaseAPS {
 
+    private static final long serialVersionUID = -8898414164032180539L;
     @Column(name="OUT_NAME")
     @ApiParam(value ="外部表名")
     private String outName;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_EXPORT_PROJECT")
 @Api("数据导出明细集合")
 public class ExportProject extends BaseAPS {
+    private static final long serialVersionUID = -7281303629295174330L;
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java

@@ -23,6 +23,7 @@ import javax.persistence.Table;
 @Table(name = "APS_EXPRESSION_RECORD")
 @Api("表达式记录")
 public class ExpressionRecord extends BaseAPS {
+    private static final long serialVersionUID = 4038954046132896632L;
     @Column(name="BEAN_NAME")
     @ApiParam(value ="表名")
     private String beanName;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java

@@ -35,6 +35,7 @@ import java.sql.JDBCType;
 @Api("字段信息")
 @ExcludeImportExport
 public class FieldInfo extends BaseAPS {
+    private static final long serialVersionUID = -6195036426929675850L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java

@@ -24,6 +24,7 @@ import javax.persistence.Table;
 @Table(name = "APS_FIELD_SET_RULE")
 @Api("属性赋值规则")
 public class FieldSetRule extends BaseRule {
+    private static final long serialVersionUID = 6880145972942618559L;
     @Column(name="BEAN")
     @ApiParam(value ="实体名")
     private ApsEnumUtil.FIELD_SET_BEAN bean;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java

@@ -31,6 +31,7 @@ import javax.validation.constraints.Min;
 @Api("炉容量")
 public class FurnaceCapacity extends BaseAPS {
 
+    private static final long serialVersionUID = -5657804042629460659L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api("炉资源计划")
 public class FurnacePlan extends BaseAPS {
 
+    private static final long serialVersionUID = 6816465736285211114L;
     @Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="已占用的能力")
     private Double capacity;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @Api("组炉设置")
 public class FurnaceSetting extends BaseAPS {
 
+    private static final long serialVersionUID = -4566911526487268870L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java

@@ -24,6 +24,7 @@ import javax.persistence.Table;
 @Table(name = "APS_HEURISTIC_RULE")
 @Api("排程运算规则")
 public class HeuristicRule extends BaseRule {
+    private static final long serialVersionUID = -4856714428377308150L;
     @Column(name="WORK_FILTER")
     @ApiParam(value ="工作筛选")
     private String workFilter;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("数据导入明细")
 public class ImportDetail extends BaseAPS {
 
+    private static final long serialVersionUID = 1264030397500660450L;
     @Column(name="OUT_NAME")
     @ApiParam(value ="外部表名")
     private String outName;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java

@@ -28,6 +28,7 @@ import java.util.List;
 @Table(name = "APS_IMPORT_PROJECT")
 @Api("数据导入明细集合")
 public class ImportProject extends BaseAPS {
+    private static final long serialVersionUID = -1899074765155621438L;
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java

@@ -26,6 +26,7 @@ import javax.persistence.Table;
 @Table(name = "APS_INVENTORY")
 @Api("库存")
 public class Inventory extends BaseOrder {
+    private static final long serialVersionUID = 2378846162007550439L;
     @Column(name="SPECIFY_TOP_ORDER")
     @ApiParam(value ="指定顶层订单")
     private String specifyTopOrder;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java

@@ -24,6 +24,7 @@ import javax.persistence.Table;
 @Table(name = "APS_MAT_CALC_RULE")
 @Api("物料运算规则")
 public class MatCalcRule extends BaseRule {
+    private static final long serialVersionUID = 2102986260688118982L;
     @Column(name="MATERIAL_FILTER")
     @ApiParam(value ="物料筛选")
     private String materialFilter;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java

@@ -34,6 +34,7 @@ import java.util.List;
 @Api("物料")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class Material extends BaseAPS {
+    private static final long serialVersionUID = -7928225487946173108L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Table(name = "APS_MATERIAL_SET_TIME")
 @Api("物料设置时间")
 public class MaterialSetTime extends BaseAPS {
+    private static final long serialVersionUID = -7996431489447641539L;
     @Column(name="RES_CODE")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_OPER_INPUT")
 @Api("工序输入")
 public class OperInput extends BaseAPS {
+    private static final long serialVersionUID = 6653235155693766804L;
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java

@@ -28,6 +28,7 @@ import java.util.List;
 @Table(name = "APS_OPER_OUTPUT")
 @Api("工序输出")
 public class OperOutput extends BaseAPS {
+    private static final long serialVersionUID = 3185682762290147209L;
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_OPER_RESOURCE")
 @Api("工序资源")
 public class OperResource extends BaseAPS {
+    private static final long serialVersionUID = -8683889582369342606L;
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_OPERATION")
 @Api("工序")
 public class Operation extends BaseAPS {
+    private static final long serialVersionUID = 4394179144091116858L;
     @Column(name="NUMBER")
     @ApiParam(value ="工序号")
     @FieldAnnotation(notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java

@@ -24,6 +24,7 @@ import java.util.Date;
 @Api("订单树")
 @ExcludeImportExport
 public class OrderTree extends BaseAPS {
+    private static final long serialVersionUID = -7505923374791695738L;
     @ApiParam(value ="物料编码")
     private String material;
 

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java

@@ -26,6 +26,7 @@ import java.util.Date;
 @Table(name = "APS_OVERTIME_CALENDAR")
 @Api("加班日历")
 public class OvertimeCalendar extends BaseAPS {
+    private static final long serialVersionUID = -501715721073189464L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源代码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java

@@ -32,6 +32,7 @@ import java.util.List;
 @Api("父工作")
 @ExcludeImportExport
 public class ParentWork extends BaseAPS {
+    private static final long serialVersionUID = 8792781216193806606L;
     @Column(name="count", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="数量")
     private Double count;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api("工作反馈")
 public class PlanFeedback extends BaseAPS {
 
+    private static final long serialVersionUID = 2520555825093741381L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(property = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java

@@ -30,6 +30,7 @@ import java.util.List;
 @Table(name = "APS_PRODUCT_ORDER")
 @Api("生产订单")
 public class ProductOrder extends BaseOrder {
+    private static final long serialVersionUID = 6900226668783662736L;
     @Column(name="EST")
     @ApiParam(value ="最早开始时间")
     private Date est;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api("工艺路线")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class ProductRouting extends BaseAPS {
+    private static final long serialVersionUID = 4905294866468216722L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Table(name = "APS_PURCHASE_ORDER")
 @Api("采购订单")
 public class PurchaseOrder extends BaseOrder {
+    private static final long serialVersionUID = 4699381603433121631L;
     @Column(name="SPECIFY_TOP_ORDER")
     @ApiParam(value ="指定顶层订单")
     private String specifyTopOrder;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_RES_CALENDAR")
 @Api("日历")
 public class ResCalendar extends BaseAPS {
+    private static final long serialVersionUID = 8338930205816433211L;
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java

@@ -33,6 +33,7 @@ import java.util.List;
 @Api("资源")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class Resource extends BaseAPS {
+    private static final long serialVersionUID = 3304084329600816457L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java

@@ -30,6 +30,7 @@ import javax.persistence.Table;
 @ExcludeImportExport
 public class RuleDetail extends BaseAPS {
 
+    private static final long serialVersionUID = -6433950357039396107L;
     @Column(name="TYPE")
     @ApiParam(value ="规则类型")
     private ApsEnumUtil.RULE_TYPE type;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Api("规则组合")
 @ExcludeImportExport
 public class RuleGroup extends BaseAPS {
+    private static final long serialVersionUID = 4741897751041891075L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     private String code;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java

@@ -28,6 +28,7 @@ import java.util.Date;
 @Table(name = "APS_SALES_ORDER")
 @Api("销售订单")
 public class SalesOrder extends BaseOrder {
+    private static final long serialVersionUID = -511784925441907538L;
     @Column(name="LOW_EST")
     @ApiParam(value ="底阶最早开始时间")
     private Date lowEst;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java

@@ -26,6 +26,7 @@ import javax.persistence.Table;
 @ExcludeImportExport
 public class SerialNumber extends BaseAPS {
 
+    private static final long serialVersionUID = 312483211086701109L;
     @Column(name="NUMBER")
     @ApiParam(value ="流水号")
     private Integer number;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java

@@ -27,6 +27,7 @@ import javax.persistence.Table;
 @Api("运输时间")
 public class ShippingTime extends BaseAPS {
 
+    private static final long serialVersionUID = -8698904420363808737L;
     @Column(name="PREV_RES_CODE")
     @ApiParam(value ="前资源编码")
     @FieldAnnotation(relation = "PrevRes")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java

@@ -29,6 +29,7 @@ import javax.persistence.Table;
 @Api("标准工序")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class StandOperation extends BaseAPS {
+    private static final long serialVersionUID = -6869403951765771775L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java

@@ -26,6 +26,7 @@ import java.util.Date;
 @Table(name = "APS_SYS_PARAM")
 @Api("系统参数")
 public class SysParam extends BaseAPS {
+    private static final long serialVersionUID = 3115620726438869596L;
     @Column(name="BASE_TIME")
     @ApiParam(value ="基准时间")
     private Date baseTime;

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java

@@ -34,6 +34,7 @@ import java.util.List;
 @Api("工作")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class Work extends BaseAPS {
+    private static final long serialVersionUID = 6471740978550523187L;
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true, modify = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java

@@ -29,6 +29,7 @@ import java.util.List;
 @Table(name = "APS_WORK_INPUT")
 @Api("工作输入")
 public class WorkInput extends BaseAPS {
+    private static final long serialVersionUID = 2654389476284740183L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java

@@ -31,6 +31,7 @@ import java.util.List;
 @Api("工作输出")
 public class WorkOutput extends BaseAPS {
 
+    private static final long serialVersionUID = 6031001499619328313L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -35,6 +35,7 @@ import java.util.List;
 @Api("工作计划")
 public class WorkPlan extends BaseAPS {
 
+    private static final long serialVersionUID = 5489548115780676195L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("工作关联")
 public class WorkRelation extends BaseAPS {
 
+    private static final long serialVersionUID = -5824884364328962956L;
     @Column(name="MATERIAL_ID")
     @ApiParam(value ="物料")
     @FieldAnnotation(relation = "Material", modify = false)

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java

@@ -28,6 +28,7 @@ import javax.persistence.Table;
 @Api("工作资源")
 public class WorkResource extends BaseAPS {
 
+    private static final long serialVersionUID = 4791940404968841144L;
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java

@@ -25,6 +25,7 @@ import java.util.HashMap;
 @MappedSuperclass
 @ExcludeImportExport
 public abstract class BaseAPS extends BaseBean {
+    private static final long serialVersionUID = -8638842158403944318L;
     @JsonIgnore
     @Lob
     @FieldAnnotation(property = false)