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

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

@@ -32,6 +32,7 @@ public class BaseOrder extends BaseCode {
 
     @Column(name="PRIORITY")
     @ApiParam(value ="优先级")
+    @FieldAnnotation(defaultValue = "10")
     private Integer priority;
 
     @Column(name="LET")
@@ -40,18 +41,22 @@ public class BaseOrder extends BaseCode {
 
     @Column(name="CALC_EST")
     @ApiParam(value ="最早开始时刻计算值")
+    @FieldAnnotation(modify = false)
     private Date calcEst;
 
     @Column(name="CALC_LET")
     @ApiParam(value ="最晚结束时刻计算值")
+    @FieldAnnotation(modify = false)
     private Date calcLet;
 
     @Column(name="PLAN_BEGIN")
     @ApiParam(value ="计划开始")
+    @FieldAnnotation(modify = false)
     private Date planBegin;
 
     @Column(name="PLAN_END")
     @ApiParam(value ="计划结束")
+    @FieldAnnotation(modify = false)
     private Date planEnd;
 
     @Column(name="RECEIVE_DATE")

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

@@ -1,5 +1,6 @@
 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 com.fasterxml.jackson.annotation.JsonIgnore;
@@ -33,10 +34,12 @@ public class Inventory extends BaseOrder {
 
     @Column(name="ASSIGN_COUNT")
     @ApiParam(value ="已分配量")
+    @FieldAnnotation(modify = false)
     private Double assignCount;
 
     @Column(name="EXCESS_COUNT")
     @ApiParam(value ="多余量")
+    @FieldAnnotation(modify = false)
     private Double excessCount;
 
     @JsonIgnore

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

@@ -77,14 +77,17 @@ public class ProductOrder extends BaseOrder {
 
     @Column(name="CALC_LEAD_TIME")
     @ApiParam(value ="提前期计算值")
+    @FieldAnnotation(modify = false)
     private String calcLeadTime;
 
     @Column(name="EXCESS_COUNT")
     @ApiParam(value ="多余量")
+    @FieldAnnotation(modify = false)
     private Double excessCount;
 
     @Column(name="LACK_COUNT")
     @ApiParam(value ="缺少量")
+    @FieldAnnotation(modify = false)
     private Double lackCount;
 
     @Column(name="AUTO_SUPPLY")

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

@@ -1,5 +1,6 @@
 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 com.fasterxml.jackson.annotation.JsonIgnore;
@@ -41,10 +42,12 @@ public class PurchaseOrder extends BaseOrder {
 
     @Column(name="CALC_LEAD_TIME")
     @ApiParam(value ="提前期计算值")
+    @FieldAnnotation(modify = false)
     private String calcLeadTime;
 
     @Column(name="EXCESS_COUNT")
     @ApiParam(value ="多余量")
+    @FieldAnnotation(modify = false)
     private Double excessCount;
 
     @Column(name="AUTO_SUPPLY")

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

@@ -1,5 +1,6 @@
 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 com.fasterxml.jackson.annotation.JsonIgnore;
@@ -42,6 +43,7 @@ public class SalesOrder extends BaseOrder {
 
     @Column(name="CALC_LEAD_TIME")
     @ApiParam(value ="提前期计算值")
+    @FieldAnnotation(modify = false)
     private String calcLeadTime;
 
     @JsonIgnore

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

@@ -31,10 +31,12 @@ import java.util.List;
 public class Work extends BaseCode {
     @Column(name="WORK_TYPE")
     @ApiParam(value ="工作类型")
+    @FieldAnnotation(modify = false)
     private WORK_TYPE workType;
 
     @Column(name="count")
     @ApiParam(value ="数量")
+    @FieldAnnotation(modify = false)
     private Double count;
 
     @Column(name="SPECIFY_COUNT")
@@ -75,10 +77,12 @@ public class Work extends BaseCode {
 
     @Column(name="CALC_EST")
     @ApiParam(value ="最早开始时间计算值")
+    @FieldAnnotation(modify = false)
     private Date calcEst;
 
     @Column(name="CALC_LET")
     @ApiParam(value ="最晚结束时间计算值")
+    @FieldAnnotation(modify = false)
     private Date calcLet;
 
     @Column(name="WORK_STATUS")
@@ -87,14 +91,17 @@ public class Work extends BaseCode {
 
     @Column(name="PLAN_BEGIN")
     @ApiParam(value ="计划开始时间")
+    @FieldAnnotation(modify = false)
     private Date planBegin;
 
     @Column(name="PLAN_END")
     @ApiParam(value ="计划结束时间")
+    @FieldAnnotation(modify = false)
     private Date planEnd;
 
     @Column(name="PLAN_RESOURCE")
     @ApiParam(value ="计划主资源")
+    @FieldAnnotation(modify = false)
     private String planResource;
 
     @Column(name="FIX_SPLIT")
@@ -103,14 +110,17 @@ public class Work extends BaseCode {
 
     @Column(name="NEED_PREV_COUNT")
     @ApiParam(value ="需要的前工作数量")
+    @FieldAnnotation(display = false, modify = false)
     private Double needPrevCount;
 
     @Column(name="SCH_FAILED")
     @ApiParam(value ="是否排程失败")
+    @FieldAnnotation(modify = false)
     private Boolean schFailed;
 
     @Column(name="FAILED_REASON")
     @ApiParam(value ="排程失败原因")
+    @FieldAnnotation(modify = false)
     private String failedReason;
 
     @Column(name="ORDER_ID")

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

@@ -29,14 +29,17 @@ import java.util.List;
 public class WorkInput extends BaseAPS {
     @Column(name="INPUT_TIME")
     @ApiParam(value ="输入时间")
+    @FieldAnnotation(modify = false)
     private Date inputTime;
 
     @Column(name="INPUT_COUNT")
     @ApiParam(value ="输入数量")
+    @FieldAnnotation(modify = false)
     private Double inputCount;
 
     @Column(name="SHORT_COUNT")
     @ApiParam(value ="短缺数量")
+    @FieldAnnotation(modify = false)
     private Double shortCount;
 
     @Column(name="WORK_ID")

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

@@ -30,14 +30,17 @@ import java.util.List;
 public class WorkOutput extends BaseAPS {
     @Column(name="OUTPUT_TIME")
     @ApiParam(value ="输出时间")
+    @FieldAnnotation(modify = false)
     private Date outputTime;
 
     @Column(name="OUTPUT_COUNT")
     @ApiParam(value ="输出数量")
+    @FieldAnnotation(modify = false)
     private Double outputCount;
 
     @Column(name="REMAIN_COUNT")
     @ApiParam(value ="多余数量")
+    @FieldAnnotation(modify = false)
     private Double remainCount;
 
     @Column(name="WORK_ID")

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
@@ -34,66 +35,82 @@ import java.util.List;
 public class WorkPlan extends BaseAPS {
     @Column(name="PREV_SET_BEGIN")
     @ApiParam(value ="前设置开始时间")
+    @FieldAnnotation(modify = false)
     private Date prevSetBegin;
 
     @Column(name="PREV_SET_END")
     @ApiParam(value ="前设置结束时间")
+    @FieldAnnotation(modify = false)
     private Date prevSetEnd;
 
     @Column(name="PREV_SET_TIME")
     @ApiParam(value ="前设置时间")
+    @FieldAnnotation(modify = false)
     private Integer prevSetTime;
 
     @Column(name="PRODUCE_BEGIN")
     @ApiParam(value ="生产开始时间")
+    @FieldAnnotation(modify = false)
     private Date produceBegin;
 
     @Column(name="PRODUCE_END")
     @ApiParam(value ="生产结束时间")
+    @FieldAnnotation(modify = false)
     private Date produceEnd;
 
     @Column(name="PRODUCE_TIME")
     @ApiParam(value ="生产时间")
+    @FieldAnnotation(modify = false)
     private Integer produceTime;
 
     @Column(name="POST_SET_BEGIN")
     @ApiParam(value ="后设置开始时间")
+    @FieldAnnotation(modify = false)
     private Date postSetBegin;
 
     @Column(name="POST_SET_END")
     @ApiParam(value ="后设置结束时间")
+    @FieldAnnotation(modify = false)
     private Date postSetEnd;
 
     @Column(name="POST_SET_TIME")
     @ApiParam(value ="后设置时间")
+    @FieldAnnotation(modify = false)
     private Integer postSetTime;
 
     @Column(name="LOCK_BEGIN")
     @ApiParam(value ="锁定开始时间")
+    @FieldAnnotation(modify = false)
     private Date lockBegin;
 
     @Column(name="LOCK_END")
     @ApiParam(value ="锁定结束时间")
+    @FieldAnnotation(modify = false)
     private Date lockEnd;
 
     @Column(name="LOCK_TIME")
     @ApiParam(value ="锁定时间")
+    @FieldAnnotation(modify = false)
     private Integer lockTime;
 
     @Column(name="WORK_ID")
     @ApiParam(value ="工作对象id")
+    @FieldAnnotation(property = false)
     private Long workId;
 
     @Column(name="RESOURCE_ID")
     @ApiParam(value ="资源对象id")
+    @FieldAnnotation(property = false)
     private Long resourceId;
 
     @Column(name="WORK_RESOURCE_ID")
     @ApiParam(value ="工作资源对象id")
+    @FieldAnnotation(property = false)
     private Long workResourceId;
 
     @Column(name="MAIN_PLAN_ID")
     @ApiParam(value ="主计划对象id")
+    @FieldAnnotation(property = false)
     private Long mainPlanId;
 
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }

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

@@ -29,22 +29,27 @@ import javax.persistence.Table;
 public class WorkRelation extends BaseAPS {
     @Column(name="TYPE")
     @ApiParam(value ="关联类型")
+    @FieldAnnotation(modify = false)
     private WORK_RELATION_TYPE type;
 
     @Column(name="CONS_TYPE")
     @ApiParam(value ="接续方式")
+    @FieldAnnotation(modify = false)
     private CONSTRAINT_TYPE consType;
 
     @Column(name="MAX_SPACE_TIME")
     @ApiParam(value ="最大间隔时间")
+    @FieldAnnotation(modify = false)
     private String maxSpaceTime;
 
     @Column(name="MIN_SPACE_TIME")
     @ApiParam(value ="最小间隔时间")
+    @FieldAnnotation(modify = false)
     private String minSpaceTime;
 
     @Column(name="COUNT")
     @ApiParam(value ="关联数量")
+    @FieldAnnotation(modify = false)
     private Double count;
 
     @Column(name="FIX_RELATION")

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

@@ -28,38 +28,47 @@ import javax.persistence.Table;
 public class WorkResource extends BaseAPS {
     @Column(name="USE_TYPE")
     @ApiParam(value ="使用类型")
+    @FieldAnnotation(modify = false)
     private USE_TYPE useType;
 
     @Column(name="PREV_TIME")
     @ApiParam(value ="前设置时间")
+    @FieldAnnotation(modify = false)
     private Long prevTime;
 
     @Column(name="PRODUCE_TIME")
     @ApiParam(value ="制造时间")
+    @FieldAnnotation(modify = false)
     private Long produceTime;
 
     @Column(name="POST_TIME")
     @ApiParam(value ="后设置时间")
+    @FieldAnnotation(modify = false)
     private Long postTime;
 
     @Column(name="PRIORITY")
     @ApiParam(value ="优先级")
+    @FieldAnnotation(modify = false)
     private Integer priority;
 
     @Column(name="MAX_PREV_SD_TIME")
     @ApiParam(value ="最大前设置中断时间")
+    @FieldAnnotation(modify = false)
     private String maxPrevSdTime;
 
     @Column(name="MAX_PRODUCE_SD_TIME")
     @ApiParam(value ="最大制造中断时间")
+    @FieldAnnotation(modify = false)
     private String maxProduceSdTime;
 
     @Column(name="MAX_POST_SD_TIME")
     @ApiParam(value ="最大后设置中断时间")
+    @FieldAnnotation(modify = false)
     private String maxPostSdTime;
 
     @Column(name="USER_MATCH_NUMBER")
     @ApiParam(value ="资源使用配套号")
+    @FieldAnnotation(modify = false)
     private String userMatchNumber;
 
     @Column(name="WORK_ID")

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

@@ -1,10 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.common;
 
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -22,6 +26,12 @@ public abstract class BaseAPS extends BaseBean {
     @JsonIgnore
     private transient Map<String, Object> customFields = new HashMap<>();
 
+    @Column(name="KEY")
+    @ApiParam(value ="主键值")
+    @FieldAnnotation(display = false, modify = false)
+    @Transient
+    private String key;
+
     public Object getCustomField(String code) {
         return customFields.get(code);
     }

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

@@ -19,7 +19,7 @@ import javax.persistence.MappedSuperclass;
 public abstract class BaseCode extends BaseAPS {
     @Column(name="CODE")
     @ApiParam(value ="编码")
-    @FieldAnnotation(popSearch = true)
+    @FieldAnnotation(popSearch = true, mainkey = true)
     private String code;
 
     @Column(name="NAME")

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

@@ -13,6 +13,79 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * mes 工位类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_WORK_CELL_TYPE {
+
+        NORMAL(10, "正常"),
+        REWORK(20, "返修");
+
+        private int value;
+        private String description;
+
+        MES_WORK_CELL_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;
+        }
+
+    }
+
+    /**
+     * mes 物料绑定记录结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PRODUCE_SN_RESULT {
+
+        OK(10, "OK");
+
+        private int value;
+        private String description;
+
+        MES_PRODUCE_SN_RESULT(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;
+        }
+
+    }
+
+    /**
      * mes缺陷原因类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -95,6 +95,14 @@ public class MesProcessBom extends BaseBean {
     @ApiParam("显示颜色")
     private String color;
 
+    @Transient
+    @ApiParam("关键件代码")
+    private String keyBarCode;
+
+    @Transient
+    @ApiParam("产品条码")
+    private String serialNumber;
+
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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

@@ -73,4 +73,15 @@ public class MesQcCheckStandard extends BaseBean {
     @ApiParam("检测值")
     private String checkValue;
 
+    public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) {
+        this.partNo = partNo;
+        this.workCenterCode = workCenterCode;
+        this.workCellCode = workCellCode;
+        this.checkType = checkType;
+        this.checkItem = checkItem;
+        this.checkStandard = checkStandard;
+        this.checkGuide = checkGuide;
+        this.checkFrequency = checkFrequency;
+        this.partName = partName;
+    }
 }

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

@@ -41,6 +41,10 @@ public class MesEquNotifyObjectCfg extends BaseBean {
     @ApiParam("对象值")
     private String notifyObjectValue;
 
+    @Column(name="NOTIFY_OBJECT_VALUE_RDD")
+    @ApiParam("对象值")
+    private String notifyObjectValueRdd;
+
     @Column(name="NOTIFY_OBJECT_TYPE")
     @ApiParam("对象类型")
     private Integer notifyObjectType;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -1454,8 +1454,8 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectName())) {
             DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectName(), "notifyObjectName", packBean);
         }
-        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValue())) {
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValueRdd())) {
-            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValue", packBean);
+            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValueRdd", packBean);
         }
         if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectType())) {
             DdlPreparedPack.getNumEqualPack(mesEquNotifyObjectCfg.getNotifyObjectType(), "notifyObjectType", packBean);