合并代码 pom 冲突

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

# Conflicts:
#	modules/i3plus-ics-gateway/src/main/resources/application-docker.properties

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

@@ -5085,4 +5085,43 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * mes 员工技能等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SKILL_LEVEL {
+
+        TRAINING("10", "培训中"),
+        QUALIFIED("20", "合格"),
+        GOOD("30", "良好"),
+        CAN_GUIDE_OTHERS("40", "可指导他人");
+
+        private String value;
+        private String description;
+
+        SKILL_LEVEL(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String 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

@@ -6415,4 +6415,152 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * BatchHold 检测大类
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_CHECK_TYPE {
+        FUNCTION(10, "FUNCTION", "功能检测"),
+        SIZE(20, "SIZE", "尺寸检测"),
+        DEPTH(30, "DEPTH", "熔深检测");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_CHECK_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);
+        }
+    }
+
+    /**
+     * BatchHold 值类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BH_VALUE_TYPE {
+        NUMBER(10, "NUMBER", "功能检测"),
+        TEXT(20, "TEXT", "尺寸检测");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BH_VALUE_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);
+        }
+    }
+
+    /**
+     * 返修、挑选状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REWORK_STATUS {
+        INIT(10, "INIT", "初始化"),
+        BE_HANDLE(20, "BE_HANDLE", "待处理"),
+        FINISH(30, "FINISH", "已处理"),
+        NONE(40, "NONE", "不处理");
+
+        private int value;
+        private String code;
+        private String description;
+
+        REWORK_STATUS(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 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;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }

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

@@ -42,11 +42,11 @@ public class MesBoardEquDetail extends BaseBean implements Serializable {
     @ApiParam("设备名称")
     private String equName;
 
-    @Column(name = "HORIZONTAL_AXIS")
+    @Column(name = "X_AXES")
     @ApiParam(value = "横坐标")
-    private Float horizontalAxis = 0f;
+    private Double xAxes = 0d;
 
-    @Column(name = "VERTICAL_AXIS")
+    @Column(name = "Y_AXES")
     @ApiParam(value = "纵坐标")
-    private Float verticalAxis = 0f;
+    private Double yAxes = 0d;
 }

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

@@ -36,7 +36,7 @@ public class MesBoardEquStatus extends BaseBean implements Serializable {
 
     @Column(name = "EQU_CODE")
     @ApiParam("设备代码")
-    private String equCOde;
+    private String equCode;
 
     @Column(name = "EQU_STATUS_CODE")
     @ApiParam("状态代码")

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

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SHIFT_CLASS")
+@Api("MES_班制表")
+public class MesShiftClass extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1222874834741345978L;
+    @Column(name = "SHIFT_CLASS_CODE")
+    @ApiParam("班制代码")
+    private String shiftClassCode;
+
+    @Column(name = "SHIFT_CLASS_NAME")
+    @ApiParam("班制名称")
+    private String shiftClassName;
+}

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SHIFT_CLASS_DETAIL")
+@Api("MES_班制班次表")
+public class MesShiftClassDetail extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1222874274741347278L;
+    @Column(name = "SHIFT_CLASS_CODE")
+    @ApiParam("班制代码")
+    private String shiftClassCode;
+
+    @Column(name = "SHIFT_CLASS_NAME")
+    @ApiParam("班制名称")
+    private String shiftClassName;
+
+    @Column(name = "SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name = "SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+}

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

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SKILLS")
+@Api("MES_技能表")
+public class MesSkills extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1229825214741345978L;
+    @Column(name = "SKILL_CODE")
+    @ApiParam("技能代码")
+    private String skillCode;
+
+    @Column(name = "SKILL_NAME")
+    @ApiParam("技能名称")
+    private String skillName;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesUserSkill.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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_USER_SKILL")
+@Api("MES_人员技能表")
+public class MesUserSkill extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1222847514741345978L;
+    @Column(name = "USER_EMP_NO")
+    @ApiParam("员工编码")
+    private String userEmpNo;
+
+    @Column(name = "USER_NAME")
+    @ApiParam("员工名称")
+    private String userName;
+
+    @Column(name = "SKILL_CODE")
+    @ApiParam("技能代码")
+    private String skillCode;
+
+    @Column(name = "SKILL_NAME")
+    @ApiParam("技能名称")
+    private String skillName;
+
+    @Column(name = "SKILL_LEVEL")
+    @ApiParam("技能等级")
+    private String skillLevel;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellSkill.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.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL_SKILL")
+@Api("MES_工位技能表")
+public class MesWorkCellSkill extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1239825214741345208L;
+    @Column(name = "SKILL_CODE")
+    @ApiParam("技能代码")
+    private String skillCode;
+
+    @Column(name = "SKILL_NAME")
+    @ApiParam("技能名称")
+    private String skillName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CELL_NAME")
+    @ApiParam("工作单元名称")
+    private String workCellName;
+}

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: adair.song
+ * @CreateDate: 2020\04\21 13:34
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORKDAY")
+@Api("MES_工作日历表")
+public class MesWorkDay extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1222899824741345978L;
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_DATE")
+    @ApiParam("日期")
+    private String workDate;
+
+    @Column(name = "SHIFT_CLASS_CODE")
+    @ApiParam("班制代码")
+    private String shiftClassCode;
+}

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

@@ -158,6 +158,18 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam(value = "乐观锁", example = "1")
     public Integer lockVersion;
 
+    @Column(name = "CATEGORY_CODE1")
+    @ApiParam("类型1")
+    private String categoryCode1;
+
+    @Column(name = "CATEGORY_CODE2")
+    @ApiParam("类型2")
+    private String categoryCode2;
+
+    @Column(name = "CATEGORY_CODE3")
+    @ApiParam("类型3")
+    private String categoryCode3;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value = "工作中心名称")

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesUserSkill;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Description : 人员技能-获取用户信息
+ * @Reference :
+ * @Author : alwaysfrin
+ * @CreateDate : 2018-10-11 11:02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("用户信息model")
+public class SkillsUserModel {
+
+    @ApiParam(value ="姓名")
+    private String userName;
+
+    @ApiParam(value ="工号")
+    private String userEmpNo;
+
+    @ApiParam("技能矩阵信息")
+    private List<MesUserSkill> mesUserSkillList;
+
+}

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

@@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfRawPartData;
+
+/**
+ * @Description :
+ * @Reference :
+ * @CreateDate : 2020-04-21 09:53
+ * @Modify:
+ **/
+public interface IfRawPartDataRepository extends BaseRepository<IfRawPartData, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassDetailRepository.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.MesShiftClassDetail;
+
+/**
+ * @Description:班制维护
+ * @Reference:
+ * @Author: adair
+ * @CreateDate: 2020\04\21
+ * @Modify:
+ **/
+public interface MesShiftClassDetailRepository extends BaseRepository<MesShiftClassDetail, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftClassRepository.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.MesShiftClass;
+
+/**
+ * @Description:班制维护
+ * @Reference:
+ * @Author: adair
+ * @CreateDate: 2020\04\21
+ * @Modify:
+ **/
+public interface MesShiftClassRepository extends BaseRepository<MesShiftClass, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesSkillsRepository.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.MesSkills;
+
+/**
+ * @Description:人员技能管理
+ * @Reference:
+ * @Author: adair
+ * @CreateDate: 2020\04\21
+ * @Modify:
+ **/
+public interface MesSkillsRepository extends BaseRepository<MesSkills, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesUserSkillRepository.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.MesUserSkill;
+
+/**
+ * @Description:人员技能管理
+ * @Reference:
+ * @Author: adair
+ * @CreateDate: 2020\04\21
+ * @Modify:
+ **/
+public interface MesUserSkillRepository extends BaseRepository<MesUserSkill, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkCellSkillRepository.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.MesWorkCellSkill;
+
+/**
+ * @Description:人员技能管理
+ * @Reference:
+ * @Author: adair
+ * @CreateDate: 2020\04\21
+ * @Modify:
+ **/
+public interface MesWorkCellSkillRepository extends BaseRepository<MesWorkCellSkill, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesWorkDayRepository.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.MesWorkDay;
+
+/**
+ * @Description:人员技能管理
+ * @Reference:
+ * @Author: adair
+ * @CreateDate: 2020\04\21
+ * @Modify:
+ **/
+public interface MesWorkDayRepository extends BaseRepository<MesWorkDay, Long> {
+}

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

@@ -2494,4 +2494,135 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesBoardEquDetail(MesBoardEquDetail mesBoardEquDetail) {
+        DdlPackBean packBean = getAllBaseData(mesBoardEquDetail.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesBoardEquDetail.getBoardCode(), "boardCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBoardEquDetail.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    public static DdlPackBean getMesBoardEquStatus(MesBoardEquStatus mesBoardEquStatus) {
+        DdlPackBean packBean = getAllBaseData(mesBoardEquStatus.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesBoardEquStatus.getBoardCode(), "boardCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesBoardEquStatus.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
+
+    /**
+     * MES 人员技能
+     *
+     * @param mesSkills
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesSkills(MesSkills mesSkills, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesSkills, organizeCode);
+        if (!StringUtils.isEmpty(mesSkills.getSkillCode())) {
+            DdlPreparedPack.getStringLikerPack(mesSkills.getSkillCode(), "skillCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesSkills.getSkillName())) {
+            DdlPreparedPack.getStringLikerPack(mesSkills.getSkillName(), "skillName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 工位技能
+     *
+     * @param mesWorkCellSkill
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesWorkCellSkill(MesWorkCellSkill mesWorkCellSkill, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCellSkill, organizeCode);
+        if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillCode())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillCode(), "skillCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCellSkill.getSkillName())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getSkillName(), "skillName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCellSkill.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCellSkill.getWorkCellCode())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesWorkCellSkill.getWorkCellName())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkCellSkill.getWorkCellName(), "workCellName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 人员技能
+     *
+     * @param mesUserSkill
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesUserSkill(MesUserSkill mesUserSkill, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesUserSkill, organizeCode);
+        if (!StringUtils.isEmpty(mesUserSkill.getSkillCode())) {
+            DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillCode(), "skillCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesUserSkill.getSkillName())) {
+            DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillName(), "skillName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesUserSkill.getSkillLevel())) {
+            DdlPreparedPack.getStringLikerPack(mesUserSkill.getSkillLevel(), "skillLevel", packBean);
+        }
+        if (!StringUtils.isEmpty(mesUserSkill.getUserEmpNo())) {
+            DdlPreparedPack.getStringLikerPack(mesUserSkill.getUserEmpNo(), "userEmpNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesUserSkill.getUserName())) {
+            DdlPreparedPack.getStringLikerPack(mesUserSkill.getUserName(), "userName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 班制维护
+     *
+     * @param mesShiftClass
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesShiftClass(MesShiftClass mesShiftClass, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesShiftClass, organizeCode);
+        if (!StringUtils.isEmpty(mesShiftClass.getShiftClassCode())) {
+            DdlPreparedPack.getStringLikerPack(mesShiftClass.getShiftClassCode(), "shiftClassCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesShiftClass.getShiftClassName())) {
+            DdlPreparedPack.getStringLikerPack(mesShiftClass.getShiftClassName(), "shiftClassName", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES 班制班次维护
+     *
+     * @param mesShiftClassDetail
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesShiftDetailClass(MesShiftClassDetail mesShiftClassDetail, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesShiftClassDetail, organizeCode);
+        if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftClassCode())) {
+            DdlPreparedPack.getStringEqualPack(mesShiftClassDetail.getShiftClassCode(), "shiftClassCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftClassName())) {
+            DdlPreparedPack.getStringLikerPack(mesShiftClassDetail.getShiftClassName(), "shiftClassName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftCode())) {
+            DdlPreparedPack.getStringEqualPack(mesShiftClassDetail.getShiftCode(), "shiftCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesShiftClassDetail.getShiftName())) {
+            DdlPreparedPack.getStringLikerPack(mesShiftClassDetail.getShiftName(), "shiftName", packBean);
+        }
+        if (!StringUtils.isEmpty(mesShiftClassDetail.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesShiftClassDetail.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppMessage.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.model.common;
+
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 20-4-22 下午7:46
+ * @Modify:
+ **/
+@Data
+public class ImppMessage implements Serializable {
+
+    private static final long serialVersionUID = 6840525365653629445L;
+    @ApiParam(value ="产品")
+    private Integer softType;
+
+    @ApiParam(value ="消息组")
+    private Integer messageGroup;
+
+    @ApiParam(value ="消息内容")
+    private String messageParam;
+
+    public String getSoftTypeTxt() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
+    }
+
+    public CommonEnumUtil.SOFT_TYPE getSoftTypeEnum() {
+        return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOf(softType);
+    }
+
+
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @Description : Wms实体字段Model信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-24 09:53
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+public class BasBeanFieldInfoModel implements Serializable {
+
+    private static final long serialVersionUID = -6376845639646448895L;
+
+    @ApiParam(value = "表名称")
+    public String tableName;
+
+    @ApiParam(value = "表字段名称")
+    private String fieldName;
+
+    @ApiParam(value = "表字段描述")
+    private String fieldDesc;
+
+    @ApiParam(value = "表字段类型")
+    private String fieldType;
+
+    @ApiParam(value = "主键")
+    private String isFieldPrimaryKey;
+
+    @ApiParam(value = "非空")
+    private String isFieldNull;
+
+    @ApiParam(value = "外键")
+    private String isFieldForeignKey;
+
+    @ApiParam(value = "唯一约束")
+    private String isFieldUnique;
+
+    @ApiParam(value = "自增")
+    private String isFieldGeneric;
+}

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.model.wms;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description : Wms实体字段Model信息
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-04-24 09:53
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+public class BasBeanInfoModel implements Serializable {
+
+    private static final long serialVersionUID = -6376845639646448495L;
+
+    @ApiParam(value = "实体名称")
+    public String entityName;
+
+    @ApiParam(value = "数据表名称")
+    private String tableName;
+
+    @ApiParam(value = "数据表描述")
+    private String tableDesc;
+
+    @ApiParam(value = "字段列表数据")
+    private List<BasBeanFieldInfoModel> fieldInfoModelList;
+}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindow.java

@@ -1,40 +0,0 @@
-package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2020/2/12 17:41
- * @desc
- */
-
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@Table(name = "PTL_WINDOW")
-@EqualsAndHashCode(callSuper = true)
-@Api("PTL_界面")
-public class PtlWindow extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -1596443842758197995L;
-
-    @Column(name = "WINDOW_NO")
-    @ApiParam("界面代码")
-    private String windowNo;
-
-    @Column(name = "WINDOW_NAME")
-    @ApiParam("界面名称")
-    private String windowName;
-}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElement.java

@@ -1,40 +0,0 @@
-package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2020/2/12 17:41
- * @desc
- */
-
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@Table(name = "PTL_WINDOW_ELEMENT")
-@EqualsAndHashCode(callSuper = true)
-@Api("PTL_界面元素")
-public class PtlWindowElement extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -1596427582758197995L;
-
-    @Column(name = "WINDOW_NO")
-    @ApiParam("界面代码")
-    private String windowNo;
-
-    @Column(name = "ELEMENT_NO")
-    @ApiParam("元素代码")
-    private String elementNo;
-}

modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlWindowElementAttribute.java

@@ -1,49 +0,0 @@
-package cn.estsh.i3plus.pojo.ptl.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 java.io.Serializable;
-
-/**
- * @author Wynne.Lu
- * @date 2020/2/12 17:41
- * @desc
- */
-
-@Data
-@Entity
-@DynamicInsert
-@DynamicUpdate
-@Table(name = "PTL_WINDOW_ELEMENT_ATTRIBUTE")
-@EqualsAndHashCode(callSuper = true)
-@Api("PTL_界面元素属性")
-public class PtlWindowElementAttribute extends BaseBean implements Serializable {
-    private static final long serialVersionUID = -1596427582758285995L;
-
-    @Column(name = "WINDOW_NO")
-    @ApiParam("界面代码")
-    private String windowNo;
-
-    @Column(name = "ELEMENT_NO")
-    @ApiParam("元素代码")
-    private String elementNo;
-
-    @Column(name = "ATTRIBUTE_NO")
-    @ApiParam("属性代码")
-    private String attributeNo;
-
-    @Column(name = "ATTRIBUTE_VALUE")
-    @ApiParam("属性值")
-    private String attributeValue;
-
-}

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

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+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 : BH子检测项
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_BH_CHILD_DETECTION_ITEM")
+@Api("BH子检测项")
+public class WmsBhChildDetectionItem extends BaseBean {
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测大类")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
+    private Integer checkType;
+
+    @Column(name = "ITEM_CHECK_CODE")
+    @ApiParam("子检测项代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String itemCheckCode;
+
+    @Column(name = "ITEM_CHECK_NAME")
+    @ApiParam("子检测项名称")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String itemCheckName;
+
+    @Column(name = "VALUE_TYPE")
+    @ApiParam("值类型")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE")
+    private Integer valueType;
+}

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+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 : jason.niu
+ * @CreateDate : 2020-04-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PART_CHECK_TYPE")
+@Api("物料检测大类")
+public class WmsPartCheckType extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String partName;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测大类")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
+    private Integer checkType;
+
+    @Column(name = "SAMPLE_SIZE")
+    @ApiParam("样本数")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer sampleSize;
+}

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

@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
+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;
+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 : jason.niu
+ * @CreateDate : 2020-04-23
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PART_ITEM_CHECK")
+@Api("物料子检测项")
+public class WmsPartItemCheck extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String partNo;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检测大类")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_CHECK_TYPE")
+    private Integer checkType;
+
+    @Column(name = "CHECK_ITEM_CODE")
+    @ApiParam("子检测项代码")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String checkItemCode;
+
+    @Column(name = "CHECK_ITEM_NAME")
+    @ApiParam("子检测项名称")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String checkItemName;
+
+    @Column(name = "VALUE_TYPE")
+    @ApiParam("子检测箱值类型")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, entityName = "BH_VALUE_TYPE")
+    private Integer valueType;
+
+    @Column(name = "STANDARD")
+    @ApiParam("标准值")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double standard;
+
+    @Column(name = "MAX")
+    @ApiParam("最大值")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double max;
+
+    @Column(name = "MIN")
+    @ApiParam("最小值")
+    @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Double min;
+}

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

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.wms.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 : jimmy.zeng
+ * @CreateDate : 2020-04-23 11:03
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_TEST_RESULT_DETAILS")
+@Api("检测结果明细表")
+public class WmsTestResultDetails extends BaseBean {
+
+    private static final long serialVersionUID = -3295112411840494690L;
+    @Column(name = "BH_CODE")
+    @ApiParam("BH号")
+    public String bhCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    public String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    public String partName;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("大检测项类型")
+    public Integer checkType;
+
+    @Column(name = "qr_code")
+    @ApiParam("二维码")
+    public String qrCode;
+
+    @Column(name = "is_qualified")
+    @ApiParam("是否合格")
+    public Integer isQualified;
+
+    @Column(name = "check_value")
+    @ApiParam("检测值")
+    public String checkValue;
+}

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

@@ -0,0 +1,79 @@
+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;
+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 : jimmy.zeng
+ * @CreateDate : 2020-04-23 10:50
+ * @Modify:
+ **/
+
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_TEST_RESULT_SUMMARY")
+@Api("检测结果汇总表")
+public class WmsTestResultSummary extends BaseBean {
+
+    private static final long serialVersionUID = -4600850017207281216L;
+
+    @Column(name = "BH_CODE")
+    @ApiParam("BH号")
+    public String bhCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    public String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    public String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    public String partName;
+
+    @Column(name = "FLAG_NO")
+    @ApiParam("客户发往地")
+    public String flagNo;
+
+    @Column(name = "IS_QUALIFIED")
+    @ApiParam("是否合格")
+    public Integer isQualified;
+
+    @Column(name = "REWORK_STATUS")
+    @ApiParam("返修状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer reworkStatus;
+
+    @Column(name = "REWORK_RESULT")
+    @ApiParam("返修结果")
+    public Integer reworkResult;
+
+    @Column(name = "PICK_STATUS")
+    @ApiParam("挑选状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+
+    public Integer pickStatus;
+
+    @Column(name = "PICK_RESULT")
+    @ApiParam("挑选结果")
+    public Integer pickResult;
+
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsBhChildDetectionItem;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : BH子检测项
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-23
+ * @Modify:
+ **/
+@Repository
+public interface WmsBhChildDetectionItemRepository extends BaseRepository<WmsBhChildDetectionItem, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartCheckType;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description : 物料检测大类
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-23
+ * @Modify:
+ **/
+@Service
+public interface WmsPartCheckTypeRepository extends BaseRepository<WmsPartCheckType, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPartItemCheck;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 持久层物料子检测项
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-04-23
+ * @Modify:
+ **/
+@Repository
+public interface WmsPartItemCheckRepository extends BaseRepository<WmsPartItemCheck, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTestResultDetails;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 检测结果明细表
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-04-23 11:03
+ * @Modify:
+ **/
+@Repository
+public interface WmsTestResultDetailsRepository extends BaseRepository<WmsTestResultDetails, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsTestResultSummary;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : 检测结果汇总表
+ * @Reference :
+ * @Author : jimmy.z
+ * @CreateDate : 2020-04-23 11:03
+ * @Modify:
+ **/
+@Repository
+public interface WmsTestResultSummaryRepository extends BaseRepository<WmsTestResultSummary, Long> {
+}

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

@@ -3110,4 +3110,29 @@ public class WmsHqlPack {
         getStringBuilderPack(details, result);
         return result;
     }
+
+    /**
+     * 检测结果汇总表 分页查询
+     *
+     * @param wmsTestResultSummary
+     * @return
+     */
+    public static DdlPackBean packHqWmsTestResultSummary(WmsTestResultSummary wmsTestResultSummary) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringLikerPack(wmsTestResultSummary.getBhCode(), "bhCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTestResultSummary.getFlagNo(), "flagNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getReworkResult(), "reworkStatus", result);
+        DdlPreparedPack.getNumEqualPack(wmsTestResultSummary.getPickStatus(), "pickStatus", result);
+        DdlPreparedPack.timeBuilder(wmsTestResultSummary.getCreateDateTimeStart(),
+                wmsTestResultSummary.getCreateDateTimeEnd(), "createDatetime", result, true);
+        DdlPreparedPack.timeBuilder(wmsTestResultSummary.getModifyDateTimeStart(),
+                wmsTestResultSummary.getModifyDateTimeEnd(), "modifyDateTime", result, true);
+        getStringBuilderPack(wmsTestResultSummary, result);
+
+        return result;
+    }
 }

sonar-project.properties

@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-TEST-SNAPSHOT
+sonar.projectVersion=1.0-DEV-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./