Merge remote-tracking branch 'remotes/origin/test'

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/MesEnumUtil.java

@@ -897,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.
@@ -119,4 +157,42 @@ public class MesPcnEnumUtil {
         }
     }
 
+
+    /**
+     * 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/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/MesNumberRule.java

@@ -38,7 +38,7 @@ public class MesNumberRule extends BaseBean {
 
     @Column(name = "PREFIX")
     @ApiParam("前缀")
-    private Integer prefix;
+    private String prefix;
 
     @Column(name = "NUMBER_RULE")
     @ApiParam("编码规则")

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/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/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/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

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/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

@@ -1,16 +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.MesNumberRule;
-import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import org.springframework.stereotype.Repository;
 
 /**
- * @Description :条码生成规则
+ * @Author: Wynne.Lu
- * @Reference :
+ * @CreateDate: 2019/8/23 1:22 PM
- * @Author : wangjie
+ * @Description:
- * @CreateDate : 2019-08-23
- * @Modify:
  **/
 @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/sqlpack/MesHqlPack.java

@@ -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区域信息查询条件封装
      *
@@ -445,6 +453,19 @@ 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())) {
@@ -834,9 +855,19 @@ 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())) {

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;
 
@@ -88,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,43 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+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;
+    }
+}

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

@@ -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/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-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/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/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/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/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/WmsMoveSn.java

@@ -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 busiTypeCode){
+            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;
@@ -236,5 +236,6 @@ public class WmsMoveSn extends BaseBean {
             this.destZoneNo = destZoneNo;
             this.destWhNo =destWhNo;
             this.busiTypeCode = busiTypeCode;
+            this.sn = sn;
 }
 }