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

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : ANDON_呼叫原因
@@ -47,5 +48,13 @@ public class AndonAlarmCause extends BaseBean {
     @ApiParam(value = "呼叫原因描述")
     private String acName;
 
+    @Transient
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam(value = "工作单元")
+    private String workCellCode;
+
 
 }

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

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+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 : ANDON_工作单元呼叫原因配置
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-08-22 11:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_CELL_ALARM_CAUSE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_工作单元呼叫原因配置")
+public class AndonCellAlarmCause extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @Column(name = "AC_CODE")
+    @ApiParam(value = "呼叫原因代码")
+    private String acCode;
+
+
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.andon.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 : ANDON_工作单元事件原因配置
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-08-22 11:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_CELL_EVENT_CAUSE")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_工作单元事件原因配置")
+public class AndonCellEventCause extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @Column(name = "EC_CODE")
+    @ApiParam(value = "事件原因代码")
+    private String ecCode;
+
+
+}

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

@@ -0,0 +1,50 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
+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 : ANDON_工作单元处理方法配置
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-08-22 11:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_CELL_EVENT_METHOD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_工作单元处理方法配置")
+public class AndonCellEventMethod extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @Column(name = "EM_CODE")
+    @ApiParam(value = "事件方法代码")
+    private String emCode;
+
+
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.andon.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 : ANDON_工作单元事件现象
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-08-22 11:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_CELL_EVENT_PHENOMENON")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_工作单元事件现象")
+public class AndonCellEventPhenomenon extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam(value = "工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam(value = "工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+
+    @Column(name = "EPM_CODE")
+    @ApiParam(value = "事件现象代码")
+    private String epmCode;
+
+
+}

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : ANDON_事件原因
@@ -46,4 +47,12 @@ public class AndonEventCause extends BaseBean {
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
     private String alarmCode;
+
+    @Transient
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam(value = "工作单元")
+    private String workCellCode;
 }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : ANDON_事件处理方法
@@ -46,4 +47,12 @@ public class AndonEventMethod extends BaseBean {
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
     private String alarmCode;
+
+    @Transient
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam(value = "工作单元")
+    private String workCellCode;
 }

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

@@ -13,6 +13,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : ANDON_事件现象
@@ -42,4 +43,12 @@ public class AndonEventPhenoMenon extends BaseBean {
     @Column(name = "ALARM_CODE")
     @ApiParam(value = "安灯类型")
     private String alarmCode;
+
+    @Transient
+    @ApiParam(value = "工作中心")
+    private String workCenterCode;
+
+    @Transient
+    @ApiParam(value = "工作单元")
+    private String workCellCode;
 }

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellAlarmCauseRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : ANDON_工作单元呼叫原因配置
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-08-22 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonCellAlarmCauseRepository extends BaseRepository<AndonCellAlarmCause, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventCauseRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventCause;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : ANDON_工作单元事件原因配置
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-08-22 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonCellEventCauseRepository extends BaseRepository<AndonCellEventCause, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventMethodRetository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventMethod;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : ANDON_工作单元处理方法配置
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-08-22 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonCellEventMethodRetository extends BaseRepository<AndonCellEventMethod, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonCellEventPhenomenonRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellAlarmCause;
+import cn.estsh.i3plus.pojo.andon.bean.AndonCellEventPhenomenon;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : ANDON_工作单元事件现象
+ * @Reference :
+ * @Author : crish.li
+ * @CreateDate : 2019-08-22 11:07
+ * @Modify:
+ **/
+@Repository
+public interface IAndonCellEventPhenomenonRepository extends BaseRepository<AndonCellEventPhenomenon, Long> {
+}

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/annotation/AnnoOutputColumn.java

@@ -1,7 +1,5 @@
 package cn.estsh.i3plus.pojo.base.annotation;
 
-import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

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

@@ -209,8 +209,11 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYS_LOCALE_RESOURCE_TYPE {
-        COMMON(1, "通用"),EXCEPTION(2, "异常"),
+        COMMON(1, "通用"),
-        MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"),
+        EXCEPTION(2, "异常"),
+        MODULE(10, "模块"),
+        METHOD(11, "功能"),
+        BUTTON(12, "按钮"),
         WEB(13, "前端");
 
         private int value;

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

@@ -1022,7 +1022,8 @@ public class ImppEnumUtil {
         PASSWORD(2, "密码安全策略"),
         MAIL(3, "邮件配置"),
         CONTACT(4, "联系人"),
-        BASIS(5, "基础");
+        BASIS(5, "基础"),
+        CONFIG(6, "系统配置");
 
         private int value;
         private String description;

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

@@ -12,6 +12,78 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * mes条码生成规则最大值后是否循环
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NUMBER_RULE_ISCYCLE {
+
+        TRUE(1, "是"),
+        FALSE(2, "否");
+
+        private int value;
+        private String description;
+
+        NUMBER_RULE_ISCYCLE(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;
+        }
+    }
+
+    /**
+     * 关键件条码规则信息绑定规则
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BIND_RULE {
+
+        COOPERATION_PART(0, "外协件"),
+        SELF_CONTROL_PART(1, "自制件");
+
+        private int value;
+        private String description;
+
+        BIND_RULE(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;
+        }
+    }
+
+    /**
      * 质量状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -757,8 +829,8 @@ public class MesEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CONFIG_TYPE {
 
-        FASTDFS_SAVE_PATH(10, "savePath");
+        FASTDFS_SAVE_PATH(10, "savePath"),
-
+        NGINX_IP(20,"nginxIp");
 
         private int value;
         private String description;
@@ -787,6 +859,7 @@ public class MesEnumUtil {
         }
     }
 
+
     /**
      * 事件类型枚举
      */
@@ -824,5 +897,39 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 条码生成业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COMPANY_TYPE {
+        PREFIX("prefix", "前缀"),
+        PART_NO("partNo", "物料号"),
+        CUST_PART_NO("custPartNo", "客户物料号"),
+        CUST_CODE("custCode", "客户代码"),
+        PROD_LOCATION("prodLocation", "产地"),
+        YEAR("year", "年"),
+        MOTH("month", "月"),
+        DAY("day", "日"),
+        HOUR("hour", "小时"),
+        MINUTE("minute", "分钟"),
+        SECOND("second", "秒"),
+        SERIAL("serialNo", "序列号");
+
+        private String value;
+        private String description;
+
+        COMPANY_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
 
 }

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

@@ -10,6 +10,44 @@ import com.fasterxml.jackson.annotation.JsonFormat;
  * @Modify:
  **/
 public class MesPcnEnumUtil {
+
+    /**
+     * mes-pcn定时任务同步结果状态
+     * 10.
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PCN_TASK_SYNC_STATUS{
+
+        SUCCESS(1,"mes主服务定时任务工作清单同步成功"),
+        ERROR(2,"mes主服务定时任务工作清单同步失败");
+
+        private int value;
+        private String description;
+
+        MES_PCN_TASK_SYNC_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;
+        }
+    }
+
     /**
      * PCN同步MES主数据同步方式枚举
      * 10.
@@ -83,4 +121,78 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * PCN 缓存名称
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PCN_CACHE {
+
+        PCH_EHCACHE(10, "PCN_EHCACHE");
+
+        private int value;
+        private String description;
+
+        PCN_CACHE(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;
+        }
+    }
+
+
+    /**
+     * MesProduceSn实体对应的printStatus值  条码表条码打印状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCE_SN_PRINT_STATUS {
+
+        CREATE(10, "创建"),
+        ONLINE(20, "上线打印"),
+        OFFLINE(30, "下线打印");
+
+        private int value;
+        private String description;
+
+        PRODUCE_SN_PRINT_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;
+        }
+    }
+
 }

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

@@ -82,4 +82,73 @@ public class SoftSwitchEnumUtil {
         }
     }
 
+    /**
+     * 认证方式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VERIFICATION_METHOD{
+        LOGIN(1,"登录");
+
+        private int value;
+        private String description;
+
+        VERIFICATION_METHOD(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;
+        }
+    }
+
+    /**
+     * 认证类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum KEY_TYPE{
+        ACCOUNT_PASSWORD(1,"账号密码");
+
+        private int value;
+        private String description;
+
+        KEY_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;
+        }
+    }
+
+    //keyTypeId
 }

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

@@ -1139,8 +1139,7 @@ public class WmsEnumUtil {
         CREATE(10, "创建"),
         BE_HANDLE(20, "待处理"),
         FINISH(30, "已处理"),
-        HANDLE_ERROR(40, "处理出错"),
+        HANDLE_ERROR(40, "处理出错");
-        TEST(50, "调试");
 
         private int value;
         private String description;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/iface/IResultSetCall.java

@@ -10,6 +10,7 @@ import java.sql.SQLException;
  * @CreateDate : 2019-06-11 16:12
  * @Modify:
  **/
+@FunctionalInterface
 public interface IResultSetCall<T> {
 
     /**

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -25,7 +25,7 @@ import java.util.*;
  * @Modify:
  **/
 public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRepository<T, ID>
-                                                            implements BaseRepository<T, ID> {
+        implements BaseRepository<T, ID> {
     public static final Logger LOGGER = LoggerFactory.getLogger(BaseRepositoryImpl.class);
 
     /**
@@ -391,8 +391,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
 
         return query.setFirstResult(offset)
-                 .setMaxResults(pageSize)
+                .setMaxResults(pageSize)
-                 .getResultList();
+                .getResultList();
     }
 
     @Override
@@ -607,8 +607,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         if(pager.getTotalRows() > 0){
             String queryString = "from " + persistentClass.getSimpleName() + " as model where model." + propertyName + "= :" + propertyName + " " + orderByStuff;
             return entityManager.createQuery(queryString)
-                        .setParameter(propertyName, value)
+                    .setParameter(propertyName, value)
-                        .getResultList();
+                    .getResultList();
         }else{
             return new ArrayList<T>();
         }
@@ -671,7 +671,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public List<T> findByHqlWhere(DdlPackBean packBean) {
         Query query = entityManager.createQuery("from " + persistentClass.getSimpleName()
-                                    + " as model where 1=1 " + packBean.getPackedHql());
+                + " as model where 1=1 " + packBean.getPackedHql());
 
         for (String key : packBean.getHqlPreparedMap().keySet()) {
             query.setParameter("m_" + key,packBean.getHqlPreparedMap().get(key));
@@ -958,9 +958,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public List<?> findBySqlPage(String sql, Class entity, Pager pager) {
         if(pager.getTotalRows() > 0){
             return entityManager.createNativeQuery(sql,entity)
-                        .setFirstResult(pager.getStartRow())
+                    .setFirstResult(pager.getStartRow())
-                        .setMaxResults(pager.getPageSize())
+                    .setMaxResults(pager.getPageSize())
-                        .getResultList();
+                    .getResultList();
         }else{
             return new ArrayList();
         }
@@ -975,8 +975,8 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public int findBySqlCount(String sql) {
         try{
             Long count = (Long) entityManager
-                        .createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Long.class)
+                    .createNativeQuery("select count(*) from ( " + sql + " ) as usertable",Long.class)
-                        .getSingleResult();
+                    .getSingleResult();
             return count == null ? 0 : count.intValue();
         }catch(NoResultException e){
             return 0;
@@ -1081,9 +1081,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
             queryString.append(" " + orderByStuff);
 
             return entityManager.createQuery(queryString.toString())
-                            .setFirstResult(pager.getStartRow())
+                    .setFirstResult(pager.getStartRow())
-                            .setMaxResults(pager.getPageSize())
+                    .setMaxResults(pager.getPageSize())
-                            .getResultList();
+                    .getResultList();
         }else{
             return new ArrayList<T>();
         }
@@ -1140,9 +1140,9 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     public List<Object[]> findBySqlObjListByPager(String sql, Pager pager) {
         if(pager.getTotalRows() > 0){
             return entityManager.createNativeQuery(sql)
-                        .setFirstResult(pager.getStartRow())
+                    .setFirstResult(pager.getStartRow())
-                        .setMaxResults(pager.getPageSize())
+                    .setMaxResults(pager.getPageSize())
-                        .getResultList();
+                    .getResultList();
         }else{
             return new ArrayList<Object[]>();
         }

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

@@ -531,4 +531,5 @@ public class DdlPreparedPack {
         }
         return name;
     }
+
 }

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

@@ -9,12 +9,13 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 打印模板
  * @Reference :
- * @Author : siliter
+ * @Author : crish
- * @CreateDate : 2019-03-18 11:00
+ * @CreateDate : 2019-08-18 11:00
  * @Modify:
  **/
 @Data
@@ -22,7 +23,7 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="Mes_LABEL_TEMPLATE")
+@Table(name="MES_LABEL_TEMPLATE")
 @Api(value="打印模板",description = "打印模板")
 public class MesLabelTemplate extends BaseBean {
 
@@ -44,4 +45,8 @@ public class MesLabelTemplate extends BaseBean {
     @ApiParam(value ="模板参数拼接")
     @Transient
     private String paramsPack;
+
+    @Transient
+    @ApiParam(value ="模板id对应的模板参数")
+    private List<MesLabelTemplateParam> labelTemplateParamList;
 }

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

@@ -15,8 +15,8 @@ import javax.persistence.*;
 /**
  * @Description : 打印模板参数
  * @Reference :
- * @Author : siliter
+ * @Author : crish
- * @CreateDate : 2019-03-18 11:00
+ * @CreateDate : 2019-08-18 11:00
  * @Modify:
  **/
 @Data
@@ -24,7 +24,7 @@ import javax.persistence.*;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="Mes_LABEL_TEMPLATE_PARAM")
+@Table(name="MES_LABEL_TEMPLATE_PARAM")
 @Api(value="打印模板参数",description = "打印模板参数")
 public class MesLabelTemplateParam extends BaseBean {
 

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

@@ -0,0 +1,58 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/22 5:59 PM
+ * @Description:
+ **/
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_NUMBER_RULE")
+@Api("条码生成规则")
+public class MesNumberRule extends BaseBean {
+
+    @Column(name = "RULE_CODE")
+    @ApiParam("规则代码")
+    private String ruleCode;
+
+    @Column(name = "RULE_DESC")
+    @ApiParam("规则描述")
+    private String ruleDesc;
+
+    @Column(name = "PREFIX")
+    @ApiParam("前缀")
+    private String prefix;
+
+    @Column(name = "NUMBER_RULE")
+    @ApiParam("编码规则")
+    private String numberRule;
+
+    @Column(name = "SERIALNO_LENGTH")
+    @ApiParam("序号长度")
+    private Integer serialnoLength;
+
+    @Column(name = "SERIALNO_INCREMENT")
+    @ApiParam("增量")
+    private Integer serialnoIncrement;
+
+    @Column(name = "IS_CYCLE")
+    @ApiParam("最大值后循环")
+    private Integer isCycle;
+}

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

@@ -0,0 +1,41 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 9:14 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_NUMBER_SERIALNO")
+@Api("编码序号")
+public class MesNumberSerialno extends BaseBean {
+
+    @Column(name = "CURRENT_NUMBER_PREFIX")
+    @ApiParam("当前编号前缀")
+    private String currentNumberPrefix;
+
+    @Column(name = "CURRENT_SERIALNO")
+    @ApiParam("当前序号")
+    private Integer currentSerialno;
+
+    @Column(name = "CURRENT_NUMBER")
+    @ApiParam("当前编号")
+    private String currentNumber;
+}

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

@@ -0,0 +1,75 @@
+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 :mes-pcn定时任务工作清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-26
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_TASK")
+@Api("mes-pcn定时任务工作清单")
+public class MesPcnTask extends BaseBean {
+
+    @Column(name="TASK_CODE")
+    @ApiParam("任务代码")
+    private String taskCode;
+
+    @Column(name="TASK_NAME")
+    @ApiParam("任务名称")
+    private String taskName;
+
+    @Column(name="TASK_DESCRIPTION")
+    @ApiParam("任务描述")
+    private String taskDescription;
+
+    @Column(name="TASK_TYPE")
+    @ApiParam("任务类型")
+    private Integer taskType;
+
+    @Column(name="TASK_MODULE")
+    @ApiParam("任务模块")
+    private String taskModule;
+
+    @Column(name="TASK_CLASS")
+    @ApiParam("任务类名")
+    private String taskClass;
+
+    @Column(name="TASK_PACKAGE")
+    @ApiParam("任务包名")
+    private String taskPackage;
+
+    @Column(name="PCN_NAME")
+    @ApiParam("PCN节点名称")
+    private String pcnName;
+
+    @Column(name="TASK_CYCLE_EXPS")
+    @ApiParam("任务周期表达式")
+    private String taskCycleExps;
+
+    @Column(name="TASK_CYCLE_DESCRIPTION")
+    @ApiParam("任务周期描述")
+    private String taskCycleDescription;
+
+    public int getTaskTypeVal() {
+        return this.taskType == null ? 0 : this.taskType;
+    }
+}

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

@@ -0,0 +1,51 @@
+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 :mes-pcn定时任务工作清单同步记录
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-27
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_TASK_LOG")
+@Api("mes-pcn定时任务工作清单同步记录")
+public class MesPcnTaskLog extends BaseBean {
+
+    @Column(name="SYNC_TIME_START")
+    @ApiParam("同步数据开始时间")
+    private String syncTimeStart;
+
+    @Column(name="SYNC_TIME_END")
+    @ApiParam("同步数据截止时间")
+    private String syncTimeEnd;
+
+    @Column(name="SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name="ERROR_CONTENT")
+    @ApiParam("异常内容")
+    private String errorContent;
+
+    public int getSyncStatusVal() {
+        return this.syncStatus == null ? 0 : this.syncStatus;
+    }
+}

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

@@ -62,4 +62,8 @@ public class MesProdRouteOptParam extends BaseBean {
     public int getStepSeq() {
         return this.stepSeq == null ? 0 : this.stepSeq;
     }
+
+    public void setStepSeq(int stepSeq) {
+        this.stepSeq = stepSeq;
+    }
 }

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

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.pcn.model;
+
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProduceSn;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 打印条码工步， 打印信息模板
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-08-27-13:24
+ * @Modify:
+ **/
+@Data
+@Api("过程条码打印信息模板")
+public class StepPrintSnModel extends MesProduceSn {
+    @ApiParam("打印描述")
+    private String printDesc;
+}

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

@@ -1,17 +1,14 @@
 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.MesArea;
 import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam;
-import org.springframework.stereotype.Repository;
 
 /**
- * @Description :
+ * @Description : 打印模板
- * @Reference :
+ * @Reference   :
- * @Author : jack.jia
+ * @Author      : crish
- * @CreateDate : 2019-04-02
+ * @Date        : 2019-08-18 12:03:01.024
- * @Modify:
+ * @Modify      :
  **/
-@Repository
 public interface MesLabelTemplateParamRepository extends BaseRepository<MesLabelTemplateParam, Long> {
 }

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

@@ -1,17 +1,14 @@
 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.MesArea;
 import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
-import org.springframework.stereotype.Repository;
 
 /**
- * @Description :
+ * @Description : 打印模板
- * @Reference :
+ * @Reference   :
- * @Author : jack.jia
+ * @Author      : crish
- * @CreateDate : 2019-04-02
+ * @Date        : 2019-08-18 12:03:01.024
- * @Modify:
+ * @Modify      :
  **/
-@Repository
 public interface MesLabelTemplateRepository extends BaseRepository<MesLabelTemplate, Long> {
 }

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

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesPcnTaskRepository.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.MesPcnTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :mes-pcn定时任务清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-26
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnTaskRepository extends BaseRepository<MesPcnTask, Long> {
+}

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.pcn.sqlpack;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * @Description:
@@ -26,4 +28,24 @@ public class MesHqlPack {
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
         return packBean;
     }
+
+    /**
+     * MES PCN系统配置信息条件查询
+     *
+     * @param mesConfig
+     * @return
+     */
+    public static DdlPackBean getMesConfig(MesConfig mesConfig, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesConfig.getCfgCode())) {
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgCode(), "cfgCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesConfig.getCfgName())) {
+            DdlPreparedPack.getStringLikerPack(mesConfig.getCfgName(), "cfgName", packBean);
+        }
+        if (mesConfig.getIsValid() != null) {
+            DdlPreparedPack.getNumEqualPack(mesConfig.getIsValid(), "isValid", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -0,0 +1,52 @@
+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.*;
+import java.util.List;
+
+/**
+ * @Description : 打印模板
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-08-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_LABEL_TEMPLATE")
+@Api(value="打印模板",description = "打印模板")
+public class MesLabelTemplate extends BaseBean {
+
+    private static final long serialVersionUID = 5371856566557305323L;
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam(value ="模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATE_NAME")
+    @ApiParam(value ="模板名称")
+    private String templateName;
+
+    @Lob
+    @Column(name="TEMPLATE_CONTENT")
+    @ApiParam(value ="模板内容")
+    private String templateContent;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value ="模板参数拼接")
+    @Transient
+    private String paramsPack;
+
+    @Transient
+    @ApiParam(value ="模板id对应的模板参数")
+    private List<MesLabelTemplateParam> labelTemplateParamList;
+}

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

@@ -0,0 +1,54 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+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.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+/**
+ * @Description : 打印模板参数
+ * @Reference :
+ * @Author : crish
+ * @CreateDate : 2019-08-18 11:00
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_LABEL_TEMPLATE_PARAM")
+@Api(value="打印模板参数",description = "打印模板参数")
+public class MesLabelTemplateParam extends BaseBean {
+
+    private static final long serialVersionUID = 6476163540527157643L;
+    @Column(name="TEMPLATE_ID")
+    @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long templateId;
+
+    @Column(name="TEMPLATE_CODE")
+    @ApiParam(value ="模板代码")
+    private String templateCode;
+
+    @Column(name="TEMPLATE_PARAM")
+    @ApiParam(value ="模板参数")
+    private String templateParam;
+
+    @Lob
+    @Column(name="TEMPLATE_PARAM_TEXT")
+    @ApiParam(value ="模板参数描述")
+    private String templateParamText;
+
+    // 参数拼接，多参数都好分隔，后台在做处理
+    @ApiParam(value ="模板参数值")
+    @Transient
+    private String templateParamValue;
+}

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

@@ -0,0 +1,58 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/22 5:59 PM
+ * @Description:
+ **/
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_NUMBER_RULE")
+@Api("条码生成规则")
+public class MesNumberRule extends BaseBean {
+
+    @Column(name = "RULE_CODE")
+    @ApiParam("规则代码")
+    private String ruleCode;
+
+    @Column(name = "RULE_DESC")
+    @ApiParam("规则描述")
+    private String ruleDesc;
+
+    @Column(name = "PREFIX")
+    @ApiParam("前缀")
+    private String prefix;
+
+    @Column(name = "NUMBER_RULE")
+    @ApiParam("编码规则")
+    private String numberRule;
+
+    @Column(name = "SERIALNO_LENGTH")
+    @ApiParam("序号长度")
+    private Integer serialnoLength;
+
+    @Column(name = "SERIALNO_INCREMENT")
+    @ApiParam("增量")
+    private Integer serialnoIncrement;
+
+    @Column(name = "IS_CYCLE")
+    @ApiParam("最大值后循环")
+    private Integer isCycle;
+}

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

@@ -0,0 +1,41 @@
+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;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 9:14 AM
+ * @Description:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_NUMBER_SERIALNO")
+@Api("编码序号")
+public class MesNumberSerialno extends BaseBean {
+
+    @Column(name = "CURRENT_NUMBER_PREFIX")
+    @ApiParam("当前编号前缀")
+    private String currentNumberPrefix;
+
+    @Column(name = "CURRENT_SERIALNO")
+    @ApiParam("当前序号")
+    private Integer currentSerialno;
+
+    @Column(name = "CURRENT_NUMBER")
+    @ApiParam("当前编号")
+    private String currentNumber;
+}

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

@@ -0,0 +1,50 @@
+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: crish
+ * @CreateDate:2019-08-23-17:20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_SYNC_ERRORLOG")
+@Api("MES_PCN同步异常日志")
+public class MesPcnSyncErrorLog extends BaseBean {
+    @Column(name="PCN_CODE")
+    @ApiParam("PCN代码")
+    private String pcnCode;
+
+    @Column(name="OBJECT_CODE")
+    @ApiParam("对象代码")
+    private String objectCode;
+
+    @Column(name="OBJECT_NAME")
+    @ApiParam("对象名称")
+    private String objectName;
+
+    @Column(name="ERROR_SPOT")
+    @ApiParam("异常位置")
+    private String errorSpot;
+
+    @Column(name="ERROR_CONTENT")
+    @ApiParam("异常内容")
+    private String errorContent;
+
+}

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

@@ -0,0 +1,75 @@
+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 :mes-pcn定时任务工作清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-26
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PCN_TASK")
+@Api("mes-pcn定时任务工作清单")
+public class MesPcnTask extends BaseBean {
+
+    @Column(name="TASK_CODE")
+    @ApiParam("任务代码")
+    private String taskCode;
+
+    @Column(name="TASK_NAME")
+    @ApiParam("任务名称")
+    private String taskName;
+
+    @Column(name="TASK_DESCRIPTION")
+    @ApiParam("任务描述")
+    private String taskDescription;
+
+    @Column(name="TASK_TYPE")
+    @ApiParam("任务类型")
+    private Integer taskType;
+
+    @Column(name="TASK_MODULE")
+    @ApiParam("任务模块")
+    private String taskModule;
+
+    @Column(name="TASK_CLASS")
+    @ApiParam("任务类名")
+    private String taskClass;
+
+    @Column(name="TASK_PACKAGE")
+    @ApiParam("任务包名")
+    private String taskPackage;
+
+    @Column(name="PCN_NAME")
+    @ApiParam("PCN节点名称")
+    private String pcnName;
+
+    @Column(name="TASK_CYCLE_EXPS")
+    @ApiParam("任务周期表达式")
+    private String taskCycleExps;
+
+    @Column(name="TASK_CYCLE_DESCRIPTION")
+    @ApiParam("任务周期描述")
+    private String taskCycleDescription;
+
+    public int getTaskTypeVal() {
+        return this.taskType == null ? 0 : this.taskType;
+    }
+}

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

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -65,10 +66,12 @@ public class MesPlanOrder extends BaseBean {
     private Integer status;
 
     @Column(name="START_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam("计划开始时间")
     private String startTime;
 
     @Column(name="END_TIME")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam("计划结束时间")
     private String endTime;
 

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

@@ -73,6 +73,10 @@ public class MesProdRouteOptParam extends BaseBean {
         return this.stepSeq == null ? 0 : this.stepSeq;
     }
 
+    public void setStepSeq(int stepSeq) {
+        this.stepSeq = stepSeq;
+    }
+
     public int getParamTypeVal() {
         return this.paramType == null ? 0 : this.paramType;
     }

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

@@ -147,23 +147,23 @@ public class MesWorkOrder extends BaseBean {
     public String prodCfgName;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
     public String startTimeStart;
 
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59")
     public String startTimeEnd;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59")
     public String endTimeStart;
 
     @Transient
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 

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

@@ -10,7 +10,7 @@ import lombok.NoArgsConstructor;
 /**
  * @Author: Wynne.Lu
  * @CreateDate: 2019/8/19 7:00 PM
- * @Description:
+ * @Description: mes文件下载的model -> Esop
  **/
 
 @Data
@@ -26,6 +26,9 @@ public class FastDfsDownloadModel {
     private String fileName;
 
     @ApiParam("文件字节")
-    private byte[] fileByte;
+    private String fileByte;
+
+    @ApiParam("文件url")
+    private String url;
 
 }

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

@@ -0,0 +1,70 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule;
+import cn.estsh.i3plus.pojo.mes.bean.MesNumberSerialno;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 11:42 AM
+ * @Description:
+ **/
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("生成条码模型")
+public class GenSerialNoModel extends BaseBean {
+
+    @ApiParam("规则代码")
+    private String ruleCode;
+
+    @ApiParam("规则描述")
+    private String ruleDesc;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("客户物料号")
+    private String custPartNo;
+
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @ApiParam("产地")
+    private String prodLocation;
+
+    @ApiParam("前缀")
+    private Integer prefix;
+
+    @ApiParam("编码规则")
+    private String numberRule;
+
+    @ApiParam("序号长度")
+    private Integer serialnoLength;
+
+    @ApiParam("增量")
+    private Integer serialnoIncrement;
+
+    @ApiParam("最大值后循环")
+    private Integer isCycle;
+
+    @ApiParam("当前编号前缀")
+    private String currentNumberPrefix;
+
+    @ApiParam("当前序号")
+    private Integer currentSerialno;
+
+    @ApiParam("当前编号")
+    private String currentNumber;
+
+
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+/**
+ * @Description: PCN连接状态统计Model
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-08-07-14:56
+ * @Modify:
+ **/
+public class MesPcnStatusModel {
+
+    private int healthNodeNumber;
+
+    private int illNodeNumber;
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam;
+
+/**
+ * @Description : 打印模板
+ * @Reference   :
+ * @Author      : crish
+ * @Date        : 2019-08-18 12:03:01.024
+ * @Modify      :
+ **/
+public interface MesLabelTemplateParamRepository extends BaseRepository<MesLabelTemplateParam, Long> {
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate;
+
+/**
+ * @Description : 打印模板
+ * @Reference   :
+ * @Author      : crish
+ * @Date        : 2019-08-18 12:03:01.024
+ * @Modify      :
+ **/
+public interface MesLabelTemplateRepository extends BaseRepository<MesLabelTemplate, Long> {
+}

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

@@ -16,7 +16,4 @@ import java.util.List;
 @Repository
 public interface MesMethodRepository extends BaseRepository<MesMethod, Long> {
 
-    List<MesMethod> findByMethodCodeAndIsValidAndIsDeleted(String methodCode, Integer isValid, Integer isDeleted);
-
-    List<MesMethod> findByOrganizeCodeAndIsDeleted(String organizeCode, int value);
 }

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesNumberRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 1:22 PM
+ * @Description:
+ **/
+@Repository
+public interface MesNumberRuleRepository extends BaseRepository<MesNumberRule, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesNumberSerialnoRepository.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.MesNumberSerialno;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/8/23 1:23 PM
+ * @Description:
+ **/
+
+@Repository
+public interface MesNumberSerialnoRepository extends BaseRepository<MesNumberSerialno, Long> {
+}

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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.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.MesPcnTask;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :mes-pcn定时任务清单
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-08-26
+ * @Modify:
+ **/
+@Repository
+public interface MesPcnTaskRepository extends BaseRepository<MesPcnTask, Long> {
+}

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

@@ -75,7 +75,7 @@ public class MesHqlPack {
             DdlPreparedPack.getNumEqualPack(mesPlanOrder.getStatus(), "status", packBean);
         }
         if (StringUtils.isNotEmpty(mesPlanOrder.getCreateUser())) {
-            DdlPreparedPack.getStringEqualPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
+            DdlPreparedPack.getStringLikerPack(mesPlanOrder.getCreateUser(), "createUser", packBean);
         }
 
         // 时间段查询
@@ -161,7 +161,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
         }
         if (mesWorkOrder.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
@@ -234,6 +234,14 @@ public class MesHqlPack {
         return packBean;
     }
 
+    public static DdlPackBean getAllBaseDataByNormalPro(String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        return packBean;
+    }
+
     /**
      * MES区域信息查询条件封装
      *
@@ -345,7 +353,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
         if (StringUtils.isNotEmpty(shift.getShiftCode())) {
-            DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
+            DdlPreparedPack.getStringLikerPack(shift.getShiftCode(), "shiftCode", packBean);
         }
         if (StringUtils.isNotEmpty(shift.getShiftName())) {
             DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
@@ -445,13 +453,26 @@ public class MesHqlPack {
      * @param mesESOP
      * @return
      */
+    public static DdlPackBean getMesESOPExcludeById(MesESOP mesESOP, String org) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(org);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getProcessCode(), "processCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getStepCode(), "stepCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesESOP.getStepSeq(), "stepSeq", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(mesESOP.getId(), "id", packBean);
+        return packBean;
+    }
+
     public static DdlPackBean getMesESOP(MesESOP mesESOP, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesESOP, organizeCode);
         if (StringUtils.isNotEmpty(mesESOP.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesESOP.getWorkCenterCode(), "workCenterCode", packBean);
         }
         if (StringUtils.isNotEmpty(mesESOP.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(mesESOP.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(mesESOP.getPartNo(), "partNo", packBean);
         }
 
         return packBean;
@@ -603,7 +624,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesProcess(MesProcess process, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(process, organizeCode);
         if (StringUtils.isNotEmpty(process.getProcessCode())) {
-            DdlPreparedPack.getStringEqualPack(process.getProcessCode(), "processCode", packBean);
+            DdlPreparedPack.getStringLikerPack(process.getProcessCode(), "processCode", packBean);
         }
         if (StringUtils.isNotEmpty(process.getProcessName())) {
             DdlPreparedPack.getStringLikerPack(process.getProcessName(), "processName", packBean);
@@ -621,7 +642,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesStep(MesStep step, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(step, organizeCode);
         if (StringUtils.isNotEmpty(step.getStepCode())) {
-            DdlPreparedPack.getStringEqualPack(step.getStepCode(), "stepCode", packBean);
+            DdlPreparedPack.getStringLikerPack(step.getStepCode(), "stepCode", packBean);
         }
         if (StringUtils.isNotEmpty(step.getStepName())) {
             DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
@@ -645,7 +666,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(stepParam.getStepCode(), "stepCode", packBean);
         }
         if (StringUtils.isNotEmpty(stepParam.getParamCode())) {
-            DdlPreparedPack.getStringEqualPack(stepParam.getParamCode(), "paramCode", packBean);
+            DdlPreparedPack.getStringLikerPack(stepParam.getParamCode(), "paramCode", packBean);
         }
         if (StringUtils.isNotEmpty(stepParam.getParamName())) {
             DdlPreparedPack.getStringLikerPack(stepParam.getParamName(), "paramName", packBean);
@@ -687,13 +708,13 @@ public class MesHqlPack {
     public static DdlPackBean getMesBom(MesBom bom, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode);
         if (StringUtils.isNotEmpty(bom.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(bom.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(bom.getItemPartNo())) {
-            DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean);
+            DdlPreparedPack.getStringLikerPack(bom.getItemPartNo(), "itemPartNo", packBean);
         }
         if (StringUtils.isNotEmpty(bom.getBomVersion())) {
-            DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", packBean);
+            DdlPreparedPack.getStringLikerPack(bom.getBomVersion(), "bomVersion", packBean);
         }
 
         return packBean;
@@ -708,13 +729,13 @@ public class MesHqlPack {
     public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
         if (StringUtils.isNotEmpty(processBom.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(processBom.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(processBom.getItemPartNo())) {
-            DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean);
+            DdlPreparedPack.getStringLikerPack(processBom.getItemPartNo(), "itemPartNo", packBean);
         }
         if (StringUtils.isNotEmpty(processBom.getProcessCode())) {
-            DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean);
+            DdlPreparedPack.getStringLikerPack(processBom.getProcessCode(), "processCode", packBean);
         }
 
         return packBean;
@@ -729,7 +750,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
         if (StringUtils.isNotEmpty(customer.getCustomerCode())) {
-            DdlPreparedPack.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean);
+            DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean);
         }
         if (StringUtils.isNotEmpty(customer.getCustomerName())) {
             DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
@@ -747,7 +768,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode);
         if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())) {
-            DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean);
+            DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean);
         }
         if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())) {
             DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean);
@@ -768,10 +789,10 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean);
         }
         if (StringUtils.isNotEmpty(customerPart.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(customerPart.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())) {
-            DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
+            DdlPreparedPack.getStringLikerPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
         }
 
         return packBean;
@@ -786,10 +807,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
         if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) {
-            DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
+            DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
         }
         if (StringUtils.isNotEmpty(keyData.getKeyDataName())) {
-            DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean);
+            DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean);
         }
 
         return packBean;
@@ -804,10 +825,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode);
         if (StringUtils.isNotEmpty(kpData.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(kpData.getKeyDataCode())) {
-            DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
+            DdlPreparedPack.getStringLikerPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
         }
 
         return packBean;
@@ -822,10 +843,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode);
         if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())) {
-            DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
+            DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
         }
         if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())) {
-            DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
+            DdlPreparedPack.getStringLikerPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
         }
 
         return packBean;
@@ -834,13 +855,23 @@ public class MesHqlPack {
     /**
      * MES 产品配置信息查询条件封装
      *
-     * @param prodCfg
+     * @param
      * @return
      */
+
+    public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(org);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumNOEqualPack(mesProdRouteCfg.getId(), "id", packBean);
+        return packBean;
+    }
+
     public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
         if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())) {
-            DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
+            DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
         }
         if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())) {
             DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean);
@@ -864,7 +895,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean);
         }
         if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(prodCfgDetail.getPartNo(), "partNo", packBean);
         }
 
         return packBean;
@@ -879,7 +910,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesPart(MesPart part, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
         if (StringUtils.isNotEmpty(part.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(part.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(part.getPartName())) {
             DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
@@ -906,7 +937,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesPartCategory(MesPartCategory partCategory, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(partCategory, organizeCode);
         if (StringUtils.isNotEmpty(partCategory.getCategoryCode())) {
-            DdlPreparedPack.getStringEqualPack(partCategory.getCategoryCode(), "categoryCode", packBean);
+            DdlPreparedPack.getStringLikerPack(partCategory.getCategoryCode(), "categoryCode", packBean);
         }
         if (StringUtils.isNotEmpty(partCategory.getCategoryName())) {
             DdlPreparedPack.getStringLikerPack(partCategory.getCategoryName(), "categoryName", packBean);
@@ -924,7 +955,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesPackSpec(MesPackSpec packSpec, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(packSpec, organizeCode);
         if (StringUtils.isNotEmpty(packSpec.getSpecCode())) {
-            DdlPreparedPack.getStringEqualPack(packSpec.getSpecCode(), "specCode", packBean);
+            DdlPreparedPack.getStringLikerPack(packSpec.getSpecCode(), "specCode", packBean);
         }
         if (StringUtils.isNotEmpty(packSpec.getSpecName())) {
             DdlPreparedPack.getStringLikerPack(packSpec.getSpecName(), "specName", packBean);
@@ -945,7 +976,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesProduceCategory(MesProduceCategory produceCategory, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(produceCategory, organizeCode);
         if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryCode())) {
-            DdlPreparedPack.getStringEqualPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean);
+            DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryCode(), "produceCategoryCode", packBean);
         }
         if (StringUtils.isNotEmpty(produceCategory.getProduceCategoryName())) {
             DdlPreparedPack.getStringLikerPack(produceCategory.getProduceCategoryName(), "produceCategoryName", packBean);
@@ -963,7 +994,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesKpsnRule(MesKpsnRule kpsnRule, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(kpsnRule, organizeCode);
         if (StringUtils.isNotEmpty(kpsnRule.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(kpsnRule.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(kpsnRule.getPartNo(), "partNo", packBean);
         }
 
         return packBean;
@@ -978,7 +1009,7 @@ public class MesHqlPack {
     public static DdlPackBean getMesPartScheduleBom(MesPartScheduleBom partScheduleBom, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(partScheduleBom, organizeCode);
         if (StringUtils.isNotEmpty(partScheduleBom.getPartNo())) {
-            DdlPreparedPack.getStringEqualPack(partScheduleBom.getPartNo(), "partNo", packBean);
+            DdlPreparedPack.getStringLikerPack(partScheduleBom.getPartNo(), "partNo", packBean);
         }
         if (StringUtils.isNotEmpty(partScheduleBom.getItemPartNo())) {
             DdlPreparedPack.getStringLikerPack(partScheduleBom.getItemPartNo(), "itemPartNo", packBean);
@@ -996,10 +1027,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesObjectDao(MesObjectDao objectDao, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(objectDao, organizeCode);
         if (StringUtils.isNotEmpty(objectDao.getObjectCode())) {
-            DdlPreparedPack.getStringEqualPack(objectDao.getObjectCode(), "objectCode", packBean);
+            DdlPreparedPack.getStringLikerPack(objectDao.getObjectCode(), "objectCode", packBean);
         }
         if (StringUtils.isNotEmpty(objectDao.getDaoClass())) {
-            DdlPreparedPack.getStringEqualPack(objectDao.getDaoClass(), "daoClass", packBean);
+            DdlPreparedPack.getStringLikerPack(objectDao.getDaoClass(), "daoClass", packBean);
         }
 
         return packBean;
@@ -1014,10 +1045,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesPcnSyncCfg(MesPcnSyncCfg pcnSyncCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(pcnSyncCfg, organizeCode);
         if (StringUtils.isNotEmpty(pcnSyncCfg.getObjectCode())) {
-            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
+            DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getObjectCode(), "objectCode", packBean);
         }
         if (StringUtils.isNotEmpty(pcnSyncCfg.getPcnCode())) {
-            DdlPreparedPack.getStringEqualPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
+            DdlPreparedPack.getStringLikerPack(pcnSyncCfg.getPcnCode(), "pcnCode", packBean);
         }
         if (null != pcnSyncCfg.getSyncType()) {
             DdlPreparedPack.getNumEqualPack(pcnSyncCfg.getSyncType(), "syncType", packBean);
@@ -1035,10 +1066,10 @@ public class MesHqlPack {
     public static DdlPackBean getMesWorkCellParamCfg(MesWorkCellParamCfg workCellParamCfg, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(workCellParamCfg, organizeCode);
         if (StringUtils.isNotEmpty(workCellParamCfg.getWorkCellCode())) {
-            DdlPreparedPack.getStringEqualPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
+            DdlPreparedPack.getStringLikerPack(workCellParamCfg.getWorkCellCode(), "workCellCode", packBean);
         }
         if (StringUtils.isNotEmpty(workCellParamCfg.getParamCode())) {
-            DdlPreparedPack.getStringEqualPack(workCellParamCfg.getParamCode(), "paramCode", packBean);
+            DdlPreparedPack.getStringLikerPack(workCellParamCfg.getParamCode(), "paramCode", packBean);
         }
 
         return packBean;
@@ -1077,4 +1108,49 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+
+    /**
+     * Mes条码生成规则
+     * @param numberRule
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesNumberRule(MesNumberRule numberRule, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(numberRule, organizeCode);
+        if (StringUtils.isNotEmpty(numberRule.getRuleCode())) {
+            DdlPreparedPack.getStringLikerPack(numberRule.getRuleCode(), "ruleCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(numberRule.getNumberRule())) {
+            DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean);
+        }
+        if (StringUtils.isNotEmpty(numberRule.getPrefix())) {
+            DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean);
+        }
+        if (null != numberRule.getIsCycle()) {
+            DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean);
+        }
+
+        packBean.setOrderByStr(numberRule.orderBy());
+        return packBean;
+    }
+
+    /**
+     * mes-pcn定时任务清单
+     * @param mesPcnTask
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
+        if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) {
+            DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
+        }
+
+        packBean.setOrderByStr(mesPcnTask.orderBy());
+        return packBean;
+    }
 }

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 获取打印模板和打印模板参数表的所有信息
+ * @Reference:
+ * @Author: Crish
+ * @CreateDate:2019-08-23-11:38
+ * @Modify:
+ **/
+@Data
+class LabelTemplateAndParamModel implements Serializable {
+    private static final long serialVersionUID = -3612131411549787983L;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java

@@ -48,7 +48,7 @@ public class SuitCoreModel {
     private String suitCaseStatusCode;
 
     /**
-     * 安全证书
+     * 适配认证
      */
     private BsSslKey sslKey;
 
@@ -62,6 +62,8 @@ public class SuitCoreModel {
      */
     private BsSuitCase bsSuitCase;
 
+    private Object bsSuitCaseDetail;
+
     /**
      * 认证结果
      */
@@ -86,7 +88,7 @@ public class SuitCoreModel {
     /**
      *
      * @param requestSource 请求来源
-     * @param sslKey 安全证书对象
+     * @param sslKey 适配认证对象
      * @param bsSuitCase 适配器信息
      */
     public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) {

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

@@ -1,5 +1,7 @@
-package cn.estsh.i3plus.pojo.wms.bean;
+package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsOptionModel;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -43,19 +45,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     public String message;
 
     @ApiParam("列表信息")
-    public List<String> informations;
+    public List<WmsMessageStyleModel> informations;
-    public List<String> getInformations(){
-        if(informations == null){
-            informations= new ArrayList<>();
-        }
-        return informations;
-    }
-    public void setInformation(List<String> list){
-        if(list == null){
-            list = new ArrayList<>();
-        }
-        informations = list;
-    }
 
     @ApiParam("可选项")
     public List<WmsOptionModel> options;
@@ -88,50 +78,42 @@ public class WmsActionResponseBean<Obj> implements Serializable {
      */
     @ApiParam(value = "是否需要选择单号")
     public Boolean toSelected = false;
-
-    /**
-     * 默认为true，如果这个值为true就禁用按钮否则可用，
-     */
-    @ApiParam(value = "按钮是否禁用")
-    public Boolean isBtnDisabled = true;
-
-    /**
-     * 默认为true，如果这个值为true就禁用按钮否则可用，
-     */
-    @ApiParam(value = "按钮是否禁用")
-    public Boolean isDetailsBtnDisabled = true;
-
     /**
-     * 默认为true，如果这个值为true就禁用按钮否则可用，
+     * 与 toSelected 属性配合使用，
+     * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
      */
-    @ApiParam(value = "按钮是否禁用")
+    @ApiParam(value = "关键字段列名")
-    public Boolean isCommitBtnDisabled = true;
+    public String keyColumn;
-
     /**
      * 默认为true，如果这个值为true就禁用按钮否则可用，
      */
     @ApiParam(value = "输入框是否禁用")
     public Boolean isInputBtnDisabled = false;
 
-    /**
-     * 与 toSelected 属性配合使用，
-     * 选择数据后把选中行的 keyColumn 字段的值写入界面输入框并触发回车事件
-     */
-    @ApiParam(value = "关键字段列名")
-    public String keyColumn;
-
-    @ApiParam(value = "是否完成流程操作")
-    public Boolean isComplete = false;
-
     @ApiParam(value = "交易类型信息")
     public WmsTransType wmsTransType;
 
+    @ApiParam(value = "是否自动开窗")
+    public Boolean isAutoOpenWindow = false;
+
+    @ApiParam(value = "正则校验")
+    private String regularCheck;
+
+    @ApiParam(value = "正则校验失败提示")
+    private String regularCheckFailMsg;
+
+    @ApiParam(value = "搜索KEY")
+    public String searchKey;
+
+    @ApiParam(value = "分组KEY")
+    public String groupKey;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;
     }
 
-    public WmsActionResponseBean(String percent, String message, List<String> informations, Obj details, Boolean codeStatus, Map<String, Obj> barCode) {
+    public WmsActionResponseBean(String percent, String message, List<WmsMessageStyleModel> informations, Obj details, Boolean codeStatus, Map<String, Obj> barCode) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;
@@ -140,7 +122,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
         this.barCode = barCode;
     }
 
-    public WmsActionResponseBean(String percent, String message, List<String> informations, Obj details, Boolean codeStatus) {
+    public WmsActionResponseBean(String percent, String message, List<WmsMessageStyleModel> informations, Obj details, Boolean codeStatus) {
         this.percent = percent;
         this.message = message;
         this.informations = informations;
@@ -148,8 +130,7 @@ public class WmsActionResponseBean<Obj> implements Serializable {
         this.codeStatus = codeStatus;
     }
 
-    public WmsActionResponseBean(String percent, String message, List<String> informations, Obj details, Boolean codeStatus, Boolean isBtnDisabled) {
+    public WmsActionResponseBean(String percent, String message, List<WmsMessageStyleModel> informations, Obj details, Boolean codeStatus, Boolean isBtnDisabled) {
-        this.isBtnDisabled = isBtnDisabled;
         this.percent = percent;
         this.message = message;
         this.informations = informations;

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 消息样式实体类
+ * @Reference
+ * @Author dragon
+ * @CreateDate 2019/8/26 10:36
+ * @Modify
+ */
+@Data
+public class WmsMessageStyleModel implements Serializable {
+    private static final long serialVersionUID = -810847996371452831L;
+    @ApiParam("任务状态")
+    public Integer taskStatus;
+    @ApiParam("单据明细状态")
+    public Integer odStatus;
+
+    @ApiParam("消息")
+    public String message;
+
+    @ApiParam("前景色")
+    public String foregroundColor;
+    @ApiParam("背景色")
+    public String backgroundColor;
+    @ApiParam("是否粗体")
+    public boolean isBold;
+    @ApiParam("是否斜体")
+    public boolean isItalics;
+    @ApiParam("字号")
+    public Integer fontSize;
+
+    public WmsMessageStyleModel() {
+    }
+
+    public WmsMessageStyleModel(String message) {
+        this.message = message;
+    }
+
+    public WmsMessageStyleModel(String message, double transQty, double actQty) {
+        this.message = message;
+        if (actQty == 0) {//未处理
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue();
+        } else if (actQty > 0) {
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
+        } else if (actQty == transQty) {
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
+        }
+    }
+}

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

@@ -18,7 +18,6 @@ public class WmsTaskInfoModel implements Serializable {
     private static final long serialVersionUID = 8755413052807531167L;
     @ApiParam("任务单号")
     public String orderNo;
-    @Column(name = "TRANS_TYPE_CODE")
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
@@ -28,6 +27,7 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam("作业类型名称")
     public String opTypeName;
 
+    @Column(name = "TRANS_TYPE_CODE")
     @ApiParam(value = "交易类型代码")
     private String transTypeCode;
 
@@ -53,6 +53,9 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "供应商编号")
     private String vendorNo;
 
+    @ApiParam(value = "样式")
+    private WmsMessageStyleModel wmsMessageStyleModel;
+
     public WmsTaskInfoModel() {
     }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java

@@ -48,6 +48,12 @@ public class SessionUser implements Serializable {
     @ApiParam("用户对象信息")
     private SysUserInfo userInfo;
 
+    @ApiParam("列表默认分页数量配置")
+    private Integer[] pageSizeArray;
+
+    @ApiParam("列表默认分页数量")
+    private Integer pageDefaultSize;
+
     public SessionUser() {
     }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import org.hibernate.annotations.Type;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 打印模板
@@ -42,7 +43,11 @@ public class SysLabelTemplate extends BaseBean {
     private String templateContent;
 
     // 参数拼接，多参数都好分隔，后台在做处理
-    @ApiParam(value ="模板参数拼接")
     @Transient
+    @ApiParam(value ="模板参数拼接")
     private String paramsPack;
+
+    @Transient
+    @ApiParam(value ="模板id对应的模板参数")
+    private List<SysLabelTemplateParam> labelTemplateParamList;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskPlan.java

@@ -132,4 +132,11 @@ public class SysTaskPlan extends BaseBean {
     @Column(name = "NOTICE_CHANNEL")
     @ApiParam(value = "通知渠道")
     private String noticeChannel;
+
+    public int getTaskPlanStatusVal() {
+        if(taskPlanStatus != null){
+            return taskPlanStatus.intValue();
+        }
+        return taskPlanStatus;
+    }
 }

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

@@ -7,6 +7,8 @@ import cn.estsh.i3plus.pojo.base.tool.HqlPack;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -859,6 +861,22 @@ public class CoreHqlPack {
         return result.toString();
     }
 
+    public static DdlPackBean packBeanSysLabelTemplate(SysLabelTemplate sysLabelTemplate) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLabelTemplate);
+
+        // hql拼接
+        DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateName(),"templateName",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getTemplateCode(),"templateCode",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(sysLabelTemplate.getOrganizeCode(),"organizeCode",ddlPackBean);
+
+        DdlPreparedPack.timeBuilder(sysLabelTemplate.getModifyDateTimeStart(), sysLabelTemplate.getModifyDateTimeEnd(), "modifyDatetime", ddlPackBean, true);
+
+        // 添加默认排序
+        HqlPack.getOrderDefault(sysLabelTemplate);
+
+        return ddlPackBean;
+    }
+
     /**
      * 打印模板参数复杂查询
      * @param sysLabelTemplateParam

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java

@@ -64,7 +64,7 @@ public class BsParamAdapter extends BaseBean {
     private String transferParamName;
 
     @Column(name = "TRANSFER_PARAM_VAL_TYPE_ID")
-    @ApiParam(value = "转换参数类型")
+    @ApiParam(value = "转换参数值类型")
     private Integer transferParamValTypeId;
 
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java

@@ -10,6 +10,8 @@ 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 : socket套件
@@ -34,6 +36,5 @@ public class BsSocketSuitCase extends BaseBean {
     @Column(name = "SOCKET_MODE_ID")
     @ApiParam(value = "socket模式(枚举,服务端，客户端)")
     private Integer socketModeId;
-
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java

@@ -17,7 +17,7 @@ import javax.persistence.Transient;
 import java.util.List;
 
 /**
- * @Description : 安全证书
+ * @Description : 适配认证
  * @Reference :
  * @Author : yunhao
  * @CreateDate : 2019-08-13 9:21
@@ -29,9 +29,13 @@ import java.util.List;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "BS_SSL_KEY")
-@Api(value = "安全证书", description = "安全证书")
+@Api(value = "适配认证", description = "适配认证")
 public class BsSslKey extends BaseBean {
 
+    @Column(name = "KEY_NAME")
+    @ApiParam(value = "证书名称")
+    private String keyName;
+
     @Column(name = "VERIFICATION_METHOD_ID")
     @ApiParam(value = "认证方式(枚举)")
     private Integer verificationMethodId;
@@ -40,13 +44,9 @@ public class BsSslKey extends BaseBean {
     @ApiParam(value = "认证url")
     private String verificationUrl;
 
-    @Column(name = "KEY_TYPE")
+    @Column(name = "KEY_TYPE_ID")
     @ApiParam(value = "证书类型枚举")
-    private Integer keyType;
+    private Integer keyTypeId;
-
-    @Column(name = "KEY_NAME")
-    @ApiParam(value = "证书名称")
-    private String keyName;
 
     @Column(name = "KEY_FILE_ID")
     @ApiParam(value = "证书文件id")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKeyParam.java

@@ -16,7 +16,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 
 /**
- * @Description : 安全证书参数
+ * @Description : 适配认证参数
  * @Reference :
  * @Author : yunhao
  * @CreateDate : 2019-08-13 9:21
@@ -28,7 +28,7 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "BS_SSL_KEY_PARAM")
-@Api(value = "安全证书参数", description = "安全证书参数")
+@Api(value = "适配认证参数", description = "适配认证参数")
 @XStreamAlias("BsSslKeyParam")
 public class BsSslKeyParam extends BaseBean {
 
@@ -45,4 +45,8 @@ public class BsSslKeyParam extends BaseBean {
     @ApiParam(value = "参数值")
     private String paramValue;
 
+    @Column(name = "PARAM_DESCRIPTION")
+    @ApiParam(value = "参数描述")
+    private String paramDescription;
+
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -95,9 +95,13 @@ public class BsSuitCase extends BaseBean {
     private Integer failNum;
 
     @Column(name = "SUIT_CASE_DESCRIPTION")
-    @ApiParam(value = "适配类型描述")
+    @ApiParam(value = "适配器描述")
     private String suitCaseDescription;
 
+    @Column(name = "SUIT_CASE_STATUS")
+    @ApiParam(value = "适配器状态")
+    private Integer suitCaseStatus;
+
     @Transient
     @ApiParam(value = "适配器参数")
     List<BsSuitCaseParam> bsSuitCaseParamList;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java

@@ -51,9 +51,9 @@ public class BsSuitCaseParam extends BaseBean {
     @ApiParam(value = "参数值类型")
     private Integer paramValTypeId;
 
-    @Column(name = "PARAM_DEFAULT_VAL")
+    @Column(name = "PARAM_DEFAULT_VALUE")
     @ApiParam(value = "参数默认值")
-    private String paramDefaultVal;
+    private String paramDefaultValue;
 
     @Column(name = "PARAM_DESCRIPTION")
     @ApiParam(value = "参数描述")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -59,6 +59,10 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配方式id枚举")
     private Integer suitMethodId;
 
+    @Column(name = "SUIT_METHOD_NAME_RDD")
+    @ApiParam(value = "适配方式名称枚举")
+    private Integer suitMethodNameRdd;
+
     @Column(name = "SUIT_TYPE_ID")
     @ApiParam(value = "适配类型id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecordParam.java

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "SUIT_RECORD_PARAM")
 @Api(value = "适配记录参数", description = "适配记录参数")
-public class SuitRecordParam extends BaseBean {
+public class BsSuitRecordParam extends BaseBean {
 
     @Column(name = "SUIT_RECORD_ID")
     @ApiParam(value = "适配记录id")

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyParamRepository.java

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.softswitch.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKeyParam;
+
+/**
+ * @Description : 安全证书参数
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2019-08-21 17:47
+ * @Modify:
+ **/
+public interface BsSslKeyParamRepository extends BaseRepository<BsSslKeyParam, Long> {
+}

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java

@@ -5,7 +5,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey;
 import org.springframework.stereotype.Repository;
 
 /**
- * @Description : 安全证书
+ * @Description : 适配认证
  * @Reference :
  * @Author : yunhao
  * @CreateDate : 2019-08-13 9:21

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordParamRepository.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.pojo.softswitch.repository;
 
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
-import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecordParam;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface SuitRecordParamRepository extends BaseRepository<SuitRecordParam,Long> {
+public interface BsSuitRecordParamRepository extends BaseRepository<BsSuitRecordParam,Long> {
 
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -177,7 +177,7 @@ public class SoftSwitchHqlPack {
     }
 
     /**
-     * 安全证书查询条件分页
+     * 适配认证查询条件分页
      * @param bsSslKey 查询条件
      * @return
      */
@@ -185,7 +185,7 @@ public class SoftSwitchHqlPack {
         DdlPackBean ddlPackBean = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
-        DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyType(),"keyType",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean);
 
         ddlPackBean.setOrderByStr(bsSslKey.orderBy());
 
@@ -193,7 +193,7 @@ public class SoftSwitchHqlPack {
     }
 
     /**
-     * 安全证书唯一校验
+     * 适配认证唯一校验
      * @param bsSslKey
      * @return
      */
@@ -206,4 +206,66 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * 适配认证参数按条件查询
+     * @param bsSslKeyParam 查询条件
+     * @return
+     */
+    public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bsSslKeyParam.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 适配认证参数唯一校验
+     * @param bsSslKeyParam
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据源查询条件封装
+     * @param bsDataSource
+     * @return
+     */
+    public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsDataSource.getDataSourceTypeId(), "dataSourceTypeId", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsDataSource.getIsValid(), "isValid", ddlPackBean);
+
+        ddlPackBean.setOrderByStr(bsDataSource.orderBy());
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据源唯一校验
+     * @param bsDataSource
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){
+        DdlPackBean ddlPackBean = new DdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }

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

@@ -75,15 +75,15 @@ public class WmsActionGroup extends BaseBean {
     private Integer submitStepSeq;
 
     public long getInitAmIdVal() {
-        return this.initAmId == null ? 0 : this.initAmId.intValue();
+        return this.initAmId == null ? 0 : this.initAmId.longValue();
     }
 
     public long getDetailsAmIdVal() {
-        return this.detailsAmId == null ? 0 : this.detailsAmId.intValue();
+        return this.detailsAmId == null ? 0 : this.detailsAmId.longValue();
     }
 
     public long getEndAmIdVal() {
-        return this.endAmId == null ? 0 : this.endAmId.intValue();
+        return this.endAmId == null ? 0 : this.endAmId.longValue();
     }
 
     public int getAutoInitVal() {

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

@@ -61,6 +61,14 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "长度检查", example = "0")
     private Integer lenCheck;
 
+    @Column(name = "REGULAR_CHECK")
+    @ApiParam(value = "正则校验")
+    private String regularCheck;
+
+    @Column(name = "REGULAR_CHECK_FAIL_MSG")
+    @ApiParam(value = "正则校验失败提示")
+    private String regularCheckFailMsg;
+
     @Column(name = "AS_ID")
     @ApiParam(value = "作业步骤", example = "0")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -100,6 +108,16 @@ public class WmsActionGroupDetails extends BaseBean {
     @ApiParam(value = "是否可提交", example = "2")
     private Integer isCommitAble;
 
+    @Column(name = "IS_AUTO_OPEN_WINDOW")
+    @ApiParam(value = "是否自动开窗", example = "2")
+    private Integer isAutoOpenWindow;
+
+    @ApiParam(value = "搜索KEY")
+    public String searchKey;
+
+    @ApiParam(value = "分组KEY")
+    public String groupKey;
+
     public int getSeqVal() {
         return this.seq == null ? 0 : this.seq;
     }
@@ -112,10 +130,6 @@ public class WmsActionGroupDetails extends BaseBean {
         return this.okSeq == null ? 0 : this.okSeq;
     }
 
-    public int getPreShowVal() {
-        return this.preShow == null ? 0 : this.preShow;
-    }
-
     public long getShowAmIdVal() {
         return this.showAmId == null ? 0 : this.showAmId;
     }
@@ -124,6 +138,10 @@ public class WmsActionGroupDetails extends BaseBean {
         return this.isCommitAble == null ? 0 : this.isCommitAble;
     }
 
+    public int getIsAutoOpenWindowVal() {
+        return this.isAutoOpenWindow == null ? 0 : this.isAutoOpenWindow;
+    }
+
     public int getValueTypeVal() {
         return this.valueType == null ? 0 : this.valueType;
     }

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

@@ -121,7 +121,7 @@ public class WmsCSOrderDetails extends BaseBean {
      */
     @Transient
     @ApiParam("差异类型")
-    public String differenceType;
+    public Integer differenceType;
 
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 库位表
@@ -96,6 +97,11 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "零件数", example = "-1")
     private Double partQty;
 
+    // 导入用
+    @ApiParam(value = "工厂")
+    @Transient
+    private String factory;
+
     public Integer getMaxPackageQty() {
         return this.maxPackageQty == null ? 0 : this.maxPackageQty.intValue();
     }

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

@@ -145,6 +145,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("交易类型名称")
     private String transTypeName;
 
+    @Transient
+    @ApiParam("业务类型编码")
+    private Integer busiTypeCode;
+
     public WmsMoveDetails(){}
 
     public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@@ -173,7 +177,7 @@ public class WmsMoveDetails extends BaseBean {
     public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
             ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
                           String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
-                          Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){
+                          Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo,Integer busiTypeCode){
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.orderNo = orderNo;
@@ -194,6 +198,6 @@ public class WmsMoveDetails extends BaseBean {
         this.refSrc = refSrc;
         this.vendorNo = vendorNo;
         this.custNo = custNo;
-
+        this.busiTypeCode = busiTypeCode;
     }
 }

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

@@ -155,7 +155,7 @@ public class WmsMoveSn extends BaseBean {
 
     @Transient
     @ApiParam("业务类型编码")
-    private String busiTypeCode;
+    private Integer busiTypeCode;
 
 
     @Transient
@@ -194,7 +194,7 @@ public class WmsMoveSn extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
-    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String busiTypeCode,  String transTypeCode, String refSrc) {
+    public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode,  String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.destQty = destQty;
@@ -211,7 +211,7 @@ public class WmsMoveSn extends BaseBean {
     }
     public  WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
             String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
-            Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo){
+            Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn){
             this.organizeCode=organizeCode;
             this.orderNo=orderNo;
             this.item=item;
@@ -235,6 +235,7 @@ public class WmsMoveSn extends BaseBean {
             this.refSrc = refSrc;
             this.destZoneNo = destZoneNo;
             this.destWhNo =destWhNo;
-
+            this.busiTypeCode = busiTypeCode;
+            this.sn = sn;
 }
 }

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

@@ -47,4 +47,14 @@ public class WmsPickingMovement extends BaseBean {
     @ApiParam(value = "工厂")
     @AnnoOutputColumn
     private String factory;
+
+    @ApiParam(value = "计划日期")
+    @AnnoOutputColumn
+    private String planDate;
+
+    @ApiParam(value = "计划时间")
+    @AnnoOutputColumn
+    private String planTime;
+
+
 }

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

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -26,7 +23,10 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_TASK")
+@Table(name = "WMS_TASK",indexes = {
+        @Index(columnList = "TASK_STATUS"),
+        @Index(columnList = "TRANS_TYPE_CODE")
+})
 @Api("作业任务表")
 public class WmsTaskInfo extends BaseBean {
 
@@ -81,4 +81,31 @@ public class WmsTaskInfo extends BaseBean {
     @Column(name = "IS_CHECK_SN")
     @ApiParam("是否校验条码")
     public Integer isCheckSn;
+
+    @Transient
+    @ApiParam("计划日期")
+    private String zdate;
+
+    @Transient
+    @ApiParam("计划时间")
+    private String ztime;
+
+    @Transient
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
+    @Transient
+    @ApiParam(value = "供应商编号")
+    private String vendorNo;
+
+    public WmsTaskInfo(){};
+
+    public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){
+        this.orderNo = orderNo;
+        this.taskStatus = taskStatus;
+        this.zdate = zdate;
+        this.ztime = ztime;
+        this.custNo = custNo;
+        this.vendorNo = vendorNo;
+    }
 }

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.wms.bean.iotio;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description : IOT 配置表
+ * @Reference :
+ * @Author : Rock.Yu
+ * @CreateDate : 2019-08-21 18:04
+ * @Modify:
+ **/
+@Data
+public class SysIotConfig implements Serializable {
+
+    private static final long serialVersionUID = 2228817197928571545L;
+
+    private Integer ruid;
+    private String fsbUrl;
+    private String fsbType;
+    private String requesterSystem;
+    private String topicName;
+    private String publishCode;
+    private String interfaceCode;
+    private String tableName;
+    private String columnName;
+    private String seq;
+    private String guid;
+    private String groupColumn;
+    private String uniqueColumn;
+    private String orderColumn;
+    private String organizeCode;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -40,10 +40,15 @@ public class WmsHqlPack {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
-        // 封装有效状态和删除状态
+        // 封装有效状态、删除状态、创建人和创建时间
         DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
+        DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
+        if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){
+            DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true);
+        }
+
         return hqlStr;
     }
 
@@ -124,9 +129,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestZoneNo(), "destZoneNo", result);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getDestLocateNo(), "destLocateNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsDocMovementDetails.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsDocMovementDetails.getCreateDateTimeStart(),
-                wmsDocMovementDetails.getCreateDateTimeEnd(), "createDatetime", result, true);
         getStringBuilderPack(wmsDocMovementDetails, result);
 
         return result;
@@ -165,7 +167,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", packBean);
         DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", packBean);
         DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getCustNo(), "custNo", packBean);
-        DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCreateUser(),"createUser",packBean);
 
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
@@ -206,8 +207,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
-        DdlPreparedPack.getStringLikerPack(wmsPOMaster.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsPOMaster.getCreateDateTimeStart(),wmsPOMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
         getStringBuilderPack(wmsPOMaster, result);
 
         return result;
@@ -592,8 +591,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getVersion(), "version", result);
         DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsASNMaster.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsASNMaster.getCreateDateTimeStart(),wmsASNMaster.getCreateDateTimeEnd(),"createDatetime",result,true);
 
         getStringBuilderPack(wmsASNMaster, result);
 
@@ -623,9 +620,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsShipping.getShippingFlag(), "shippingFlag", result);
         //单据来源
         DdlPreparedPack.getStringEqualPack(wmsShipping.getSrc(), "src", result);
-
-        DdlPreparedPack.getStringLikerPack(wmsShipping.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsShipping.getCreateDateTimeStart(),wmsShipping.getCreateDateTimeEnd(),"createDatetime",result,true);
         getStringBuilderPack(wmsShipping, result);
         getStringBuilderPack(wmsShipping, result);
 
@@ -713,8 +707,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
         DdlPreparedPack.getStringEqualPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsFGInStock.getCreateUser(), "createUser", result);
-        DdlPreparedPack.timeBuilder(wmsFGInStock.getCreateDateTimeStart(),wmsFGInStock.getCreateDateTimeEnd(),"createDatetime",result,true);
 
         getStringBuilderPack(wmsFGInStock, result);
 
@@ -912,7 +904,6 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);
-
         getStringBuilderPack(wmsStockQuan, result);
 
         return result;
@@ -1059,11 +1050,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getBusiTypeCode(), "busiTypeCode", result);
-        DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getCreateUser(), "createUser", result);
         DdlPreparedPack.getStringLikerPack(wmsMoveMaster.getModifyUser(), "modifyUser", result);
-
-        DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(),
-                wmsMoveMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
         DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(),
                 wmsMoveMaster.getModifyDateTimeEnd(), "modifyDatetime", result, true);
         getStringBuilderPack(wmsMoveMaster, result);
@@ -1300,7 +1287,8 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderType(), "orderType", result);
         DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getOrderStatus(), "orderStatus", result);
         DdlPreparedPack.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result);
-
+        DdlPreparedPack.timeBuilder(wmsCSOrderMaster.getCreateDateTimeStart(),
+                wmsCSOrderMaster.getCreateDateTimeEnd(), "createDatetime", result, true);
         getStringBuilderPack(wmsCSOrderMaster, result);
 
         return result;