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

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java

@@ -31,6 +31,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getAcCode(), "acCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonCellAlarmCause.getAlarmCode(), "alarmCode", packBean);
         return packBean;
     }
@@ -45,6 +46,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonEventMethod.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventMethod.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventMethod.getAlarmCode(), "alarmCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventMethod.getEmCode(), "emCode", packBean);
         return packBean;
     }
@@ -59,6 +61,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonEventCause.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventCause.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventCause.getEcCode(), "ecCode", packBean);
         return packBean;
     }
@@ -73,6 +76,7 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getAlarmCode(), "alarmCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonEventPhenoMenon.getEpmCode(), "epmCode", packBean);
         return packBean;
     }

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

@@ -713,4 +713,50 @@ public class AndonEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 接口调用标识
+
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_CALL_TYPE{
+        MANAGE("10","管理界面"),
+        QUEUE ("20","队列");
+
+        private String value;
+        private String description;
+
+        ANDON_CALL_TYPE(String value,String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -12,6 +12,80 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes工作单元参数类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_WORK_CELL_PARAM_TYPE {
+
+        NUMBER(10, "数值"),
+        STRING(20, "字符串");
+
+        private int value;
+        private String description;
+
+        MES_WORK_CELL_PARAM_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_WORK_CELL_PARAM_MODEL {
+
+        PUBLIC(10, "公用"),
+        JIT(20, "JIT生产"),
+        WORK_ORDER(30, "工单生产"),
+        OTHER(99, "其他");
+
+        private int value;
+        private String description;
+
+        MES_WORK_CELL_PARAM_MODEL(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/MesPcnTask.java

@@ -65,6 +65,10 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("PCN节点名称")
     private String pcnName;
 
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN节点名称代码")
+    private String pcnCode;
+
     @Column(name="TASK_CYCLE_EXPS")
     @ApiParam("任务周期表达式")
     private String taskCycleExps;

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.pcn.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :工作单元参数
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-30
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_PARAM")
+@Api("mes工作单元参数")
+public class MesWorkCellParam extends BaseBean {
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private Integer paramType;
+
+    @Column(name = "PARAM_MODEL")
+    @ApiParam("参数模式")
+    private Integer paramModel;
+}

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellParamRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-30
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellParamRepository extends BaseRepository<MesWorkCellParam, Long> {
+}

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

@@ -65,6 +65,10 @@ public class MesPcnTask extends BaseBean {
     @ApiParam("PCN节点名称")
     private String pcnName;
 
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN节点名称代码")
+    private String pcnCode;
+
     @Column(name="TASK_CYCLE_EXPS")
     @ApiParam("任务周期表达式")
     private String taskCycleExps;

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :工作单元参数
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-30
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_PARAM")
+@Api("mes工作单元参数")
+public class MesWorkCellParam extends BaseBean {
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_TYPE")
+    @ApiParam("参数类型")
+    private Integer paramType;
+
+    @Column(name = "PARAM_MODEL")
+    @ApiParam("参数模式")
+    private Integer paramModel;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellParamRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkCellParam;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-30
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkCellParamRepository extends BaseRepository<MesWorkCellParam, Long> {
+}

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

@@ -507,14 +507,17 @@ public class MesHqlPack {
     }
 
     public static DdlPackBean getMesEventByEventCode(String eventCode, String org) {
-        DdlPackBean packBean = getAllBaseData(org);
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(org, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
         DdlPreparedPack.getStringEqualPack(eventCode, "eventCode", packBean);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         return packBean;
     }
 
     public static DdlPackBean getMesActionByActionCode(MesAction mesAction, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesAction, organizeCode);
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
         DdlPreparedPack.getStringEqualPack(mesAction.getActionCode(), "actionCode", packBean);
         return packBean;
     }
@@ -567,10 +570,10 @@ public class MesHqlPack {
     }
 
     public static DdlPackBean getMesMethodByMethodCode(MesMethod mesMethod, String organizeCode) {
-        DdlPackBean packBean = getAllBaseDataByNormalPro(mesMethod, organizeCode);
-        if (StringUtils.isNotEmpty(mesMethod.getMethodCode())) {
-            DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
-        }
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        DdlPreparedPack.getStringEqualPack(mesMethod.getMethodCode(), "methodCode", packBean);
         return packBean;
     }
 
@@ -1076,6 +1079,27 @@ public class MesHqlPack {
     }
 
     /**
+     * MES工作单元参数查询条件封装
+     *
+     * @param workCellParam
+     * @return
+     */
+    public static DdlPackBean getMesWorkCellParam(MesWorkCellParam workCellParam, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParam, organizeCode);
+        if (StringUtils.isNotEmpty(workCellParam.getParamCode())) {
+            DdlPreparedPack.getStringLikerPack(workCellParam.getParamCode(), "paramCode", packBean);
+        }
+        if (null != workCellParam.getParamType()) {
+            DdlPreparedPack.getNumEqualPack(workCellParam.getParamType(), "paramType", packBean);
+        }
+        if (null != workCellParam.getParamModel()) {
+            DdlPreparedPack.getNumEqualPack(workCellParam.getParamModel(), "paramModel", packBean);
+        }
+        return packBean;
+    }
+
+
+    /**
      * MES工作单元队列查询条件封装
      *
      * @param workCellPoint
@@ -1149,8 +1173,11 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) {
             DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
         }
-
+        if (null != mesPcnTask.getTaskStatus()) {
+            DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean);
+        }
         packBean.setOrderByStr(mesPcnTask.orderBy());
         return packBean;
     }
+
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java

@@ -102,6 +102,10 @@ public class WmsLocate extends BaseBean {
     @Transient
     private String factory;
 
+    @Column(name = "ENCRYPTION_NO")
+    @ApiParam(value = "加密编码")
+    private String encryptionNo;
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -151,7 +151,9 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("特殊批次")
     public String fixLotNo;
 
-
+    @Column(name="VENDOR_NO")
+    @ApiParam("供应商编号")
+    private String vendorNo;
 
     @Transient
     @ApiParam("业务类型编码")
@@ -171,10 +173,6 @@ public class WmsMoveSn extends BaseBean {
     private String ZoneNo;
 
     @Transient
-    @ApiParam("供应商编码")
-    private String vendorNo;
-
-    @Transient
     @ApiParam("交易类型名称")
     private String transTypeName;
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -109,6 +109,10 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "是否生成条码", example = "1")
     public Integer isSn;
 
+    @Column(name = "CONTAINER_NO")
+    @ApiParam("集装箱号")
+    public String containerNo;
+
     @Transient
     @ApiParam(value = "工厂名称")
     public String organizeName;