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/bean/AndonDisposalCfg.java

@@ -51,6 +51,14 @@ public class AndonDisposalCfg extends BaseBean {
     @ApiParam(value = "呼叫原因描述")
     private String acNameRdd;
 
+    @Column(name = "EM_CODE")
+    @ApiParam(value = "事件方法代码")
+    private String emCode;
+
+    @Column(name = "EM_NAME_RDD")
+    @ApiParam(value = "事件方法描述")
+    private String emNameRdd;
+
     @AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description")
     @Column(name = "FLOW_STATUS")
     @ApiParam(value = "审批状态")

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java

@@ -30,27 +30,12 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Api("Andon自处理维护配置")
 public class AndonDisposalMaintenCfg extends BaseBean {
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam(value = "工作中心代码")
-    private String workCenterCode;
-
-    @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作单元代码")
-    private String workCellCode;
 
     @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型代码")
     private String alarmCode;
 
-    @Column(name = "AC_CODE")
-    @ApiParam(value = "呼叫原因代码")
-    private String acCode;
-
-    @Column(name = "EM_CODE")
-    @ApiParam(value = "处理措施代码")
-    private String emCode;
-
     @Column(name = "RP_WHERE")
     @ApiParam(value = "有效时长")
     private Integer rpWhere;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -250,6 +250,14 @@ public class AndonManageQueue extends BaseManageQueue {
     @ApiParam(value ="规格型号")
     private String scale;
 
+    @Transient
+    @ApiParam(value ="当前件数")
+    private Integer currentProdNum;
+
+    @Transient
+    @ApiParam(value ="生产累计件数")
+    private Integer totalProdNum;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.andon.bean;
 
+import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -35,116 +36,38 @@ import javax.persistence.*;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Api("安灯记录")
-public class AndonManageRecord extends BaseBean {
-
-    @Column(name = "ANDON_ORDER_NO")
-    @ApiParam(value = "安灯队列编号")
-    private String andonOrderNo;
-
-    @Column(name = "ALARM_CODE")
-    @ApiParam(value = "安灯类型")
-    private String alarmCode;
-
-    @Column(name = "ACTION_CODE")
-    @ApiParam(value = "安灯动作代码")
-    private String actionCode;
-
-    @Column(name = "WORK_CENTER_CODE")
-    @ApiParam(value = "工作中心代码")
-    private String workCenterCode;
-
-    @Column(name = "WORK_CENTER_NAME_RDD")
-    @ApiParam(value = "工作中心名称")
-    private String workCenterNameRdd;
-
-    @Column(name = "WORK_CELL_NAME_RDD")
-    @ApiParam(value = "工作单元名称")
-    private String workCellNameRdd;
-
-    @Column(name = "WORK_CELL_CODE")
-    @ApiParam(value = "工作单元代码")
-    private String workCellCode;
-
-    @Column(name = "EQUIPMENT_CODE")
-    @ApiParam(value = "设备代码")
-    private String equipmentCode;
-
-    @Column(name = "EQUIPMENT_NAME_RDD")
-    @ApiParam(value = "设备名称")
-    private String equipmentNameRdd;
-
-    @Column(name = "SHIFT_CODE")
-    @ApiParam(value = "班次代码")
-    private String shiftCode;
-
-    @Column(name = "SHIFT_NAME_RDD")
-    @ApiParam(value = "班次名称")
-    private String shiftNameRdd;
-
-    @Column(name = "STATUS_CODE")
-    @ApiParam(value = "安灯状态代码")
-    private String statusCode;
+public class AndonManageRecord extends BaseManageQueue {
 
     @Column(name = "SEQ")
     @ApiParam(value = "序号", example = "1")
     private Double seq;
 
-    @Column(name = "PRIORITY_LEVEL")
-    @ApiParam(value = "优先级别", example = "1")
-    private Integer priorityLevel;
-
-    @Column(name="CALL_TIME",updatable = false)
-    @ApiParam(value = "呼叫时间")
-    @AnnoOutputColumn(hidden = true)
-    public String callTime;
-
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
     public String callTimeStr;
 
-    @Column(name="CONFIRM_TIME",updatable = false)
-    @ApiParam(value = "响应时间")
-    @AnnoOutputColumn(hidden = true)
-    public String confirmTime;
-
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="响应时间",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
     public String confirmTimeStr;
 
-    @Column(name="RESET_TIME",updatable = false)
-    @ApiParam(value = "解决时间")
-    @AnnoOutputColumn(hidden = true)
-    public String resetTime;
-
     @Transient
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="解决时间",example = "2018-01-01 01:00:00")
     @AnnoOutputColumn(hidden = true)
     public String resetTimeStr;
 
-    @Column(name = "CALL_USER")
-    @ApiParam(value = "呼叫人")
-    private String callUser;
-
     @Transient
     @ApiParam(value = "呼叫人名字")
     private String callUserName;
 
-    @Column(name = "CONFIRM_USER")
-    @ApiParam(value = "响应人")
-    private String confirmUser;
-
     @Transient
     @ApiParam(value = "响应人名字")
     private String confirmUserName;
 
-    @Column(name = "RESET_USER")
-    @ApiParam(value = "解决人")
-    private String resetUser;
 
     @Transient
     @ApiParam(value = "解决人名字")
@@ -177,69 +100,10 @@ public class AndonManageRecord extends BaseBean {
     @ApiParam(value = "转呼通知等级")
     private String scRpLevel;
 
-    @Column(name = "AC_CODE")
-    @ApiParam(value = "呼叫原因代码")
-    private String acCode;
-
-    @Column(name = "AC_NAME_RDD")
-    @ApiParam(value = "呼叫原因描述")
-    private String acNameRdd;
-
-    @Column(name = "AC_DESC")
-    @ApiParam(value = "呼叫具体原因")
-    private String acDesc;
-
-    @Column(name = "EC_CODE")
-    @ApiParam(value = "事件原因代码")
-    private String ecCode;
-
-    @Column(name = "EC_NAME_RDD")
-    @ApiParam(value = "事件原因描述")
-    private String ecNameRdd;
-
-    @Column(name = "EC_DESC")
-    @ApiParam(value = "事件具体原因")
-    private String ecDesc;
-
-    @Column(name = "EM_CODE")
-    @ApiParam(value = "事件方法代码")
-    private String emCode;
-
-    @Column(name = "EM_NAME_RDD")
-    @ApiParam(value = "事件方法描述")
-    private String emNameRdd;
-
-    @Column(name = "EM_DESC")
-    @ApiParam(value = "事件具体方法")
-    private String emDesc;
-
-    @Column(name = "IS_HALT")
-    @ApiParam(value = "是否停机", example = "1")
-    private Integer isHalt;
-
-    @Column(name = "HALT_CODE")
-    @ApiParam(value = "停机类型")
-    private String haltCode;
-
-    @Column(name = "HALT_DESC")
-    @ApiParam(value = "停机具体原因")
-    private String haltDesc;
-
     @Column(name = "SEND_FLAG")
     @ApiParam(value = "发送标志")
     private String sendFlag;
 
-    /**
-     * 处理类型：10=标准处理，20=自处理
-     */
-    @Column(name = "DISPOSAL_TYPE")
-    @ApiParam(value = "处理类型")
-    private String disposalType;
-
-    @Column(name = "ALARM_DETAIL_CODE")
-    @ApiParam(value = "安灯子类型代码")
-    private String alarmDetailCode;
-
     @Column(name = "EPM_CODE")
     @ApiParam(value = "事件现象代码")
     private String epmCode;
@@ -321,6 +185,14 @@ public class AndonManageRecord extends BaseBean {
     @ApiParam(value ="规格型号")
     private String scale;
 
+    @Transient
+    @ApiParam(value ="当前件数")
+    private Integer currentProdNum;
+
+    @Transient
+    @ApiParam(value ="生产累计件数")
+    private Integer totalProdNum;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java

@@ -92,4 +92,12 @@ public class AndonQueueAttach extends BaseBean {
     @ApiParam(value ="规格型号")
     private String scale;
 
+    @Column(name="CURRENT_PROD_NUM")
+    @ApiParam(value ="当前件数")
+    private Integer currentProdNum;
+
+    @Column(name="TOTAL_PROD_NUM")
+    @ApiParam(value ="生产累计件数")
+    private Integer totalProdNum;
+
 }

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

@@ -90,7 +90,7 @@ public class AndonHqlPack {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean);
+        DdlPreparedPack.getStringLikerPack(andonBroadCast.getTargetIds(), "targetIds", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCast.getGroupNo(), "groupNo", packBean);
         DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean);
         DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean);
@@ -120,11 +120,7 @@ public class AndonHqlPack {
     public static DdlPackBean getAndonDisposalMaintenCfg(AndonDisposalMaintenCfg andonDisposalMaintenCfg) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getOrganizeCode(), "organizeCode", packBean);
-        DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean);
-        DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCellCode(), "workCellCode", packBean);
-        DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getEmCode(), "emCode", packBean);
-        DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAcCode(), "acCode", packBean);
         DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean);
         return packBean;
     }
@@ -138,7 +134,6 @@ public class AndonHqlPack {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(andonQueueAttach.getOrganizeCode(), "organizeCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonQueueAttach.getAndonOrderNo(), "andonOrderNo", packBean);
-        DdlPreparedPack.getStringEqualPack(andonQueueAttach.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean);
         return packBean;
     }

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

@@ -11,6 +11,392 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  **/
 public class MesEnumUtil {
 
+    /**
+     * mes设备作业任务明细-执行状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_EQU_TASK_DETAIL_ACTION_STATUS {
+
+        PENDING(10, "待处理"),
+        COMPLETE(20, "已完成"),
+        CANCEL(30, "取消");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_DETAIL_ACTION_STATUS(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_EQU_TASK_DETAIL_FINAL_RESULT {
+
+        YES(10, "合格"),
+        NO(20, "不合格");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_DETAIL_FINAL_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)
+    public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG {
+
+        FALSE(10, "否"),
+        TRUE(20, "是");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_DETAIL_REPAIR_FLAG(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_EQU_TASK_STATUS {
+
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        OPEN(30, "开启"),
+        CLOSE(40, "关闭"),
+        CANCEL(50, "取消");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_STATUS(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_EQU_TASK_SOURCE {
+
+        PLAN(10, "周期计划"),
+        CREATE(20, "手工创建"),
+        ANDON(30, "ANDON");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_SOURCE(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_EQU_TASK_NOTIFY_FLAG {
+
+        FALSE(10, "未通知"),
+        TRUE(20, "已通知");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_NOTIFY_FLAG(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_INSERT_EXCEL {
+
+        MES_PLAN_ORDER(10, "生产计划"),
+        MES_EQUIPMENT(20, "设备台账"),
+        MES_EQU_TASK_STANDARD(30, "设备作业要求");
+
+        private int value;
+        private String description;
+
+        MES_INSERT_EXCEL(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_INSERT_EXCEL getByValue(int value) {
+            for (MES_INSERT_EXCEL mesInsertExcel : values()) {
+                if (mesInsertExcel.getValue() == value) {
+                    return mesInsertExcel;
+                }
+            }
+            return null;
+        }
+
+
+        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_EQU_TASK_NOTIFY_CFG_TYPE {
+
+        TASK_NOTIFY(10, "任务型通知");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_NOTIFY_CFG_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_EQU_TASK_NOTIFY_CFG_PATTERN {
+
+        EMAIL(10, "邮件"),
+        USERPHONE(10, "手机号");
+
+        private int value;
+        private String description;
+
+        MES_EQU_TASK_NOTIFY_CFG_PATTERN(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_EQU_NOTIFY_OBJECT_CFG_TYPE {
+
+        CHECK_NOTIFY_OBJECT(10, "点检通知对象"),
+        MAINTAIN_NOTIFY_OBJECT(20, "保养通知对象"),
+        REPAIR_NOTIFY_OBJECT(30, "维修通知对象");
+
+        private int value;
+        private String description;
+
+        MES_EQU_NOTIFY_OBJECT_CFG_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 工位类型
@@ -307,56 +693,7 @@ public class MesEnumUtil {
      * mes设备作业要求-作业类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_INSERT_EXCEL {
-
-        MES_PLAN_ORDER(10, "生产计划"),
-        MES_EQUIPMENT(20, "设备台账"),
-        MES_EQU_TASK_STANDARD(30, "设备作业要求");
-
-        private int value;
-        private String description;
-
-        MES_INSERT_EXCEL(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        // 根据value返回枚举类型,主要在switch中使用
-        public static MES_INSERT_EXCEL getByValue(int value) {
-            for (MES_INSERT_EXCEL mesInsertExcel : values()) {
-                if (mesInsertExcel.getValue() == value) {
-                    return mesInsertExcel;
-                }
-            }
-            return null;
-        }
-
-
-        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_EQU_TASK_STANDARD_TASK_TYPE {
+    public enum MES_EQU_TASK_TYPE {
 
         CHECK(10, "点检"),
         MAINTAIN(20, "保养"),
@@ -365,7 +702,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) {
+        MES_EQU_TASK_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1916,4 +2253,50 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * MesRoute 流程的类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_TYPE {
+
+        SCAN(10, "扫描流程"),
+        MONITOR(20, "监控流程");
+
+        private int value;
+        private String description;
+
+        ROUTE_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;
+        }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -636,7 +636,7 @@ public class DdlPreparedPack {
         if (basisType == CommonEnumUtil.BASIS_TYPE.INT.getValue()) {
             name = " cast(" + name + " as integer)";
         } else if (basisType == CommonEnumUtil.BASIS_TYPE.DOUBLE.getValue()) {
-            name = " cast(" + name + " as double)";
+            name = " cast(" + name + " as decimal)";
         } else if (basisType == CommonEnumUtil.BASIS_TYPE.LONG.getValue()) {
             name = " cast(" + name + " as long)";
         }

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

@@ -0,0 +1,48 @@
+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;
+import javax.persistence.Transient;
+
+/**
+ * @Description :设备通知对象配置
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EQU_NOTIFY_OBJECT_CFG")
+@Api("设备通知对象配置")
+public class MesEquNotifyObjectCfg extends BaseBean {
+    @Column(name="NOTIFY_OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String notifyObjectCode;
+
+    @Column(name="NOTIFY_OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String notifyObjectName;
+
+    @Column(name="NOTIFY_OBJECT_VALUE")
+    @ApiParam("对象值")
+    private String notifyObjectValue;
+
+    @Column(name="NOTIFY_OBJECT_TYPE")
+    @ApiParam("对象类型")
+    private Integer notifyObjectType;
+
+}

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

@@ -0,0 +1,51 @@
+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-10-11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EQU_TASK_NOTIFY_CFG")
+@Api("设备作业通知配置")
+public class MesEquTaskNotifyCfg extends BaseBean {
+    @Column(name="TASK_TYPE")
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @Column(name="NOTIFY_TYPE")
+    @ApiParam("通知类型")
+    private Integer notifyType;
+
+    @Column(name="NOTIFY_CONDITION")
+    @ApiParam("通知条件（小时）")
+    private Integer notifyCondition;
+
+    @Column(name="NOTIFY_OBJECT_CODE")
+    @ApiParam("通知对象")
+    private String notifyObjectCode;
+
+    @Column(name="NOTIFY_PATTERN")
+    @ApiParam("通知方式")
+    private Integer notifyPattern;
+
+}

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description : 设备任务通知人员model
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-11 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户信息model")
+public class EquTaskNotifyUserModel extends BaseBean {
+
+    @ApiParam(value ="人员ID")
+    private Long userId;
+
+    @Column(name="USER_NAME_RDD")
+    @ApiParam(value ="用户名称" , access ="账号名称")
+    private String userName;
+
+    @Column(name="USER_LOGIN_NAME")
+    @ApiParam(value ="登陆名称" , access ="登陆名称")
+    private String userLoginName;
+
+    @Column(name="USER_EMAIL")
+    @ApiParam(value ="邮箱" , access ="邮箱")
+    private String userEmail;
+
+    @Column(name="USER_PHONE")
+    @ApiParam(value ="手机号" , access ="手机号")
+    private String userPhone;
+
+    @Column(name="USER_STATUS")
+    @ApiParam(value ="账号状态(枚举：1正常,2冻结使用,3账号异常,4离职，5服务到期)" , example ="-1")
+    private Integer userStatus;
+
+}

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

@@ -0,0 +1,96 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesEquTaskNotifyModel implements Serializable {
+
+    @ApiParam("id")
+    private Long id;
+
+    @ApiParam("作业任务编号")
+    private String taskNo;
+
+    @ApiParam("作业类型")
+    private Integer taskType;
+
+    @ApiParam("作业状态")
+    private Integer taskStatus;
+
+    @ApiParam(value="生产线")
+    private String workCenterCode;
+
+    @ApiParam("计划日期")
+    private String planTime;
+
+    @ApiParam("任务来源")
+    private Integer taskSource;
+
+    @ApiParam("通知标识")
+    private Integer notifyFlag;
+
+    @ApiParam("关联任务")
+    private String relateTask;
+
+    @ApiParam("通知类型")
+    private Integer notifyType;
+
+    @ApiParam("通知条件（小时）")
+    private Integer notifyCondition;
+
+    @ApiParam("通知对象")
+    private String notifyObjectCode;
+
+    @ApiParam("通知方式")
+    private Integer notifyPattern;
+
+    @ApiParam("对象值")
+    private String notifyObjectValue;
+
+    @ApiParam("组织代码")
+    public String organizeCode;
+
+    @ApiParam("作业类型")
+    private String taskTypeName;
+
+    @ApiParam("作业状态")
+    private String taskStatusName;
+
+    @ApiParam("任务来源")
+    private String taskSourceName;
+
+    @ApiParam("通知标识")
+    private String notifyFlagName;
+
+    @ApiParam("通知类型")
+    private Integer notifyTypeName;
+
+    @ApiParam("通知方式")
+    private Integer notifyPatternName;
+
+
+    public MesEquTaskNotifyModel() {
+
+    }
+
+    public MesEquTaskNotifyModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, Integer notifyFlag, String relateTask, Integer notifyType, Integer notifyCondition, String notifyObjectCode, Integer notifyPattern, String notifyObjectValue, String organizeCode) {
+        this.id = id;
+        this.taskNo = taskNo;
+        this.taskType = taskType;
+        this.taskStatus = taskStatus;
+        this.workCenterCode = workCenterCode;
+        this.planTime = planTime;
+        this.taskSource = taskSource;
+        this.notifyFlag = notifyFlag;
+        this.relateTask = relateTask;
+        this.notifyType = notifyType;
+        this.notifyCondition = notifyCondition;
+        this.notifyObjectCode = notifyObjectCode;
+        this.notifyPattern = notifyPattern;
+        this.notifyObjectValue = notifyObjectValue;
+        this.organizeCode = organizeCode;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquNotifyObjectCfgRepository.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.MesEquNotifyObjectCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesEquNotifyObjectCfgRepository extends BaseRepository<MesEquNotifyObjectCfg, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskNotifyCfgRepository.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.MesEquTaskNotifyCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesEquTaskNotifyCfgRepository extends BaseRepository<MesEquTaskNotifyCfg, Long> {
+}

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

@@ -1400,6 +1400,7 @@ public class MesHqlPack {
     }
 
     /**
+<<<<<<< Updated upstream
      * MES 缺陷查询条件封装
      * @param mesDefect
      * @param organizeCode
@@ -1439,6 +1440,54 @@ public class MesHqlPack {
         return packBean;
     }
 
+
+    /** 设备通知对象配置 查询条件封装
+     * @param mesEquNotifyObjectCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquNotifyObjectCfg(MesEquNotifyObjectCfg mesEquNotifyObjectCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquNotifyObjectCfg, organizeCode);
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectCode(), "notifyObjectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectName())) {
+            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectName(), "notifyObjectName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectValue())) {
+            DdlPreparedPack.getStringLikerPack(mesEquNotifyObjectCfg.getNotifyObjectValue(), "notifyObjectValue", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquNotifyObjectCfg.getNotifyObjectType())) {
+            DdlPreparedPack.getNumEqualPack(mesEquNotifyObjectCfg.getNotifyObjectType(), "notifyObjectType", packBean);
+        }
+        return packBean;
+    }
+
+    /** 设备作业通知配置  查询条件封装
+     * @param mesEquTaskNotifyCfg
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesEquTaskNotifyCfg(MesEquTaskNotifyCfg mesEquTaskNotifyCfg, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquTaskNotifyCfg, organizeCode);
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyObjectCode())) {
+            DdlPreparedPack.getStringLikerPack(mesEquTaskNotifyCfg.getNotifyObjectCode(), "notifyObjectCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getTaskType())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getTaskType(), "taskType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyType())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getNotifyType(), "notifyType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyCondition())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getNotifyCondition(), "notifyCondition", packBean);
+        }
+        if (!StringUtils.isEmpty(mesEquTaskNotifyCfg.getNotifyPattern())) {
+            DdlPreparedPack.getNumEqualPack(mesEquTaskNotifyCfg.getNotifyPattern(), "notifyPattern", packBean);
+        }
+        return packBean;
+    }
+
     /**
      * MES 类型信息查询条件封装
      * @param mesTypeCfg

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java

@@ -154,6 +154,12 @@ public class UserDetailModel extends BaseBean {
     @ApiParam(value ="用户所有组织信息")
     private List<String> infoOrganizeIdList;
 
+    @ApiParam(value ="账号ID集合信息")
+    private List<String> userIdList;
+
+    @ApiParam(value ="用户ID集合信息")
+    private List<String> userInfoIdList;
+
     public SysUser getSysUser(){
         SysUser user = new SysUser();
         user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null);

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java

@@ -1,10 +1,10 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description 冲销Model
@@ -18,5 +18,5 @@ public class WmsWriteOffModel implements Serializable {
     private static final long serialVersionUID = -5490167040159056107L;
     private String locateNo;
     private List<String> snList;
-    private List<Map<String, Object>> summaryList;
+    private List<WmsMoveSn> summaryList;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -524,10 +524,13 @@ public class CoreHqlPack {
         DdlPackBean result = DdlPackBean.getDdlPackBean(user);
 
         DdlPreparedPack.getNumEqualPack(user.getUserStatus(),"userStatus",result);
+        DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
+
         DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
         DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
         DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
+        DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
 
         DdlPreparedPack.getInPackList(idList,"id",result);
         result.setOrderByStr(user.orderBy());
@@ -651,6 +654,10 @@ public class CoreHqlPack {
         DdlPreparedPack.getStringEqualPack(userInfo.getOrganizeCode(),"organizeCode",result);
         DdlPreparedPack.getInPackList(idList,"id",result);
 
+        if(userInfo.getDepartmentIdList() != null && userInfo.getDepartmentIdList().size() > 0){
+            DdlPreparedPack.getInPackList(userInfo.getDepartmentIdList(),"departmentId",result);
+        }
+
         // Like
         DdlPreparedPack.getStringLikerPack(userInfo.getName(),"name",result);
         DdlPreparedPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);

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

@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 物料清单模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2019/10/22 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="领料单模板",description = "领料单模板")
+public class WmsBomTemplate extends BaseBean {
+
+    private static final long serialVersionUID = 2167743108452607611L;
+
+    @ApiParam(value = "父物料号")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "父物料描述")
+    @AnnoOutputColumn
+    private String partName;
+
+    @ApiParam(value = "父计量单位")
+    @AnnoOutputColumn
+    private String unit;
+
+    @ApiParam(value = "父级数量")
+    @AnnoOutputColumn
+    private Double qty;
+
+    @ApiParam(value = "子物料号")
+    @AnnoOutputColumn
+    private String itemPartNo;
+
+    @ApiParam(value = "子物料描述")
+    @AnnoOutputColumn
+    private String itemPartName;
+
+    @ApiParam(value = "子计量单位")
+    @AnnoOutputColumn
+    private String itemUnit;
+
+    @ApiParam(value = "子用量")
+    @AnnoOutputColumn
+    private Double itemQty;
+
+    @ApiParam(value = "BOM编号")
+    @AnnoOutputColumn
+    private String bomNum;
+
+    @ApiParam(value = "BOM版本号")
+    @AnnoOutputColumn
+    private String bomVersion;
+
+    @ApiParam(value = "有效起始日期")
+    @AnnoOutputColumn
+    private String effStartTime;
+
+    @ApiParam(value = "有效截止日期")
+    @AnnoOutputColumn
+    private String effEndTime;
+
+}

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

@@ -202,10 +202,12 @@ public class WmsMoveSn extends BaseBean {
     public WmsMoveSn() {
     }
 
-    public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) {
+    public WmsMoveSn(String partNo, String partNameRdd, String unit, String lotNo, Double qty) {
         this.partNo = partNo;
-        this.waitingCounts = waitingCounts;
-        this.finishedCounts = finishedCounts;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.lotNo = lotNo;
+        this.qty = qty;
     }
 
     public Long getWaitingCounts() {
@@ -216,6 +218,12 @@ public class WmsMoveSn extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
+    public WmsMoveSn(String partNo, String lotNo, Double qty) {
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.qty = qty;
+    }
+
     public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -38,6 +38,9 @@ public class WmsVendorPart extends BaseBean {
     @ApiParam(value = "物料号")
     private String partNo;
 
+    @Column(name = "VENDOR_PART_NO")
+    @ApiParam(value = "供应商物料号")
+    private String vendorPartNo;
 
     @Transient
     @ApiParam("物料名称")