Merge remote-tracking branch 'origin/dev' into dev

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

@@ -2253,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/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

@@ -8,6 +8,9 @@ import java.io.Serializable;
 @Data
 public class MesEquTaskNotifyModel implements Serializable {
 
+    @ApiParam("id")
+    private Long id;
+
     @ApiParam("作业任务编号")
     private String taskNo;
 
@@ -73,7 +76,8 @@ public class MesEquTaskNotifyModel implements Serializable {
 
     }
 
-    public MesEquTaskNotifyModel(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) {
+    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;

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-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -186,7 +186,7 @@ public class WmsMoveSn extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public  Integer lockVersion;
+    public Integer lockVersion;
 
     @Transient
     @ApiParam(value = "快照时间")
@@ -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;