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/BomTree.java

@@ -1,50 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.bean;
-
-import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
-import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
-import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * @Description :BOM树
- * @Reference :
- * @Author : jason.niu
- * @CreateDate : 2019-09-17
- * @Modify:
- **/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Api("BOM树")
-@ExcludeImportExport
-public class BomTree extends BaseAPS {
-
-    @ApiParam(value ="物料类型")
-    private ApsEnumUtil.MATERIAL_TYPE type;
-
-    @ApiParam(value ="备料类型")
-    private ApsEnumUtil.PREPARE_TYPE prepareType;
-
-    @ApiParam(value ="补充类型")
-    private ApsEnumUtil.REPLENISHMENT_TYPE replType;
-
-    @ApiParam(value ="采购提前期")
-    private String purchaseLeadTime;
-
-    @ApiParam(value ="制造提前期")
-    private String manufLeadTime;
-
-    @ApiParam(value ="配送提前期")
-    private String shipmentLeadTime;
-
-    @ApiParam(value ="单位采购量")
-    private Integer unitPurchase;
-
-    @ApiParam(value ="单位制造量")
-    private Integer unitManuf;
-
-    @ApiParam(value ="单位配送量")
-    private Integer unitShipment;
-}

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

@@ -38,6 +38,12 @@ public class ExportProject extends BaseAPS {
     @FieldAnnotation(relation = "Link", notEmpty = true)
     private Long linkId;
 
+    @ApiParam(value ="当前执行的明细序号")
+    private transient Integer curDetailNumber;
+
+    @ApiParam(value ="当前执行的明细名称")
+    private transient String curDetailName;
+
     public DataLink getLink() {
         return BeanRelation.get(this, EExportProject.Link);
     }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -42,5 +43,6 @@ public class HeuristicRule extends BaseRule {
 
     @Column(name="BATCH_PERIOD")
     @ApiParam(value ="组炉区间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String batchPeriod;
 }

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

@@ -37,6 +37,12 @@ public class ImportProject extends BaseAPS {
     @FieldAnnotation(relation = "Link", notEmpty = true)
     private Long linkId;
 
+    @ApiParam(value ="当前执行的明细序号")
+    private transient Integer curDetailNumber;
+
+    @ApiParam(value ="当前执行的明细名称")
+    private transient String curDetailName;
+
     public DataLink getLink() {
         return BeanRelation.get(this, EImportProject.Link);
     }

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

@@ -61,14 +61,17 @@ public class Material extends BaseAPS {
 
     @Column(name="PURCHASE_LEAD_TIME")
     @ApiParam(value ="采购提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String purchaseLeadTime;
 
     @Column(name="MANUF_LEAD_TIME")
     @ApiParam(value ="制造提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String manufLeadTime;
 
     @Column(name="SHIPMENT_LEAD_TIME")
     @ApiParam(value ="配送提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String shipmentLeadTime;
 
     @Column(name="UNIT_PURCHASE")
@@ -136,6 +139,7 @@ public class Material extends BaseAPS {
 
     @Column(name="ORDER_BATCH_PERIOD")
     @ApiParam(value ="订单合并期间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String orderBatchPeriod;
 
     @JsonBackReference

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

@@ -34,21 +34,24 @@ public class OperInput extends BaseAPS {
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
     private Long operationId;
 
-    @Column(name="MATERIAL_ID")
+    @Column(name="INPUT_MATERIAL_ID")
     @ApiParam(value ="物料")
-    @FieldAnnotation(relation = "Material", notEmpty = true)
+    @FieldAnnotation(relation = "InputMaterial", notEmpty = true)
-    private Long materialId;
+    private Long inputMaterialId;
 
     @Column(name="INPUT_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="单位输入量")
+    @FieldAnnotation(defaultValue = "1.0")
     private Double inputCount;
 
     @Column(name="YIELD", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="成品率")
+    @FieldAnnotation(defaultValue = "1.0")
     private Double yield;
 
     @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="固定报废数")
+    @FieldAnnotation(defaultValue = "0.0")
     private Double fixScrapCount;
 
     @Column(name="CONS_TYPE")
@@ -58,10 +61,12 @@ public class OperInput extends BaseAPS {
 
     @Column(name="MAX_SPACE_TIME")
     @ApiParam(value ="最大时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxSpaceTime;
 
     @Column(name="MIN_SPACE_TIME")
     @ApiParam(value ="最小时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
     public Operation getOperation() {
@@ -73,13 +78,13 @@ public class OperInput extends BaseAPS {
         BeanRelation.set(this, EOperInput.Operation, oper);
     }
 
-    public Material getMaterial() {
+    public Material getInputMaterial() {
-        return BeanRelation.get(this, EOperInput.Material);
+        return BeanRelation.get(this, EOperInput.InputMaterial);
     }
 
-    public void setMaterial(Material material) {
+    public void setInputMaterial(Material material) {
-        this.materialId = material != null ? material.getId() : 0l;
+        this.inputMaterialId = material != null ? material.getId() : 0l;
-        BeanRelation.set(this, EOperInput.Material, material);
+        BeanRelation.set(this, EOperInput.InputMaterial, material);
     }
 
     @JsonBackReference

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

@@ -33,21 +33,24 @@ public class OperOutput extends BaseAPS {
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
     private Long operationId;
 
-    @Column(name="MATERIAL_ID")
+    @Column(name="OUTPUT_MATERIAL_ID")
     @ApiParam(value ="物料")
     @FieldAnnotation(relation = "Material", notEmpty = true)
-    private Long materialId;
+    private Long outputMaterialId;
 
     @Column(name="OUTPUT_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="单位输出量")
+    @FieldAnnotation(defaultValue = "1.0")
     private Double outputCount;
 
     @Column(name="YIELD", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="成品率")
+    @FieldAnnotation(defaultValue = "1.0")
     private Double yield;
 
     @Column(name="FIX_SCRAP_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="固定报废数")
+    @FieldAnnotation(defaultValue = "0.0")
     private Double fixScrapCount;
 
     public Operation getOperation() {
@@ -59,13 +62,13 @@ public class OperOutput extends BaseAPS {
         BeanRelation.set(this, EOperOutput.Operation, oper);
     }
 
-    public Material getMaterial() {
+    public Material getOutputMaterial() {
-        return BeanRelation.get(this, EOperOutput.Material);
+        return BeanRelation.get(this, EOperOutput.OutputMaterial);
     }
 
-    public void setMaterial(Material material) {
+    public void setOutputMaterial(Material material) {
-        this.materialId = material != null ? material.getId() : 0l;
+        this.outputMaterialId = material != null ? material.getId() : 0l;
-        BeanRelation.set(this, EOperOutput.Material, material);
+        BeanRelation.set(this, EOperOutput.OutputMaterial, material);
     }
 
     @JsonBackReference

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

@@ -46,27 +46,32 @@ public class OperResource extends BaseAPS {
 
     @Column(name="PREV_TIME")
     @ApiParam(value ="前设置时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String prevTime;
 
     @Column(name="PRODUCE_TIME")
     @ApiParam(value ="生产时间")
-    @FieldAnnotation(notEmpty = true)
+    @FieldAnnotation(notEmpty = true, editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String produceTime;
 
     @Column(name="POST_TIME")
     @ApiParam(value ="后设置时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String postTime;
 
     @Column(name="MAX_PREV_SD_TIME")
     @ApiParam(value ="最大前设置中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxPrevSdTime;
 
     @Column(name="MAX_PRODUCE_SD_TIME")
     @ApiParam(value ="最大生产中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxProduceSdTime;
 
     @Column(name="MAX_POST_SD_TIME")
     @ApiParam(value ="最大后设置中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxPostSdTime;
 
     @Column(name="PRIORITY")

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

@@ -77,10 +77,12 @@ public class Operation extends BaseAPS {
 
     @Column(name="MAX_SPACE_TIME")
     @ApiParam(value ="最大时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxSpaceTime;
 
     @Column(name="MIN_SPACE_TIME")
     @ApiParam(value ="最小时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
     public ProductRouting getProductRouting() {

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EProductOrder;
 import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -51,6 +52,7 @@ public class ProductOrder extends BaseOrder {
 
     @Column(name="SPECIFY_ROUTING")
     @ApiParam(value ="指定工艺路线")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting")
     private String specifyRouting;
 
     @Column(name="RECALC_COUNT")
@@ -72,6 +74,7 @@ public class ProductOrder extends BaseOrder {
 
     @Column(name="SPECIFY_LEAD_TIME")
     @ApiParam(value ="指定提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String specifyLeadTime;
 
     @Column(name="CALC_LEAD_TIME")

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -40,6 +41,7 @@ public class PurchaseOrder extends BaseOrder {
 
     @Column(name="SPECIFY_LEAD_TIME")
     @ApiParam(value ="指定提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String specifyLeadTime;
 
     @Column(name="CALC_LEAD_TIME")

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

@@ -60,10 +60,12 @@ public class Resource extends BaseAPS {
 
     @Column(name="PREV_BUFFER")
     @ApiParam(value ="前缓冲时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String prevBuffer;
 
     @Column(name="POST_BUFFER")
     @ApiParam(value ="后缓冲时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String postBuffer;
 
     @Column(name="MAX_PRODUCE_BATCH", columnDefinition = "decimal(18,8)")
@@ -80,14 +82,17 @@ public class Resource extends BaseAPS {
 
     @Column(name="MAX_PREV_SD_TIME")
     @ApiParam(value ="最大前设置中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxPrevSdTime;
 
     @Column(name="MAX_PRODUCE_SD_TIME")
     @ApiParam(value ="最大生产中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxProduceSdTime;
 
     @Column(name="MAX_POST_SD_TIME")
     @ApiParam(value ="最大后设置中断时间")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxPostSdTime;
 
     @Column(name="ROUND_TYPE")
@@ -117,6 +122,7 @@ public class Resource extends BaseAPS {
 
     @Column(name="LOCK_TIME")
     @ApiParam(value ="锁定时间长度")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String lockTime;
 
     @JsonBackReference

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

@@ -37,6 +37,12 @@ public class RuleGroup extends BaseAPS {
     @ApiParam(value ="序号")
     private Integer orderNumber;
 
+    @ApiParam(value ="当前执行的规则序号")
+    private transient Integer curDetailNumber;
+
+    @ApiParam(value ="当前执行的规则名称")
+    private transient String curDetailName;
+
     @JsonBackReference
     public List<RuleDetail> getDetails() { return BeanRelation.list(this, ERuleGroup.Details); }
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -41,6 +42,7 @@ public class SalesOrder extends BaseOrder {
 
     @Column(name="SPECIFY_LEAD_TIME")
     @ApiParam(value ="指定提前期")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String specifyLeadTime;
 
     @Column(name="CALC_LEAD_TIME")

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

@@ -211,7 +211,12 @@ public class BeanInfo {
     }
 
     public static Set<Class<? extends BaseBean>> getBeanClasses() {
-        return beanInfos.keySet();
+        Set<Class<? extends BaseBean>> beanClasses = new HashSet<>();
+        for (Map.Entry<Class<? extends BaseBean>, BeanInfo> entry : beanInfos.entrySet()) {
+            beanClasses.add(entry.getKey());
+        }
+
+        return beanClasses;
     }
 
     public static BeanInfo getBeanInfo(Class<? extends BaseBean> cls) {
@@ -234,9 +239,9 @@ public class BeanInfo {
 
     public static List<Class<? extends BaseBean>> getChildClasses(Class<? extends BaseBean> cls) {
         List<Class<? extends BaseBean>> beanClasses = new ArrayList<>();
-        List<BeanInfo> beanInfos = getBeanInfo(cls).childsBeanInfos;
+        List<BeanInfo> childBeanInfos = getBeanInfo(cls).childsBeanInfos;
-        for (BeanInfo beanInfo : beanInfos) {
+        for (BeanInfo childBeanInfo : childBeanInfos) {
-            beanClasses.add(beanInfo.getBeanClass());
+            beanClasses.add(childBeanInfo.getBeanClass());
         }
         return beanClasses;
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
+import org.springframework.util.StringUtils;
 
 import java.io.IOException;
 import java.text.ParseException;
@@ -15,10 +16,12 @@ public class CustomDateDeserializer extends JsonDeserializer<Date> {
 
     @Override
     public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) throws IOException, JsonProcessingException {
-        try {
+        String text = jsonParser.getText();
-            return DATETIME_FORMATOR.parse(jsonParser.getText());
+        if (!StringUtils.isEmpty(text)) {
-        } catch (ParseException e) {
+            try {
-            e.printStackTrace();
+                return DATETIME_FORMATOR.parse(text);
+            } catch (ParseException e) {
+            }
         }
         return null;
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java

@@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
 
 public enum EOperInput {
     Operation,
-    Material,
+    InputMaterial,
     WorkInputs
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java

@@ -2,6 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
 
 public enum EOperOutput {
     Operation,
-    Material,
+    OutputMaterial,
     WorkOutputs
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/APSPager.java

@@ -40,4 +40,5 @@ public class APSPager extends Pager {
     }
     private String filter;
     private List<SortData> sorts;
+    private String query;
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleGroupProgress.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.aps.model;
+
+import lombok.Data;
+
+/**
+ * @Description : 进度条显示信息。
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-01-21
+ * @Modify:
+ **/
+@Data
+public class RuleGroupProgress {
+    private String message;
+    private Long progress;
+}

modules/i3plus-pojo-aps/src/main/resources/relations/OperInput.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="OperInput">
-    <Relation field="Material" name="Material" reverse="OperInputs" type="MULTI_TO_ONE" owner="false">
+    <Relation field="InputMaterial" name="Material" reverse="OperInputs" type="MULTI_TO_ONE" owner="false">
     </Relation>
 </Class>

modules/i3plus-pojo-aps/src/main/resources/relations/OperOutput.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="OperOutput">
-    <Relation field="Material" name="Material" reverse="OperOutputs" type="MULTI_TO_ONE" owner="false">
+    <Relation field="OutputMaterial" name="Material" reverse="OperOutputs" type="MULTI_TO_ONE" owner="false">
     </Relation>
 </Class>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -62,7 +62,7 @@ public abstract class BaseBean implements Serializable {
         this.id = id;
     }
 
-    @Column(name="ORGANIZE_CODE")
+    @Column(name="ORGANIZE_CODE", nullable = false)
     @ApiParam(value ="组织代码")
     @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 2)
 //    @AnnoOutputColumn(hidden = true)

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java

@@ -333,7 +333,7 @@ public class ApsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RESOURCE_LOCK_TYPE {
-        NONE("NONE", "不锁定"),       //
+        NONE("NONE", "不锁定"),
         PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"),
         PRODUCE_END("PRODUCE_END", "后工序生产结束时刻");
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -50,14 +50,14 @@ public class MesEnumUtil {
      * JIS发运模式类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_JIS_PATTERN_TYPE {
+    public enum JIS_PATTERN_TYPE {
         ONE_PROD(10, "单产品发运"),
         MANY_PROD(20, "多产品发运");
 
         private int value;
         private String description;
 
-        MES_JIS_PATTERN_TYPE(int value, String description) {
+        JIS_PATTERN_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -3379,7 +3379,8 @@ public class MesEnumUtil {
         TASK_COMPLETE("taskComplete", "整个扫描完成"),
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
         RUNNING_INFO("runningInfo", "执行信息"),
-        STOP_PCS_CTL("stopPcsCtl", "停止监控");
+        STOP_PCS_CTL("stopPcsCtl", "停止监控"),
+        RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
 
 
         private String value;
@@ -3419,7 +3420,8 @@ public class MesEnumUtil {
         EXP_TEXT("exp_text", "异常文本"),
         FILE("file", "定制内容文件"),
         IMAGE("image", "图片"),
-        BUTTON("button", "按钮");
+        BUTTON("button", "按钮"),
+        TABLES("tables", "多个表格");
 
         private String value;
         private String description;
@@ -4021,9 +4023,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_TASK_OBJECT_TYPE {
 
-        PLC(10, "PLC"),
+        PLC(10, "PLC");
-        DB(20, "DB"),
+//        DB(20, "DB");
-        OTHER(30, "其他");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -16,49 +16,14 @@ public class MesPcnEnumUtil {
      * JIS发运模式类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_JIS_PATTERN_TYPE {
+    public enum JIS_PATTERN_TYPE {
         ONE_PROD(10, "单产品发运"),
         MANY_PROD(20, "多产品发运");
 
         private int value;
         private String description;
 
-        MES_JIS_PATTERN_TYPE(int value, String description) {
+        JIS_PATTERN_TYPE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
-     * JIS发运是否按主队列顺序扫描
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_JIS_SCAN_TYPE {
-        TRUE(10, "是"),
-        FALSE(20, "否");
-
-        private int value;
-        private String description;
-
-        MES_JIS_SCAN_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -86,7 +51,7 @@ public class MesPcnEnumUtil {
      * JIS发运队列状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_QUEUE_JIS_STATUS {
+    public enum JIS_QUEUE_STATUS {
 
         TRUE(10, "已发运"),
         FALSE(20, "未发运");
@@ -94,7 +59,7 @@ public class MesPcnEnumUtil {
         private int value;
         private String description;
 
-        MES_QUEUE_JIS_STATUS(int value, String description) {
+        JIS_QUEUE_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1770,8 +1735,8 @@ public class MesPcnEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单"),
+        BH_ORDER(40, "B&H工单");
-        JIT_ORDER(50, "JIT工单");
+//        JIT_ORDER(50, "JIT工单");
 
         private int value;
         private String description;
@@ -2476,9 +2441,9 @@ public class MesPcnEnumUtil {
         TASK_COMPLETE("taskComplete", "整个扫描完成"),
         STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"),
         RUNNING_INFO("runningInfo", "执行信息"),
+        STOP_PCS_CTL("stopPcsCtl", "停止监控"),
         RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean");
 
-
         private String value;
         private String description;
 
@@ -2516,7 +2481,8 @@ public class MesPcnEnumUtil {
         EXP_TEXT("exp_text", "异常文本"),
         FILE("file", "定制内容文件"),
         IMAGE("image", "图片"),
-        BUTTON("button", "按钮");
+        BUTTON("button", "按钮"),
+        TABLES("tables", "多个表格");
 
         private String value;
         private String description;
@@ -2694,9 +2660,8 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MONITOR_TASK_OBJECT_TYPE {
 
-        PLC(10, "PLC"),
+        PLC(10, "PLC");
-        DB(20, "DB"),
+//        DB(20, "DB");
-        OTHER(30, "其他");
 
         private int value;
         private String description;
@@ -2805,4 +2770,40 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 质量状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PASS_FAIL {
+
+        PASS(1, "合格"),
+        FAIL(2, "不合格");
+
+        private int value;
+        private String description;
+
+        PASS_FAIL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -174,6 +174,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 主表信息 单据类型
      */
@@ -700,9 +701,9 @@ public class WmsEnumUtil {
         KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
         KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
         FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
-        KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
+        KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
-        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"),
+        PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
-        UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用");
+        UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用");
 
         private int value;
         private String code;
@@ -897,7 +898,7 @@ public class WmsEnumUtil {
         VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
         VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
         KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
-        UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用");
+        UTENSIL_CONSUMING("UTENSIL_CONSUMING", "器具领用");
         private String value;
         private String description;
 
@@ -1037,7 +1038,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        SCRAP(70,"报废"),
+        SCRAP(70, "报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -1470,6 +1471,7 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * 库存移动单状态状态:10=新建,20=已处理,30=处理出错
      */
@@ -2936,64 +2938,56 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum IMPORT_ORDER_TYPE {
-        PO("PO", "要货计划"),
+        PO("1", "PO", "要货计划"),
-        ASN("ASN", "ASN"),
+        ASN("2", "ASN", "ASN"),
-        INSTRUCTIONS("INSTRUCTIONS", "指令"),
+        INSTRUCTIONS("3", "INSTRUCTIONS", "指令"),
-        SCATTERED_OUT("C00", "零星出库指令"),
+        SCATTERED_OUT("C00", "C00", "零星出库指令"),
-        SCATTERED_INT("C01", "零星入指令"),
+        SCATTERED_INT("C01", "C01", "零星入指令"),
-        NC_DISMANTLING_PICKING("C02", "NC拆解领料"),
+        NC_DISMANTLING_PICKING("C02", "C02", "NC拆解领料"),
-        NC_DISMANTLING_RETURN("C03", "NC拆解退料"),
+        NC_DISMANTLING_RETURN("C03", "C03", "NC拆解退料"),
-        NC_SCRAPPED("C04", "NC报废指令"),
+        NC_SCRAPPED("C04", "C04", "NC报废指令"),
-        NOT_JIS("NOTJIS", "非JIS指令"),
+        NOT_JIS("NOTJIS", "NOTJIS", "非JIS指令"),
-        STOCK_DUMP("D00", "库存转储指令"),
+        STOCK_DUMP("D00", "D00", "库存转储指令"),
-        NC_INSTOCK("D01", "NC入库指令"),
+        NC_INSTOCK("D01", "D01", "NC入库指令"),
-        SMRR("B00", "SMRR退货"),
+        SMRR("B00", "B00", "SMRR退货"),
-        DMR("B01", "DMR退货"),
+        DMR("B01", "B01", "DMR退货"),
-        OUT_SOURCING("A00", "委外发料指令"),
+        OUT_SOURCING("A00", "A00", "委外发料指令"),
-        OUT_REBACK("A01", "委外退料指令"),
+        OUT_REBACK("A01", "A01", "委外退料指令"),
-        OUT_RETURN_SOURCING("A02", "委外返工发料指令"),
+        OUT_RETURN_SOURCING("A02", "A02", "委外返工发料指令"),
-        OUT_RETURN_("A03", "委外返工退料指令"),
+        OUT_RETURN_("A03", "A03", "委外返工退料指令"),
-        SALES_RETURN_REBACK("SALES_RETURN", "销售退货指令"),
+        SALES_RETURN_REBACK("SALES_RETURN", "SALES_RETURN", "销售退货指令"),
-        CS("CS", "盘点指令"),
+        CS("CS", "CS", "盘点指令"),
-        CS_ADUJUST("CS_ADUJUST", "盘点调差指令");
+        CS_ADUJUST("CS_ADUJUST", "CS_ADUJUST", "盘点调差指令");
         private String value;
+        private String code;
         private String description;
 
-        IMPORT_ORDER_TYPE(String value, String description) {
+        IMPORT_ORDER_TYPE(String value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
-        public String getDescription() {
+        public String getValue() {
-            return description;
+            return value;
         }
 
         public String getCode() {
-            return value;
+            return code;
         }
 
-        public String getValue() {
+        public String getDescription() {
-            return value;
+            return description;
         }
 
-        public static IMPORT_ORDER_TYPE codeOf(String value) {
+        public static IMPORT_ORDER_TYPE codeOf(String code) {
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(value)) {
+                if (values()[i].code.equals(code)) {
                     return values()[i];
                 }
             }
             return null;
         }
-
-        public static String getDes(String val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     /**
@@ -3083,7 +3077,6 @@ public class WmsEnumUtil {
     }
 
 
-
     /**
      * 任务数据来源：检查子数据
      */
@@ -3496,7 +3489,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WMS_STOCK_TYPE {
-        SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"),CUST_SN(30, "客户条码");
+        SOURCE(10, "实物条码"), TARGET(20, "虚拟条码"), CUST_SN(30, "客户条码");
 
         private int value;
         private String description;
@@ -4488,8 +4481,8 @@ public class WmsEnumUtil {
         WAIT_RECEIVING(10, "待收货"),
         RECEIVING(20, "收货中"),
         COMPLETE_RECEIVING(30, "收货完成"),
-        CLOSE(40,"已关闭"),
+        CLOSE(40, "已关闭"),
-        CANCEL(50,"已取消"),
+        CANCEL(50, "已取消"),
         UN_RECEIVED(60, "延迟未收货");
 
         private int value;
@@ -4580,9 +4573,9 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_ORDER_MASTER_STATUS {
-        CREATE(10,"CREATE", "创建"),
+        CREATE(10, "CREATE", "创建"),
-        PLANNED(20,"PLANNED", "已计划"),
+        PLANNED(20, "PLANNED", "已计划"),
-        CLOSE(30,"CLOSE", "已关闭");
+        CLOSE(30, "CLOSE", "已关闭");
 
         private int value;
         private String code;
@@ -4668,8 +4661,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PULL_TASK_DETAILS_STATUS {
-        BE_HANDLE(10,"BE_HANDLE", "待处理"),
+        BE_HANDLE(10, "BE_HANDLE", "待处理"),
-        CANCELLATION(20,"CANCELLATION", "已处理");
+        CANCELLATION(20, "CANCELLATION", "已处理");
 
         private int value;
         private String code;
@@ -4720,10 +4713,10 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PULL_TASK_MASTER_STATUS {
-        CREATE(10,"CREATE", "创建"),
+        CREATE(10, "CREATE", "创建"),
-        ENABLED(20,"ENABLED", "已启动"),
+        ENABLED(20, "ENABLED", "已启动"),
-        COMPLETE(30,"COMPLETE", "已完成"),
+        COMPLETE(30, "COMPLETE", "已完成"),
-        CLOSE(40,"CLOSE", "已关闭");
+        CLOSE(40, "CLOSE", "已关闭");
 
         private int value;
         private String code;
@@ -4804,8 +4797,8 @@ public class WmsEnumUtil {
     }
 
     /**
-     *  WEB页面字段类型
+     * WEB页面字段类型
-     *  10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
+     * 10-文本类型，20-数字类型，30-下拉框类型，40，时间类型，50-开窗查询类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum FIELD_TYPE {
@@ -4881,7 +4874,7 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum GROUP_COMMIT_MODE {
-        JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"),REF_GROUP(30, 30, "关联分组号提交");
+        JUST_CURRENT(10, 10, "只提交当前移动单"), REF_SRC(20, 20, "关联单据提交"), REF_GROUP(30, 30, "关联分组号提交");
 
         private int value;
         private int code;
@@ -4952,4 +4945,42 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 领料看板执行状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PICKING_EXECUTE_STATUS {
+        IN_PROGRESS(1, "执行中"), EXPIRED(2, "已超期"), NORMAL(3, "正常");
+
+        private int value;
+        private String description;
+
+        PICKING_EXECUTE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfDismantleRecord.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -27,8 +28,9 @@ import java.math.BigDecimal;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "IF_DISMENTLE_RECORD")
 @Api("物料拆解表")
-public class IfDismantleRecord extends BaseBean {
+public class IfDismantleRecord extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -6010207359066736962L;
     @Column(name = "DISMANTLE_ID")
     @ApiParam("拆解编号")
     private String dismantleId;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfPackageDetail.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,8 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "IF_PACKAGE_DETAIL")
 @Api("包装明细表")
-public class IfPackageDetail extends BaseBean {
+public class IfPackageDetail extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -1873101288426218272L;
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/IfProductOffLine.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,8 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "IF_PRODUCT_OFF_LINE")
 @Api("生产报工表")
-public class IfProductOffLine extends BaseBean {
+public class IfProductOffLine extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 200629529131241418L;
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesAction.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes系统业务动作
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_ACTION")
 @Api("mes系统业务动作")
-public class MesAction extends BaseBean {
+public class MesAction extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -6451213228967727835L;
     @Column(name = "ACTION_CODE")
     @ApiParam("动作代码")
     private String actionCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionIf.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,8 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_ACTION_IF")
 @Api("动作接口配置")
-public class MesActionIf extends BaseBean {
+public class MesActionIf extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -5058215339453766620L;
     @Column(name = "ACTION_CODE")
     @ApiParam("动作代码")
     private String actionCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesActionMethod.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes系统业务动作方法
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_ACTION_METHOD")
 @Api("系统业务动作方法")
-public class MesActionMethod extends BaseBean {
+public class MesActionMethod extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 6249418690993577108L;
     @Column(name = "ACTION_CODE")
     @ApiParam("动作代码")
     private String actionCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesArea.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :生产区域
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_AREA")
 @Api("生产区域")
-public class MesArea extends BaseBean {
+public class MesArea extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1047604067591557689L;
     @Column(name = "AREA_CODE")
     @ApiParam("区域代码")
     private String areaCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesBom.java

@@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :BOM清单
@@ -29,7 +30,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_BOM")
 @Api("BOM清单")
-public class MesBom extends BaseBean {
+public class MesBom extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1772273641263268564L;
     @Column(name = "PART_NO")
     @ApiParam("父零件号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java

@@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Version;
+import java.io.Serializable;
 
 /**
  * @Description :工位投料信息
@@ -27,7 +29,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_CELL_FEED")
 @Api("工位投料信息")
-public class MesCellFeed extends BaseBean {
+public class MesCellFeed extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 2412657464618960515L;
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;
@@ -64,6 +67,11 @@ public class MesCellFeed extends BaseBean {
     @ApiParam("供应商代码")
     private String supplierCode;
 
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public  Integer lockVersion;
+
     public double getRawQtyVal() {
         return this.rawQty == null ? 0l : this.rawQty;
     }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesConfig.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :配置表
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_CONFIG")
 @Api("mes配置表")
-public class MesConfig extends BaseBean {
+public class MesConfig extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5759669472714287000L;
     @Column(name = "CFG_CODE")
     @ApiParam("配置代码")
     private String cfgCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustProdLine.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes系统业务动作
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_CUST_PROD_LINE")
 @Api("客户产线代码")
-public class MesCustProdLine extends BaseBean {
+public class MesCustProdLine extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 3049432665592161513L;
     @Column(name = "CUST_PROD_LINE_CODE")
     @ApiParam("客户产线代码")
     private String custProdLineCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomer.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes客户表
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_CUSTOMER")
 @Api("客户信息")
-public class MesCustomer extends BaseBean {
+public class MesCustomer extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 167635887082538926L;
     @Column(name = "CUSTOMER_CODE")
     @ApiParam("客户代码")
     private String customerCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCustomerPart.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes客户表
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_CUSTOMER_PART")
 @Api("客户零件关系")
-public class MesCustomerPart extends BaseBean {
+public class MesCustomerPart extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -4731252848471949263L;
     @Column(name = "CUSTOMER_CODE")
     @ApiParam("客户代码")
     private String customerCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDataObject.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -25,8 +26,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_DATA_OBJECT")
 @Api("数据对象")
-public class MesDataObject extends BaseBean {
+public class MesDataObject extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -1419262751765770535L;
     @Column(name = "OBJECT_CODE")
     @ApiParam("对象代码")
     private String objectCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDatasource.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -25,8 +26,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_DATASOURCE")
 @Api("地址清单")
-public class MesDatasource extends BaseBean {
+public class MesDatasource extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -7387559860198655900L;
     @Column(name = "DS_CODE")
     @ApiParam("数据源代码")
     private String dsCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefect.java

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -28,8 +29,9 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_DEFECT")
 @Api("缺陷表")
-public class MesDefect extends BaseBean {
+public class MesDefect extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -6771813937279359333L;
     @Column(name = "DEFECT_CODE")
     @ApiParam("缺陷代码")
     private String defectCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectCause.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,8 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_DEFECT_CAUSE")
 @Api("缺陷原因表")
-public class MesDefectCause extends BaseBean {
+public class MesDefectCause extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -3867250593038812861L;
     @Column(name = "DC_CODE")
     @ApiParam("缺陷原因代码")
     private String dcCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -28,7 +29,8 @@ import java.util.List;
         @Index(columnList = "CREATE_DATE_TIME")
 })
 @Api("不良信息记录表")
-public class MesDefectRecord extends BaseBean {
+public class MesDefectRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -2828208776424343584L;
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -28,8 +29,9 @@ import java.math.BigDecimal;
         @Index(columnList = "CREATE_DATE_TIME")
 })
 @Api("物料拆解记录表")
-public class MesDismantleRecord extends BaseBean {
+public class MesDismantleRecord extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -7924346039878218038L;
     @Column(name = "DISMANTLE_ID")
     @ApiParam("拆解编号")
     private String dismantleId;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEquipment.java

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description :生产设备
@@ -30,7 +31,8 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_EQUIPMENT")
 @Api("生产设备")
-public class MesEquipment extends BaseBean {
+public class MesEquipment extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 7269069290035250108L;
     @Column(name = "EQUIPMENT_CODE")
     @ApiParam("设备代码")
     private String equipmentCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEsop.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -26,8 +27,9 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_ESOP")
 @Api("作业指导书信息表(ODS)")
-public class MesEsop extends BaseBean {
+public class MesEsop extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -4869646502033099294L;
     @Column(name = "PART_NO")
     @ApiParam("零件号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEvent.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes系统业务事件
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_EVENT")
 @Api("系统业务事件")
-public class MesEvent extends BaseBean {
+public class MesEvent extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -5604724665202938464L;
     @Column(name = "EVENT_CODE")
     @ApiParam("事件代码")
     private String eventCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesEventAction.java

@@ -14,6 +14,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes系统业务事件动作
@@ -31,7 +32,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_EVENT_ACTION")
 @Api("系统业务事件动作")
-public class MesEventAction extends BaseBean {
+public class MesEventAction extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 3964084375279916831L;
     @Column(name = "EVENT_CODE")
     @ApiParam("事件代码")
     private String eventCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFiCfg.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -25,8 +26,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FI_CFG")
 @Api("首检件配置")
-public class MesFiCfg extends BaseBean {
+public class MesFiCfg extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 1791614973371037158L;
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("产线")
     private String workCenterCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesFile.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -25,8 +26,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_FILE")
 @Api("文件表")
-public class MesFile extends BaseBean {
+public class MesFile extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 7017379708394714424L;
     @Column(name = "FILE_NAME")
     @ApiParam("文件名称")
     private String fileName;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpData.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description :物料关键数据
@@ -28,7 +29,8 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_KP_DATA")
 @Api("生产区域")
-public class MesKpData extends BaseBean {
+public class MesKpData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3332582267186642790L;
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesKpsnRule.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,7 +27,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_KPSN_RULE")
 @Api("关键件条码校验规则")
-public class MesKpsnRule extends BaseBean {
+public class MesKpsnRule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8238308232531730720L;
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -25,9 +26,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_LABEL_TEMPLATE")
 @Api(value = "打印模板", description = "打印模板")
-public class MesLabelTemplate extends BaseBean {
+public class MesLabelTemplate extends BaseBean implements Serializable {
 
-    private static final long serialVersionUID = 5371856566557305323L;
+
+    private static final long serialVersionUID = 3797103812377146878L;
     @Column(name = "TEMPLATE_CODE")
     @ApiParam(value = "模板代码")
     private String templateCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Description : 打印模板参数
@@ -26,9 +27,9 @@ import javax.persistence.*;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_LABEL_TEMPLATE_PARAM")
 @Api(value = "打印模板参数", description = "打印模板参数")
-public class MesLabelTemplateParam extends BaseBean {
+public class MesLabelTemplateParam extends BaseBean implements Serializable {
 
-    private static final long serialVersionUID = 6476163540527157643L;
+    private static final long serialVersionUID = -3595706874099358555L;
     @Column(name = "TEMPLATE_ID")
     @ApiParam(value = "模板ID", access = "模板ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMethod.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes系统业务方法
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_METHOD")
 @Api("系统业务方法")
-public class MesMethod extends BaseBean {
+public class MesMethod extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3629909409034083767L;
     @Column(name = "METHOD_CODE")
     @ApiParam("方法代码")
     private String methodCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :
@@ -25,8 +26,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_MONITOR_TASK")
 @Api("监听任务")
-public class MesMonitorTask extends BaseBean {
+public class MesMonitorTask extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -8614480099840448294L;
     @Column(name = "TASK_NO")
     @ApiParam("任务编号")
     private String taskNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTaskDetail.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :
@@ -25,8 +26,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_MONITOR_TASK_DETAIL")
 @Api("监听任务明细")
-public class MesMonitorTaskDetail extends BaseBean {
+public class MesMonitorTaskDetail extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -4811270359386960747L;
     @Column(name = "TASK_NO")
     @ApiParam("任务编号")
     private String taskNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberRule.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -26,8 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_NUMBER_RULE")
 @Api("条码生成规则")
-public class MesNumberRule extends BaseBean {
+public class MesNumberRule extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -4039194855353751178L;
     @Column(name = "RULE_CODE")
     @ApiParam("规则代码")
     private String ruleCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesNumberSerialno.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -25,8 +26,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_NUMBER_SERIALNO")
 @Api("编码序号")
-public class MesNumberSerialno extends BaseBean {
+public class MesNumberSerialno extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -3024166851634742872L;
     @Column(name = "CURRENT_NUMBER_PREFIX")
     @ApiParam("当前编号前缀")
     private String currentNumberPrefix;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -25,8 +26,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_OBJECT_CFG")
 @Api("对象结构")
-public class MesObjectCfg extends BaseBean {
+public class MesObjectCfg extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -3640782210450491835L;
     @Column(name = "OBJECT_CODE")
     @ApiParam("对象代码")
     private String objectCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPLCConfigure.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :PLC设备信息配置表
@@ -28,7 +29,8 @@ import javax.persistence.Table;
 @Table(name = "MES_PLC_CONFIGURE")
 @Api("PLC设备信息配置表")
 @Deprecated
-public class MesPLCConfigure extends BaseBean {
+public class MesPLCConfigure extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8274445475806774L;
     @Column(name = "IP")
     @ApiParam("设备ip")
     private String ipAddress;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackSpec.java

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :包装规格
@@ -28,7 +29,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PACK_SPEC")
 @Api("包装规格")
-public class MesPackSpec extends BaseBean {
+public class MesPackSpec extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -788654193624068327L;
     @Column(name = "SPEC_CODE")
     @ApiParam("包装规格代码")
     private String specCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -21,10 +22,15 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
+@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
+    }
+)
 @Api("包装规格")
-public class MesPackage extends BaseBean {
+public class MesPackage extends BaseBean implements Serializable {
-    @Column(name = "PACKAGE_NO")
+    private static final long serialVersionUID = 2292859018089339608L;
+    @Column(name = "PACKAGE_NO", nullable = false)
     @ApiParam("包装编号")
     private String packageNo;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.java

@@ -9,10 +9,8 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
+import java.io.Serializable;
-import javax.persistence.Index;
-import javax.persistence.Table;
 
 /**
  * @Author: Wynne.Lu
@@ -24,15 +22,20 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
+@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
+    }
+)
 @Api("包装规格明细")
-public class MesPackageDetail extends BaseBean {
+public class MesPackageDetail extends BaseBean implements Serializable {
 
-    @Column(name = "PACKAGE_NO")
+    private static final long serialVersionUID = 8162606304720621672L;
+    @Column(name = "PACKAGE_NO", nullable = false)
     @ApiParam("包装编码")
     private String packageNo;
 
-    @Column(name = "SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER", nullable = false)
     @ApiParam("过程条码")
     private String serialNumber;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -26,8 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装履历表")
-public class MesPackageTravel extends BaseBean {
+public class MesPackageTravel extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -2808747095415676213L;
     @Column(name = "PACKAGE_NO")
     @ApiParam("包装编码")
     private String packageNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPart.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description :物料信息
@@ -28,7 +29,8 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PART")
 @Api("物料信息")
-public class MesPart extends BaseBean {
+public class MesPart extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 3936033255397936854L;
     @Column(name = "PART_NO")
     @ApiParam("零件号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPartCategory.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :零件种类
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PART_CATEGORY")
 @Api("零件种类")
-public class MesPartCategory extends BaseBean {
+public class MesPartCategory extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 9076081904146489470L;
     @Column(name = "CATEGORY_CODE")
     @ApiParam("分类代码")
     private String categoryCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :JIS发运模式
@@ -28,8 +29,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PATTERN_JIS")
 @Api("JIS发运模式")
-public class MesPatternJis extends BaseBean {
+public class MesPatternJis extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 1119289554542499312L;
     @Column(name = "PATTERN_NO")
     @ApiParam("模式编号")
     private String patternNo;
@@ -38,29 +40,29 @@ public class MesPatternJis extends BaseBean {
     @ApiParam("模式名称")
     private String patternName;
 
-    @Lob
+    @Column(name = "QUEUE_NO")
-    @Column(name = "RULE")
+    @ApiParam("显示主队列数")
-    @ApiParam("规则")
+    private Integer queueNo;
-    private String rule;
+
+    @Column(name = "HANDLE_NO")
+    @ApiParam("一次处理套数")
+    private Integer handleNo;
 
     @Column(name = "PATTERN_DESC")
     @ApiParam("描述")
     private String patternDesc;
 
-    @Column(name = "TOP_NO")
+    @Column(name = "PRODUCE_CTGY_CODE")
-    @ApiParam("一次显示TOP数")
+    @ApiParam("产品类型组")
-    private Integer topNo;
+    private String produceCategoryCode;
-
-    @Column(name = "HANDLE_NO")
-    @ApiParam("一次处理套数")
-    private Integer handleNo;
 
     @Column(name = "PATTERN_TYPE")
     @ApiParam("模式类型")
     private Integer patternType;
 
-    @Column(name = "SCAN_TYPE")
+    @Lob
-    @ApiParam("是否按主队列顺序扫描")
+    @Column(name = "RULE")
-    private Integer scanType;
+    @ApiParam("规则")
+    private String rule;
 
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcn.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,7 +27,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PCN")
 @Api("PCN节点")
-public class MesPcn extends BaseBean {
+public class MesPcn extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7570827672640277097L;
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnConnectLog.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,7 +27,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PCN_CONNECT_LOG")
 @Api("PCN节点连接日志")
-public class MesPcnConnectLog extends BaseBean {
+public class MesPcnConnectLog extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -4153357131289178766L;
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncCfg.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PCN_SYNC_CFG")
 @Api("MES_PCN_同步配置")
-public class MesPcnSyncCfg extends BaseBean {
+public class MesPcnSyncCfg extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -6869288362923390521L;
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,7 +27,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PCN_SYNC_ERRORLOG")
 @Api("MES_PCN同步异常日志")
-public class MesPcnSyncErrorLog extends BaseBean {
+public class MesPcnSyncErrorLog extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -2249754641660006488L;
     @Column(name = "PCN_CODE")
     @ApiParam("PCN代码")
     private String pcnCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSysUserOffline.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -27,8 +28,9 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PCN_SYS_USER_OFFLINE")
 @Api(value = "账号离线登陆表", description = "账号离线登陆表。")
-public class MesPcnSysUserOffline extends BaseBean {
+public class MesPcnSysUserOffline extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 7617353154826718154L;
     @Column(name = "USER_ID")
     @ApiParam(value = "人员ID", example = "-1")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes-pcn定时任务工作清单
@@ -27,8 +28,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PCN_TASK")
 @Api("mes-pcn定时任务工作清单")
-public class MesPcnTask extends BaseBean {
+public class MesPcnTask extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 4777357978430670966L;
     @Column(name = "TASK_CODE")
     @ApiParam("任务代码")
     private String taskCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTaskLog.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes-pcn定时任务工作清单同步记录
@@ -27,8 +28,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PCN_TASK_LOG")
 @Api("mes-pcn定时任务工作清单同步记录")
-public class MesPcnTaskLog extends BaseBean {
+public class MesPcnTaskLog extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -784806389462540310L;
     @Column(name = "SYNC_TIME_START")
     @ApiParam("同步数据开始时间")
     private String syncTimeStart;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlanOrder.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -23,10 +24,15 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
+@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
+    }
+)
 @Api("生产主计划")
-public class MesPlanOrder extends BaseBean {
+public class MesPlanOrder extends BaseBean implements Serializable {
-    @Column(name = "ORDER_NO")
+    private static final long serialVersionUID = 8571104279843276872L;
+    @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("生产计划单号")
     private String orderNo;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -26,8 +27,9 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PLC")
 @Api("PLC配置表")
-public class MesPlc extends BaseBean {
+public class MesPlc extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -5346536604317095818L;
     @Column(name = "PLC_CODE")
     @ApiParam("PLC代码")
     private String plcCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProcess.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :工序
@@ -26,7 +27,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PROCESS")
 @Api("工序")
-public class MesProcess extends BaseBean {
+public class MesProcess extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -2619648674238082872L;
     @Column(name = "PROCESS_CODE")
     @ApiParam("工序代码")
     private String processCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Description :产品绑定记录表
@@ -28,7 +29,8 @@ import javax.persistence.*;
         @Index(columnList = "KP_SN")
 })
 @Api("产品绑定记录表")
-public class MesProdBindRecord extends BaseBean {
+public class MesProdBindRecord extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -4319604821328717354L;
     @Column(name = "SERIAL_NUMBER")
     @ApiParam(value = "产品条码")
     private String serialNumber;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfg.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :产品配置
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PROD_CFG")
 @Api("产品配置")
-public class MesProdCfg extends BaseBean {
+public class MesProdCfg extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 7487874316722319947L;
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("产品配置代码")
     private String prodCfgCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdCfgDetail.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description :产品配置明细
@@ -28,7 +29,8 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PROD_CFG_DETAIL")
 @Api("产品配置明细")
-public class MesProdCfgDetail extends BaseBean {
+public class MesProdCfgDetail extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8362302529703401583L;
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("产品配置代码")
     private String prodCfgCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdPack.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Author: Wynne.Lu
@@ -25,8 +26,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PROD_PACK")
 @Api("产品包装关系")
-public class MesProdPack extends BaseBean {
+public class MesProdPack extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -2621135811864108025L;
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :产品类流程配置表
@@ -26,7 +27,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PROD_ROUTE_CFG")
 @Api("产品类流程配置表")
-public class MesProdRouteCfg extends BaseBean {
+public class MesProdRouteCfg extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3768632071281056796L;
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteOptParam.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :产品流程配置操作参数表
@@ -26,7 +27,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PROD_ROUTE_OPT_PARAM")
 @Api("产品流程配置操作参数表")
-public class MesProdRouteOptParam extends BaseBean {
+public class MesProdRouteOptParam extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -932364659894292000L;
     @Column(name = "PROD_ROUTE_CFG_ID")
     @ApiParam("产品流程ID")
     private Long prodRouteCfgId;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCategory.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -26,8 +27,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PRODUCE_CATEGORY")
 @Api("系统业务动作")
-public class MesProduceCategory extends BaseBean {
+public class MesProduceCategory extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 4593983703007675620L;
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
     private String produceCategoryCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceCtgyPicture.java

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -27,8 +28,9 @@ import javax.persistence.Transient;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PRODUCE_CTGY_PICTURE")
 @Api("产品类型图片表")
-public class MesProduceCtgyPicture extends BaseBean {
+public class MesProduceCtgyPicture extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -7223382567320219332L;
     @Column(name = "PRODUCE_CTGY_CODE")
     @ApiParam("产品类型代码")
     private String produceCtgyCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java

@@ -24,16 +24,18 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_PRODUCE_SN", indexes = {
-        @Index(columnList = "SERIAL_NUMBER"),
         @Index(columnList = "PRODUCT_SN"),
         @Index(columnList = "CREATE_DATE_TIME")
-})
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"})
+    }
+)
 @Api("产品条码表")
 public class MesProduceSn extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = 6641051790330191326L;
 
-    @Column(name = "SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER", nullable = false)
     @ApiParam("过程条码")
     private String serialNumber;
 
@@ -124,6 +126,11 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
     private String trayNo;
+//
+//    @Version
+//    @Column(name = "LOCK_VERSION")
+//    @ApiParam(value = "乐观锁", example = "1")
+//    public transient Integer lockVersion;
 
     @Transient
     @ApiParam("返回信息")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Description : 产品条码履历实体类
@@ -29,7 +30,8 @@ import javax.persistence.*;
         @Index(columnList = "MODIFY_DATE_TIME")
 })
 @Api("产品条码履历表")
-public class MesProduceSnTravel extends BaseBean {
+public class MesProduceSnTravel extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -1692487592284871549L;
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("过程条码")
     private String serialNumber;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Description :生产数据
@@ -30,7 +31,8 @@ import javax.persistence.*;
         @Index(columnList = "MODIFY_DATE_TIME")
 })
 @Api("生产数据")
-public class MesProductData extends BaseBean {
+public class MesProductData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -2365404168777050771L;
     @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心")
     private String workCenterCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -28,8 +29,9 @@ import java.util.List;
         @Index(columnList = "SN")
 })
 @Api("质量过程检测数据")
-public class MesQcCheckData extends BaseBean {
+public class MesQcCheckData extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 3600528549583720850L;
     @Column(name = "CHECK_ID")
     @ApiParam("检测id")
     private String checkId;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java

@@ -12,6 +12,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -28,8 +29,9 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QC_CHECK_STANDARD")
 @Api("质量检测标准")
-public class MesQcCheckStandard extends BaseBean {
+public class MesQcCheckStandard extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 1590320231495124712L;
     @Column(name = "PART_NO")
     @ApiParam("物料编码")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java

@@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.io.Serializable;
 
 /**
  * @Description :JIS发运队列
@@ -27,8 +29,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_JIS")
 @Api("JIS发运队列")
-public class MesQueueJis extends BaseBean {
+public class MesQueueJis extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 8028683333028906395L;
     @Column(name = "JIS_NO")
     @ApiParam("主队列编号")
     private String jisNo;
@@ -61,4 +64,8 @@ public class MesQueueJis extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Transient
+    @ApiParam("颜色")
+    private String color;
+
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :JIS发运队列明细
@@ -27,8 +28,9 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_JIS_DETAIL")
 @Api("JIS发运队列明细")
-public class MesQueueJisDetail extends BaseBean {
+public class MesQueueJisDetail extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = 829273008952400763L;
     @Column(name = "JIS_NO")
     @ApiParam("主队列编号")
     private String jisNo;
@@ -49,6 +51,10 @@ public class MesQueueJisDetail extends BaseBean {
     @ApiParam("状态")
     private Integer status;
 
+    @Column(name = "FINAL_STATUS")
+    @ApiParam("明细整体状态")
+    private Integer finalStatus;
+
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -24,10 +25,14 @@ import javax.persistence.*;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_ORDER", indexes = {
         @Index(columnList = "CUST_FLAG_NO")
-})
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
+    }
+)
 @Api("生产队列主表")
-public class MesQueueOrder extends BaseBean {
+public class MesQueueOrder extends BaseBean implements Serializable {
-    @Column(name = "ORDER_NO")
+    private static final long serialVersionUID = 6538031118299400711L;
+    @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("主队列编号")
     private String orderNo;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 
 /**
  * @Description:
@@ -24,14 +25,18 @@ import javax.persistence.*;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
         @Index(columnList = "ORDER_NO")
-})
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
+    }
+)
 @Api("生产队列明细")
-public class MesQueueOrderDetail extends BaseBean {
+public class MesQueueOrderDetail extends BaseBean implements Serializable {
-    @Column(name = "ORDER_NO")
+    private static final long serialVersionUID = 1548933241804083457L;
+    @Column(name = "ORDER_NO", nullable = false)
     @ApiParam("主队列编号")
     private String orderNo;
 
-    @Column(name = "PART_NO")
+    @Column(name = "PART_NO", nullable = false)
     @ApiParam("物料号")
     private String partNo;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java

@@ -13,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :mes系统业务动作
@@ -28,7 +29,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")})
 @Api("原材料信息")
-public class MesRawPartSn extends BaseBean {
+public class MesRawPartSn extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 5504323561257182116L;
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepair.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import java.io.Serializable;
 
 /**
  * @Description :维修
@@ -27,7 +28,8 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_REPAIR")
 @Api("维修")
-public class MesRepair extends BaseBean {
+public class MesRepair extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7520365696308295804L;
     @Column(name = "REPAIR_CODE")
     @ApiParam("维修代码")
     private String repairCode;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.java

@@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -28,8 +29,9 @@ import java.util.List;
         @Index(columnList = "CREATE_DATE_TIME")
 })
 @Api("维修信息记录表")
-public class MesRepairRecord extends BaseBean {
+public class MesRepairRecord extends BaseBean implements Serializable {
 
+    private static final long serialVersionUID = -2453726410779076150L;
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;