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

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

@@ -25,7 +25,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="ANDON_BRODCAST")
+@Table(name="ANDON_BROADCAST")
 @Api("安灯广播")
 public class AndonBroadCast extends BaseBean {
     @Column(name="DEVICE_NUM")
@@ -71,6 +71,4 @@ public class AndonBroadCast extends BaseBean {
     @Column(name="PLAY_TIME")
     @ApiParam("播放循环次数")
     private Integer playTime = 1;
-
-
 }

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

@@ -28,7 +28,7 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="ANDON_BRODCAST_CFG")
+@Table(name="ANDON_BROADCAST_CFG")
 @Api("生产区域")
 public class AndonBroadCastCfg extends BaseBean {
     @Column(name="ALARM_CODE")

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java

@@ -20,7 +20,7 @@ import java.net.NetworkInterface;
  * @CreateDate : 2018-09-11 16:35
  * @Modify:
  **/
-public class SnowflakeIdMaker {
+public class  SnowflakeIdMaker {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SnowflakeIdMaker.class);
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -11,7 +11,6 @@ import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
 import com.thoughtworks.xstream.io.xml.XppDomDriver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import java.io.Writer;
 import java.lang.reflect.Field;
 

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

@@ -702,7 +702,8 @@ public class AndonEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum NOTICE_MESSAGE_SEND_TYPE {
         SMS("10","短信"),
-        EMAIL("20","邮箱");
+        EMAIL("20","邮箱"),
+        BROAD_CAST("30","广播");
 
         private String value;
         private String description;

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

@@ -116,13 +116,14 @@ public class BlockSoftSwitchEnumUtil {
         SERVER_WEB_SERVICE_HELLO(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240003,"Server Hello测试服务"),
 //        CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"Client IMPP邮件测试"),
         CLIENT_WEB_SERVICE_DEFAULT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140003,"Client 默认设置"),
+        CLIENT_WEB_SERVICE_PARAM_OBJECT(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140004,"Client Param Object"),
 
         /* 数据源 */
         CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"Client 数据库适配服务"),
 
         /* Restful */
         CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"),
-        SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120001,"Client REST服务端适配器"),
+        SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,220001,"Client REST服务端适配器"),
 
         /* Socket */
         SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"),
@@ -216,7 +217,10 @@ public class BlockSoftSwitchEnumUtil {
         SCHEDULE(2,"定时调度"),
         RABBITMQ(3,"MQ 调用"),
         HTTP(4,"接口调用"),
-        CLOUD(5,"Cloud调用");
+        CLOUD(5,"Cloud调用"),
+        REST(6,"REST调用"),
+        WEB_SERVICE(7,"WebService"),
+        SOCKET(8,"socket");
 
         private int value;
         private String description;
@@ -766,4 +770,50 @@ public class BlockSoftSwitchEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 适配报文类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SUIT_DATA_TYPE {
+        XML(10, "XML"),
+        JSON(20,  "JSON");
+
+        private int value;
+        private String description;
+
+        private SUIT_DATA_TYPE (int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static SUIT_DATA_TYPE valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+    }
 }

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

@@ -672,7 +672,8 @@ public class MesEnumUtil {
         OPEN(30, "启动"),
         PAUSE(40, "暂停"),
         CANCEL(50, "取消"),
-        CLOSE(60, "关闭");
+        CLOSE(60, "关闭"),
+        COMPLETE(70, "完成");
 
         private int value;
         private String description;

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

@@ -1256,13 +1256,13 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * redis过期时间
+     * 条码类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PCN_SN_TYPE {
 
-        NORMAL(10, "不过期"),
-        FIRST_INSPECTION(20, "一分钟");
+        NORMAL(10, "正常件"),
+        FIRST_INSPECTION(20, "首检件");
 
         private int value;
         private String description;
@@ -1292,4 +1292,42 @@ public class MesPcnEnumUtil {
     }
 
 
+    /**
+     * MesPlanOrder实体对应的source值  计划来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CACHE_KEY {
+
+        TRAY("TRAY:", "托盘缓存key"),
+
+        SERIAL_NO("PCN_SERIAL:", "条码缓存key");
+
+        private String value;
+        private String description;
+
+        CACHE_KEY(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String 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.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 }

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

@@ -1070,8 +1070,8 @@ public class WmsEnumUtil {
         DAY_INVENTORY(10, "日常盘点"),
         MONTH_INVENTORY(20, "月度盘点"),
         SEASON_INVENTORY(30, "季度盘点"),
-        YEAR_INVENTORY(40, "年度盘点");
-
+        YEAR_INVENTORY(40, "年度盘点"),
+    	AJUST_INVENTORY(50, "库存调整盘点");
         private int value;
         private String description;
 
@@ -3354,7 +3354,6 @@ public class WmsEnumUtil {
         INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
         INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"),
         INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"),
-        INVENTORY_FIT(50, "INVENTORY_FIT", "库位一致"),
         INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘");
 
         private int value;
@@ -3702,5 +3701,111 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+    /**
+     * 物流规则 处理模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTING_RULE_TYPE {
+    	PROMOTION_TYPE(10, "REPLENISH_TYPE", "推动规则"),
+    	REPLENISH_TYPE(20, "PROMOTION_TYPE", "补货规则");
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTING_RULE_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+    /**
+     * 物流规则 处理单位
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTING_DELAY_UNIT {
+    	M(10, "M", "分"),
+        D(20, "D", "天");
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTING_DELAY_UNIT(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
 }

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

@@ -76,9 +76,13 @@ public class MesProcessBom extends BaseBean {
     private Integer isCheck;
 
     @Column(name = "IS_FEED")
-    @ApiParam(value = "是否检查")
+    @ApiParam(value = "是否投料配置")
     private Integer isFeed;
 
+    @Column(name = "is_BIND_KEY")
+    @ApiParam(value = "是否绑定关键件")
+    private Integer isBindKey;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;

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

@@ -0,0 +1,101 @@
+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;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\12 16:33
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_QC_CHECK_DATA")
+@Api("质量过程检测数据")
+public class MesQcCheckData extends BaseBean {
+
+    @Column(name = "CHECK_ID")
+    @ApiParam("检测id")
+    private String checkId;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @Column(name = "CHECK_STANDARD")
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @Column(name = "CHECK_GUIDE")
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @Column(name = "CHECK_FREQUENCY")
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @Column(name = "CHECK_VALUE")
+    @ApiParam("检测值")
+    private String checkValue;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("判定结果")
+    private String checkResult;
+
+    @Column(name = "SN")
+    @ApiParam("产品条码")
+    private String sn;
+
+    @Column(name = "QTY")
+    @ApiParam("产品数量")
+    private String qty;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Transient
+    @ApiParam("过程质量检测数据")
+    private List<MesQcCheckStandard> mesQcCheckStandardList;
+
+}

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

@@ -0,0 +1,76 @@
+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;
+import javax.persistence.Transient;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\12 14:46
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_QC_CHECK_STANDARD")
+@Api("质量检测标准")
+public class MesQcCheckStandard extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @Column(name = "CHECK_STANDARD")
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @Column(name = "CHECK_GUIDE")
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @Column(name = "CHECK_FREQUENCY")
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Transient
+    @ApiParam("检测结果")
+    private String checkResult;
+
+    @Transient
+    @ApiParam("检测值")
+    private String checkValue;
+
+}

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

@@ -61,4 +61,7 @@ public class StationRequestBean implements Serializable {
 
     @ApiParam("工单号")
     private String workOrderNo;
+
+    @ApiParam("托盘号")
+    private String tray;
 }

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

@@ -0,0 +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.MesQcCheckData;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\12 16:43
+ * @Modify:
+ **/
+public interface MesQcCheckDataRepository extends BaseRepository<MesQcCheckData, Long> {
+}

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

@@ -0,0 +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.MesQcCheckStandard;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\12 14:58
+ * @Modify:
+ **/
+public interface MesQcCheckStandardRepository extends BaseRepository<MesQcCheckStandard, Long> {
+}

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

@@ -23,9 +23,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_DB")
+@Table(name = "MES_DATASOURCE")
 @Api("地址清单")
-public class MesDb extends BaseBean {
+public class MesDatasource extends BaseBean {
 
     @Column(name = "DS_CODE")
     @ApiParam("数据源代码")
@@ -59,4 +59,8 @@ public class MesDb extends BaseBean {
     @ApiParam("设备代码")
     private String equipmentCode;
 
+    @Column(name = "DS_DB_NAME")
+    @ApiParam("数据库名称")
+    private String dsDbName;
+
 }

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

@@ -0,0 +1,42 @@
+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: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:56
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FAULT_CAUSE")
+@Api("PLC配置表")
+public class MesFaultCause extends BaseBean {
+
+    @Column(name = "FC_CODE")
+    @ApiParam("故障原因代码")
+    private String fcCode;
+
+    @Column(name = "FC_NAME")
+    @ApiParam("故障原因描述")
+    private String fcName;
+
+    @Column(name = "PARENT_FC_CODE")
+    @ApiParam("父阶原因代码")
+    private String parentFcCode;
+}

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

@@ -0,0 +1,42 @@
+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: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:53
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FAULT_METHOD")
+@Api("PLC配置表")
+public class MesFaultMethod extends BaseBean {
+
+    @Column(name = "FM_CODE")
+    @ApiParam("故障方法代码")
+    private String fmCode;
+
+    @Column(name = "FM_NAME")
+    @ApiParam("故障方法描述")
+    private String fmName;
+
+    @Column(name = "PARENT_FM_CODE")
+    @ApiParam("父阶故障代码")
+    private String parentFmCode;
+}

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

@@ -0,0 +1,42 @@
+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: joke.wang
+ * @CreateDate: 2019\10\10 0010 11:42
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_FAULT_PHENOMENON")
+@Api("PLC配置表")
+public class MesFaultPhenomenon extends BaseBean {
+
+    @Column(name = "FP_CODE")
+    @ApiParam("故障现象代码")
+    private String fpCode;
+
+    @Column(name = "FP_NAME")
+    @ApiParam("故障现象描述")
+    private String fpName;
+
+    @Column(name = "PARENT_FP_CODE")
+    @ApiParam("父阶现象代码")
+    private String parentFpCode;
+}

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

@@ -0,0 +1,91 @@
+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: joke.wang
+ * @CreateDate:2019\10\9 0009
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PLC")
+@Api("PLC配置表")
+public class MesPlc extends BaseBean {
+
+    @Column(name = "PLC_CODE")
+    @ApiParam("PLC代码")
+    private String plcCode;
+
+    @Column(name = "PLC_NAME")
+    @ApiParam("PLC名称")
+    private String plcName;
+
+    @Column(name = "PLC_MODEL")
+    @ApiParam("PLC型号")
+    private String plcModel;
+
+    @Column(name = "PLC_IP")
+    @ApiParam("PLC IP")
+    private String plcIp;
+
+    @Column(name = "CHANNEL")
+    @ApiParam("通道")
+    private String channel;
+
+    @Column(name = "TAG_NAME")
+    @ApiParam("标签名称")
+    private String tagName;
+
+    @Column(name = "TAG_ADDRESS")
+    @ApiParam("标签地址")
+    private String tagAddress;
+
+    @Column(name = "DATA_TYPE")
+    @ApiParam("标签数据类型")
+    private String dataType;
+
+    @Column(name = "GROUP_NAME")
+    @ApiParam("分组名称")
+    private String groupName;
+
+    @Column(name = "EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元")
+    private String workCellCode;
+
+    @Column(name = "PLC_CFG")
+    @ApiParam("PLC的值的设定")
+    private String plcCfg;
+
+    @Column(name = "ANALYSIS_RULE")
+    @ApiParam("解析规则")
+    private String analysisRule;
+
+    @Column(name = "IS_ANALYSIS")
+    @ApiParam("是否解析")
+    private String isAnalysis;
+}

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

@@ -80,9 +80,13 @@ public class MesProcessBom extends BaseBean {
 
 
     @Column(name = "IS_FEED")
-    @ApiParam(value = "是否检查")
+    @ApiParam(value = "是否投料配置")
     private Integer isFeed;
 
+    @Column(name = "is_BIND_KEY")
+    @ApiParam(value = "是否绑定关键件")
+    private Integer isBindKey;
+
     @Transient
     @ApiParam("是否已绑定")
     private Boolean isBind;

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

@@ -0,0 +1,63 @@
+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: joke.wang
+ * @CreateDate: 2019\10\12 14:46
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_QC_CHECK_STANDARD")
+@Api("质量检测标准")
+public class MesQcCheckStandard extends BaseBean {
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料编码")
+    private String partNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @Column(name = "CHECK_ITEM")
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @Column(name = "CHECK_STANDARD")
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @Column(name = "CHECK_GUIDE")
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @Column(name = "CHECK_FREQUENCY")
+    @ApiParam("频率")
+    private String checkFrequency;
+
+}

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

@@ -64,6 +64,27 @@ public class MesEquipmentModel implements Serializable {
     @ApiParam("连接类型")
     private Integer connectType;
 
+    @ApiParam(value ="组织代码")
+    public String organizeCode;
+
+    @ApiParam(value = "有效性")
+    public Integer isValid;
+
+    @ApiParam(value = "是否已删除")
+    public Integer isDeleted;
+
+    @ApiParam(value = "创建用户")
+    public String createUser;
+
+    @ApiParam(value = "创建日期")
+    public String createDatetime;
+
+    @ApiParam(value = "修改人")
+    public String modifyUser;
+
+    @ApiParam(value = "修改日期")
+    public String modifyDatetime;
+
 
     public MesEquipmentModel() {
 
@@ -92,7 +113,7 @@ public class MesEquipmentModel implements Serializable {
 
     }
 
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
@@ -110,5 +131,13 @@ public class MesEquipmentModel implements Serializable {
         this.receiveDate = receiveDate;
         this.enableDate = enableDate;
         this.connectType = connectType;
+        this.organizeCode = organizeCode;
+        this.isValid = isValid;
+        this.isDeleted = isDeleted;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
     }
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesDatasourceRepository.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.MesDatasource;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate:2019\10\9
+ * @Modify:
+ **/
+public interface MesDatasourceRepository extends BaseRepository<MesDatasource,Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultCauseRepository.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.MesFaultCause;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\10 0010 13:08
+ * @Modify:
+ **/
+public interface MesFaultCauseRepository extends BaseRepository<MesFaultCause, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultMethodRepository.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.MesFaultMethod;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\10 0010 13:07
+ * @Modify:
+ **/
+public interface MesFaultMethodRepository extends BaseRepository<MesFaultMethod, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesFaultPhenomenonRepository.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.MesFaultPhenomenon;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\10 0010 13:05
+ * @Modify:
+ **/
+public interface MesFaultPhenomenonRepository extends BaseRepository<MesFaultPhenomenon, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPlcRepository.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.MesPlc;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate:2019\10\9 0009 11:16
+ * @Modify:
+ **/
+public interface MesPlcRepository extends BaseRepository<MesPlc, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcCheckStandardRepository.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.MesQcCheckStandard;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\10\12 0012 14:58
+ * @Modify:
+ **/
+public interface MesQcCheckStandardRepository extends BaseRepository<MesQcCheckStandard, Long> {
+}

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

@@ -129,7 +129,11 @@ public class MesHqlPack {
         if (!StringUtils.isEmpty(mesPart.getCategoryCode3())) {
             DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
         }
-
+        if (!StringUtils.isEmpty(mesPart.getProduceCategoryCode()) && mesPart.getProduceCategoryCode().toUpperCase().equals("WXJ")) {
+            DdlPreparedPack.getStringEqualPack("WXJ", "produceCategoryCode", packBean);
+        } else {
+            DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean);
+        }
         DdlPreparedPack.getOrderDefault(mesPart);
         DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
         return packBean;
@@ -1144,7 +1148,6 @@ public class MesHqlPack {
         return packBean;
     }
 
-
     /**
      * Mes条码生成规则
      *
@@ -1254,4 +1257,162 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * MES Plc设备信息配置查询条件封装
+     * @param mesPlc
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesPlc(MesPlc mesPlc, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesPlc, organizeCode);
+        if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getPlcCode(), "plcCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPlc.getPlcName())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getPlcName(), "plcName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPlc.getChannel())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getChannel(), "channel", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPlc.getTagAddress())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getTagAddress(), "tagAddress", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPlc.getPlcCode())) {
+            DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES DB地址清单查询条件封装
+     * @param mesDatasource
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesDatasource(MesDatasource mesDatasource, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesDatasource, organizeCode);
+        if (!StringUtils.isEmpty(mesDatasource.getDsCode())) {
+            DdlPreparedPack.getStringEqualPack(mesDatasource.getDsCode(), "dsCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDatasource.getDsType())) {
+            DdlPreparedPack.getStringEqualPack(mesDatasource.getDsType(), "dsType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesDatasource.getDsDbName())) {
+            DdlPreparedPack.getStringEqualPack(mesDatasource.getDsDbName(), "dsDbName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 设备故障处理方法查询条件封装
+     * @param mesFaultMethod
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesFaultMethod(MesFaultMethod mesFaultMethod, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultMethod, organizeCode);
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmCode(), "fmCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultMethod.getFmName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultMethod.getFmName(), "fmName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultMethod.getParentFmCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultMethod.getParentFmCode(), "parentFmCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 设备故障原因查询条件封装
+     * @param mesFaultCause
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesFaultCause(MesFaultCause mesFaultCause, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultCause, organizeCode);
+        if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultCause.getFcCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcCode(), "fcCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultCause.getFcName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultCause.getFcName(), "fcName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultCause.getParentFcCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultCause.getParentFcCode(), "parentFcCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 设备故障现象查询条件封装
+     * @param mesFaultPhenomenon
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesFaultPhenomenon(MesFaultPhenomenon mesFaultPhenomenon, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesFaultPhenomenon, organizeCode);
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpCode(), "fpCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getFpName())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getFpName(), "fpName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesFaultPhenomenon.getParentFpCode())) {
+            DdlPreparedPack.getStringEqualPack(mesFaultPhenomenon.getParentFpCode(), "parentFpCode", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 过程质量检验查询条件封装
+     * @param mesQcCheckStandard
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesQcCheckStandard(MesQcCheckStandard mesQcCheckStandard, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesQcCheckStandard, organizeCode);
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getPartNo())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCellCode())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (null == mesQcCheckStandard.getCheckType()) {
+            DdlPreparedPack.getNumberBiggerEqualPack(mesQcCheckStandard.getCheckType(), "checkType", packBean);
+        }
+        if (!StringUtils.isEmpty(mesQcCheckStandard.getCheckItem())) {
+            DdlPreparedPack.getStringEqualPack(mesQcCheckStandard.getCheckItem(), "checkItem", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,6 +42,7 @@ public class SuitClientModel {
     /**
      * 适配记录
      */
+    @XStreamOmitField
     private BsSuitRecord bsSuitRecord;
 
     /**
@@ -87,7 +89,7 @@ public class SuitClientModel {
      * 适配报文
      */
     @XStreamCDATA
-    private String suitResultMessage;
+    private Object suitResultMessage;
 
     public SuitClientModel() {
     }

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

@@ -29,8 +29,11 @@ public class SuitParamModel {
     private String pathKey;
     /* 标签内容 */
     private String vaule;
-    /* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
-    private Integer type;  // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE
+    /**
+     * 标签 内容 类型 暂未定义
+     * 设计思路： type 说明这个字段属于什么类型的值， 例如 Date,BigDecimal 等特殊类型标注
+     */
+    private String type;
 
     /* 标签属性 */
     private Map<String,String> attr;
@@ -38,4 +41,20 @@ public class SuitParamModel {
     private SuitParamModel parent;
     /* 标签子集 */
     private List<SuitParamModel> childList;
+
+    @Override
+    public String toString() {
+        return "SuitParamModel{" +
+                "tagName='" + tagName + '\'' +
+                ", classPath='" + classPath + '\'' +
+                ", methodName='" + methodName + '\'' +
+                ", id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", pathKey='" + pathKey + '\'' +
+                ", vaule='" + vaule + '\'' +
+                ", type=" + type +
+                ", attr=" + attr +
+                ", childList=" + childList +
+                '}';
+    }
 }

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -41,43 +42,43 @@ public class SuitServerModel {
     /**
      * 适配结果信息
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private String suitMessage;
 
     /**
      * 适配状态码
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private String suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
 
     /**
      * 适配结果
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private boolean suitSuccess = true;
 
     /**
      * 适配记录
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private BsSuitRecord bsSuitRecord;
 
     /**
      * 适配器信息
      */
-    @XStreamImplicit
+    @XStreamOmitField
     private BsSuitCaseModel bsSuitCaseModel;
 
     /**
      * 请求来源
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private Integer requestSource;
 
     /**
      * 适配方式
      */
-    @XStreamImplicit
+//    @XStreamImplicit
     private Integer suitMethodId;
 
     public int getSuitMethodIdVal(){
@@ -87,6 +88,6 @@ public class SuitServerModel {
         return suitMethodId.intValue();
     }
 
-    @XStreamImplicit
+//    @XStreamImplicit
     private String analyzeMessage;
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.softswitch.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -103,11 +104,26 @@ public class BsSuitCase extends BaseBean {
         return isNeedCertification.intValue();
     }
 
+    @Column(name = "IS_PUSH_MQ")
+    @ApiParam(value = "是否推送MQ")
+    private Integer isPushMQ;
+
     @Column(name = "SSL_KEY_ID")
     @ApiParam(value = "证书id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long sslKeyId;
 
+    @Column(name = "SUIT_DATA_TYPE")
+    @ApiParam(value = "适配报文类型")
+    private Integer suitDataType;
+
+    public Integer getSuitDataType(){
+        if(suitDataType == null){
+            suitDataType = BlockSoftSwitchEnumUtil.SUIT_DATA_TYPE.XML.getValue();
+        }
+        return suitDataType;
+    }
+
     @Column(name = "REGULAR_SUIT_NUM")
     @ApiParam(value = "定时适配次数")
     private Integer regularSuitNum;

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

@@ -13,6 +13,8 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Lob;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 适配报文详情
@@ -82,5 +84,9 @@ public class BsSuitDataDetail extends BaseBean {
     @ApiParam(value = "处理时间")
     private String processTime;
 
+    @Transient
+    @ApiParam(value = "适配请求文件列表")
+    private List<BsSuitFile> bsSuitFileList;
+
 }
 

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

@@ -34,14 +34,23 @@ public class BsSuitFile extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseId;
 
+    @Column(name = "SUIT_RECORD_ID")
+    @ApiParam(value = "适配记录id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long suitRecordId;
+
     @Column(name = "SUIT_CASE_NAME_RDD")
     @ApiParam(value = "适配套件名称")
-    private String suitCaseName;
+    private String suitCaseNameRdd;
 
     @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配套件代码")
     private String suitCaseCode;
 
+    @Column(name = "CASE_TYPE_ID")
+    @ApiParam(value = "套件类型id(枚举)")
+    private Integer caseTypeId;
+
     @Column(name = "FOLDER_PATH")
     @ApiParam(value = "文件夹路径")
     private String folderPath;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.util.List;
@@ -35,9 +36,9 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配套件名称")
     private String suitCaseNameRdd;
 
-    @Column(name = "SUIT_CASE_CODE_RDD")
+    @Column(name = "SUIT_CASE_CODE")
     @ApiParam(value = "适配套件代码")
-    private String suitCaseCodeRdd;
+    private String suitCaseCode;
 
     @Column(name = "SUIT_CASE_ID")
     @ApiParam(value = "适配器套件id")
@@ -95,6 +96,7 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配结果")
     private Integer suitResult;
 
+    @Lob
     @Column(name = "SUIT_MESSAGE")
     @ApiParam(value = "适配信息")
     private String suitMessage;
@@ -119,5 +121,9 @@ public class BsSuitRecord extends BaseBean {
     @ApiParam(value = "适配请求记录")
     private BsSuitRequestRecord bsSuitRequestRecord;
 
+    @Transient
+    @ApiParam(value = "适配请求文件列表")
+    private List<BsSuitFile> bsSuitFileList;
+
 }
 

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

@@ -333,7 +333,7 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getCaseTypeId(),"caseTypeId",ddlPackBean);
         DdlPreparedPack.timeBuilder(bsSuitRecord.getCreateDatetime(), "createDatetime", ddlPackBean, false, true);
@@ -362,7 +362,6 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
-
     /**
      * 适配文件条件封装
      * @param bsSuitFile 查询条件
@@ -371,7 +370,7 @@ public class SoftSwitchHqlPack {
     public static DdlPackBean packHqlBsSuitCaseFile(BsSuitFile bsSuitFile){
         DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
 
-        DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseName(),"suitCaseName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitFile.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitFile.getFileName(), "fileName", ddlPackBean);
@@ -381,4 +380,25 @@ public class SoftSwitchHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlSuitRecordBySuitCaseCodeAndProcessState(String suitCaseCode, Integer processState){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(suitCaseCode,"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
+
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
+
+        return ddlPackBean;
+    }
+    public static DdlPackBean packHqlSuitRecordBySuitRecordIdAndProcessState(Long[] suitRecordIds, Integer processState){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getInPackArray(suitRecordIds,"suitCaseCodeRdd",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(processState,"processState",ddlPackBean);
+
+        DdlPreparedPack.getOrderByPack(new Object[]{CommonEnumUtil.ASC_OR_DESC.DESC.getValue()},new String[]{"getDateTime"},ddlPackBean);
+
+        return ddlPackBean;
+    }
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -75,6 +77,7 @@ public class WmsASNMasterDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.ORDER_DETAILS_STATUS.class, refForeignKey = "value", value = "description")
     public Integer itemStatus;
 
     @Column(name = "PACKAGE")

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -112,6 +114,7 @@ public class WmsPOMasterDetails extends BaseBean {
      */
     @Column(name = "ITEM_STATUS")
     @ApiParam("状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     private Integer itemStatus;
 
     @Column(name = "SNP", columnDefinition = "decimal(18,8)")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsStockSnRepository.java

@@ -21,7 +21,6 @@ public interface WmsStockSnRepository extends BaseRepository<WmsStockSn, Long> {
      */
     WmsStockSn findFirstBySn(String sn);
 
-
     /**
      * Rock.Yu at 2019-06-22 11:05
      * 按照存储区代码查询最早批次的物料条码

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

@@ -1964,6 +1964,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getPartNo(), "partNo", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getVendorNo(),"vendorNo", result);
         DdlPreparedPack.getStringNotNullPack("locateNo", result);
         result.setWhereAppend(result.getWhereAppend() + " and locateNo != ''");
 
@@ -2375,7 +2376,7 @@ public class WmsHqlPack {
     /**
      * 业务：库存查询封装
      *
-     * @param wmsStockQuan
+     * @param “wmsStockQuan”
      * @return
      */
     public static DdlPackBean packWmsRouting(WmsRouting wmsRouting) {