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

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

@@ -672,7 +672,8 @@ public class MesEnumUtil {
         OPEN(30, "启动"),
         PAUSE(40, "暂停"),
         CANCEL(50, "取消"),
-        CLOSE(60, "关闭");
+        CLOSE(60, "关闭"),
+        COMPLETE(70, "完成");
 
         private int value;
         private String description;

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

@@ -1256,13 +1256,13 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * redis过期时间
+     * 条码类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PCN_SN_TYPE {
 
-        NORMAL(10, "不过期"),
-        FIRST_INSPECTION(20, "一分钟");
+        NORMAL(10, "正常件"),
+        FIRST_INSPECTION(20, "首检件");
 
         private int value;
         private String description;
@@ -1292,4 +1292,42 @@ public class MesPcnEnumUtil {
     }
 
 
+    /**
+     * MesPlanOrder实体对应的source值  计划来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CACHE_KEY {
+
+        TRAY("TRAY:", "托盘缓存key"),
+
+        SERIAL_NO("PCN_SERIAL:", "条码缓存key");
+
+        private String value;
+        private String description;
+
+        CACHE_KEY(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String 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.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 }

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

@@ -3354,7 +3354,6 @@ public class WmsEnumUtil {
         INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
         INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"),
         INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"),
-        INVENTORY_FIT(50, "INVENTORY_FIT", "库位一致"),
         INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘");
 
         private int value;

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

@@ -76,9 +76,13 @@ public class MesProcessBom extends BaseBean {
     private Integer isCheck;
 
     @Column(name = "IS_FEED")
-    @ApiParam(value = "是否检查")
+    @ApiParam(value = "是否投料配置")
     private Integer isFeed;
 
+    @Column(name = "is_BIND_KEY")
+    @ApiParam(value = "是否绑定关键件")
+    private Integer isBindKey;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java

@@ -61,4 +61,7 @@ public class StationRequestBean implements Serializable {
 
     @ApiParam("工单号")
     private String workOrderNo;
+
+    @ApiParam("托盘号")
+    private String tray;
 }

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

@@ -80,9 +80,13 @@ public class MesProcessBom extends BaseBean {
 
 
     @Column(name = "IS_FEED")
-    @ApiParam(value = "是否检查")
+    @ApiParam(value = "是否投料配置")
     private Integer isFeed;
 
+    @Column(name = "is_BIND_KEY")
+    @ApiParam(value = "是否绑定关键件")
+    private Integer isBindKey;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java

@@ -64,6 +64,27 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam("连接类型")
     private Integer connectType;
 
+    @ApiParam(value ="组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
+
+    @ApiParam(value = "是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    public String modifyDatetime;
+
 
     public MesEquipmentModel() {
 
@@ -92,7 +113,7 @@ public class MesEquipmentModel implements Serializable {
 
     }
 
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -110,5 +131,13 @@ public class MesEquipmentModel implements Serializable {
         this.receiveDate = receiveDate;
         this.enableDate = enableDate;
         this.connectType = connectType;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
     }
+
 }