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

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonBoardModel.java

@@ -74,6 +74,9 @@ public class AndonBoardModel implements Serializable {
     @ApiParam("图表类型颜色")
     private String color;
 
+    @ApiParam("停线时间比率")
+    private String downtimeRate;
+
     public int getTotalTimeVal() {
         return totalTime == null ? 0 : totalTime;
     }

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -51,6 +51,7 @@ public class AndonHqlPack {
     public static DdlPackBean getAndonMessageRecord(AndonMessageRecord andonMessageRecord) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getOrganizeCode(), "organizeCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonMessageRecord.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean);
         DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean);

modules/i3plus-pojo-aps/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base-mongo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -1961,8 +1961,16 @@ public class CommonEnumUtil {
             return null;
         }
 
+
+        // cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest
         private String getJDBCUrlMySQL(String database,String host,Integer port){
-            return "jdbc:mysql://"+host+":"+port+"/"+database+"?autoReconnect=true&useSSL=false&characterEncoding=utf-8";
+            // 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST
+            return "jdbc:mysql://"+host+":"+port+"/"+database+
+                    "?autoReconnect=true" +
+                    "&useSSL=false" +
+                    "&characterEncoding=utf-8" +
+                    "&allowPublicKeyRetrieval=true" +
+                    "&serverTimezone=CST";
         }
 
         private String getJDBCUrlOracle(String database,String host,Integer port){

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

@@ -815,6 +815,8 @@ public class MesEnumUtil {
     public enum MES_TYPE_CFG {
 
         DEFECT("DEFECT", "缺陷"),
+        POLISHING("POLISHING", "抛光"),
+        DISASSEMBLE("DISASSEMBLE", "拆解"),
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
@@ -3656,7 +3658,9 @@ public class MesEnumUtil {
     public enum QUEUE_ORDER_DETAIL_STATUS {
 
         NORMAL(10, "正常"),
-        CLOSE(20, "关闭");
+        CLOSE(20, "关闭"),
+        FINISH(30, "完成"),
+        OFF_LINE_REWORK(40, "线下返修");
 
         private int value;
         private String description;
@@ -5345,7 +5349,9 @@ public class MesEnumUtil {
         BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
         BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"),
         BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"),
-        BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板");
+        BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板"),
+        BOARD_MGN_BJ_MAIN_SCREEN("BOARD_MGN_BJ_MAIN_SCREEN", "北京麦格纳总屏幕看板"),
+        BOARD_MGN_BJ_EQU_REPAIR("BOARD_MGN_BJ_EQU_REPAIR", "北京麦格纳设备维修看板");
 
         private String code;
         private String description;
@@ -8012,4 +8018,81 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 不良品处理类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BAD_HANDLE_TYPE {
+        BACK_SPRAY(10, "BACK_SPRAY", "返喷"),
+        SCRAPPED(20, "SCRAPPED", "报废"),
+        POLISHING(30, "POLISHING", "抛光"),
+        DETERMIND(40, "DETERMIND", "待定");
+
+        private int value;
+        private String code;
+        private String description;
+
+        BAD_HANDLE_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 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 int codeOf(String code) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static String codeOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -355,7 +355,8 @@ public class MesPcnEnumUtil {
         UPDATE_LOCALE_RES(200, "SYNC_DATA_URL", "LOCALE_RES_URL"),
         PCN_SYS_LOCALE_LANGUAGE(210, "PCN_SYS_LOCALE_LANGUAGE", ""),
         PCN_SYS_ALL_LANGUAGE(220, "PCN_SYS_ALL_LANGUAGE", "PCN_SYS_ALL_LANGUAGE"),
-        PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE");
+        PCN_SYS_RESOURCE_KEY_LANGUAGE(230, "PCN_SYS_RESOURCE_KEY_LANGUAGE", "PCN_SYS_RESOURCE_KEY_LANGUAGE"),
+        SYNC_PHOTO_COLLECT_URL(240, "SYNC_PHOTO_COLLECT_URL", "PCN推送图片采集数据至mes");
 
         private int value;
         private String code;
@@ -444,6 +445,8 @@ public class MesPcnEnumUtil {
     public enum MES_TYPE_CFG {
 
         DEFECT("DEFECT", "缺陷"),
+        POLISHING("POLISHING", "抛光"),
+        DISASSEMBLE("DISASSEMBLE", "拆解"),
         DEFECT_CAUSE("DEFECT_CAUSE", "缺陷原因"),
         REPAIR("REPAIR", "处理措施"),
         SCRAP("SCRAP", "报废原因"),
@@ -1179,7 +1182,7 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SYNC_TYPE {
 
-        GET_MES_DATA(1, "pcn获取mes数据"),
+        GET_MES_DATA(1, "pcn拉取mes数据"),
         DATA_TO_MES(2, "pcn推送数据至mes");
 
         private int value;
@@ -3856,6 +3859,43 @@ public class MesPcnEnumUtil {
     }
 
     /**
+     * 产线管控-过程检验状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCESS_INSPECTION {
+        NOT_CREATE(10, "未创建"),
+        CREATE(20, "已创建"),
+        PROCESS(30, "执行中"),
+        COMPLETE(40, "完成");
+
+        private int value;
+        private String description;
+
+        PROCESS_INSPECTION(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 整体检测结果状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -5934,4 +5974,93 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 预装产线，工位
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRE_WORK_CENTER_CODE {
+        OP10("OP10", "OP10"),
+        OP20A("OP20a", "OP20a"),
+        OP20B("OP20b", "OP20b");
+
+        private String code;
+        private String description;
+
+        PRE_WORK_CENTER_CODE(String code, String description) {
+            this.code = code;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PRE_WORK_CENTER_CODE getByCode(String code) {
+            for (PRE_WORK_CENTER_CODE workCenterCode : values()) {
+                if (workCenterCode.getCode().equals(code)) {
+                    return workCenterCode;
+                }
+            }
+            return null;
+        }
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * JIS_回冲标识：BACKFLUSH = 正常回冲扣减，REPAIR = 返修冲料
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum JIS_BACKFLUSH_STATUS {
+        BACKFLUSH("BACKFLUSH", "正常回冲扣减"),
+        REPAIR("REPAIR", "返修冲料");
+
+        private String value;
+        private String description;
+
+        JIS_BACKFLUSH_STATUS(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 == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -841,6 +841,7 @@ public class WmsEnumUtil {
         KT_PURCHASE_RC(450, "KT_PURCHASE_RC", "采购收货"),
         KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
         FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
+        FINISH_PRODUCT_SHPING_NEW(480, "FINISH_PRODUCT_SHPING_NEW", "成品发运-新业务类型"),
         KT_PICK_RC(480, "KT_PICK_RC", "坤泰拣货"),
         PRODUCE_INSTOCK(490, "PRODUCE_INSTOCK", "VDA生产入库"),
         UTENSIL_CONSUMING(500, "UTENSIL_CONSUMING", "器具领用"),
@@ -867,7 +868,8 @@ public class WmsEnumUtil {
         WITHOUT_PRICE_CENTER_OUT(710, "WITHOUT_PRICE_CENTER_OUT", "无成本中心出库"),
         WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
         OTHER_IN(730, "OTHER_IN", "其它入库"),
-        OTHER_OUT(740, "OTHER_OUT", "其它出库");
+        OTHER_OUT(740, "OTHER_OUT", "其它出库"),
+        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账");
 
         private int value;
         private String code;
@@ -1889,6 +1891,11 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
     }
 
     /**
@@ -2342,6 +2349,21 @@ public class WmsEnumUtil {
         public String getDescription() {
             return description;
         }
+
+        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);
+        }
+
     }
 
     /**
@@ -7321,6 +7343,80 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 报文校验类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum INTERFACE_DATA_VERIFY_STATUS {
+        INITIAL(10, "INITIAL", "初始化"),
+        COMPLETED(30, "COMPLETED", "校验完成"),
+        ERROR(40, "ERROR", "校验出错");
+
+        private int value;
+        private String code;
+        private String description;
+
+        INTERFACE_DATA_VERIFY_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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
+
+
+        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 INTERFACE_DATA_VERIFY_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+    /**
      * 运费单审批状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
@@ -9290,6 +9386,53 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * WMS数据库类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMS_DB_TYPE {
+        MYSQL(10, "mysql", "mysql"),
+        SQLSERVER(20, "sqlserver", "sqlserver"),
+        ORACLE(30, "oracle", "oracle"),
+        POSTGRESQL(40, "postgresql", "postgresql");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WMS_DB_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);
+        }
+    }
 }
 
 

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -371,6 +371,8 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
 
     boolean isExitByProperty(String[] propertyNames, Object[] values);
 
+    boolean isExitByPropertyDemo(String[] propertyNames, Object[] values);
+
     boolean isExitByHqlWhere(String hqlWhere,String[] propertyNames, Object[] values);
 
     boolean isExitByHqlWhere(String hqlWhere);

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

@@ -651,6 +651,34 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
         }
     }
 
+
+    public int findByPropertyCountDemo(String[] propertyNames, Object[] values) {
+        if(propertyNames.length != values.length){
+            throw new IllegalArgumentException("参数错误数量和值个数不匹配!propertyNames:" + propertyNames.length + ",values:" + values.length);
+        }
+        StringBuffer queryString = new StringBuffer();
+        queryString.append("select count(*) from " + persistentClass.getName() + " as model where 1=1 ");
+        for (int i = 0; i < propertyNames.length; i++) {
+            if(values[i] != null) {
+                queryString.append(" and model." + propertyNames[i] + "= :" + propertyNames[i]);
+            }
+        }
+
+        Query queryObject = entityManager.createQuery(queryString.toString(),Long.class);
+        for (int i = 0; i < propertyNames.length; i++) {
+            if(values[i] != null) {
+                queryObject.setParameter(propertyNames[i], values[i]);
+            }
+        }
+
+        try{
+            Long count = (Long) queryObject.getSingleResult();
+            return count == null ? 0 : count.intValue();
+        }catch(NoResultException e){
+            return 0;
+        }
+    }
+
     @Override
     public List<T> findByPropertyPage(String propertyName, Object value, String orderByStuff, Pager pager) {
         if(pager != null){
@@ -1439,6 +1467,11 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     }
 
     @Override
+    public boolean isExitByPropertyDemo(String[] propertyNames, Object[] values) {
+        return findByPropertyCountDemo(propertyNames, values) > 0;
+    }
+
+    @Override
     public boolean isExitByHqlWhere(String hqlWhere, String[] propertyNames, Object[] values) {
         return findByHqlWhereCount(hqlWhere,propertyNames,values) > 0;
     }

modules/i3plus-pojo-form/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-hardswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ics/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-DEV-SNAPSHOT</version>
+        <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-lac/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mdm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -25,7 +25,7 @@ import java.io.Serializable;
 @Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO", "SERIAL_NUMBER"})
-    }
+}
 )
 @Api("包装规格明细")
 public class MesPackageDetail extends BaseBean implements Serializable {
@@ -35,6 +35,10 @@ public class MesPackageDetail extends BaseBean implements Serializable {
     @ApiParam("包装编码")
     private String packageNo;
 
+    @Column(name = "CT_LOCATION_NO")
+    @ApiParam("容器位置编号")
+    private String ctLocationNo;
+
     @Column(name = "SERIAL_NUMBER", nullable = false)
     @ApiParam("过程条码")
     private String serialNumber;

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

@@ -2,8 +2,6 @@ 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.MesObjectCfg;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackageDetail;
 
 /**
  * @Author: Wynne.Lu

modules/i3plus-pojo-mes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -0,0 +1,83 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
+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.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :IF_客户月度订单数据
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2020-11-06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_CUST_ORDER_DATA")
+@Api("IF_客户月度订单数据")
+public class IfCustOrderData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 855289009053695346L;
+
+    @Column(name = "RGANIZTION_CODE")
+    @ApiParam("工厂代码")
+    private String rganiztionCode;
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @Column(name = "CUSTOMER_NAME")
+    @ApiParam("客户名称")
+    private String customerName;
+
+    @Column(name = "YEAR")
+    @ApiParam("年")
+    private Integer year;
+
+    @Column(name = "MONTH")
+    @ApiParam("月")
+    private Integer month;
+
+    @Column(name = "QTY")
+    @ApiParam("订单数量")
+    private Integer qty = 0;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+
+    @Transient
+    @ApiParam("年度客户月度订单集合")
+    private List<Map<String,Object>> ifCustOrderDataMap = new ArrayList<>();
+}

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

@@ -0,0 +1,81 @@
+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.ColumnDefault;
+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 java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: dominic
+ * @CreateDate: 2020/10/29 14:11
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "IF_PACKAGE")
+@Api("料箱表")
+public class IfPackage extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 9099416791684702129L;
+
+    @Column(name = "PACKAGE_NO")
+    @ApiParam("包装编号")
+    private String packageNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name = "PORCESS_NAME")
+    @ApiParam("工序名称")
+    private String porcessName;
+
+    @Column(name = "RK_TYPE")
+    @ApiParam("料架类型")
+    private String rkType;
+
+    @Column(name = "ACTION_CODE")
+    @ApiParam("动作代码")
+    private String actionCode;
+
+    @Column(name = "ACTION_DATE_TIME")
+    @ApiParam("操作时间")
+    private String actionDateTime;
+
+    @Column(name = "ACTION_USER")
+    @ApiParam("操作人")
+    private String actionUser;
+
+    @Column(name = "ERROR_MESSAGE")
+    @ApiParam("异常消息")
+    private String errorMessage;
+
+    @Column(name = "IF_CODE")
+    @ApiParam("接口代码")
+    private String ifCode;
+
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("同步状态")
+    private Integer syncStatus;
+
+}

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

@@ -157,6 +157,10 @@ public class IfProductOffLine extends BaseBean implements Serializable {
     @ApiParam("BaseModule零件号")
     private String baseModule;
 
+    @Column(name = "QUEUE_GROUP_FLAG")
+    @ApiParam("分组标识")
+    private String queueGroupFlag;
+
     public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) {
         this.partNo = partNo;
         this.packageNo = packageNo;
@@ -164,4 +168,13 @@ public class IfProductOffLine extends BaseBean implements Serializable {
         this.workCenterCode = workCenterCode;
         this.qcStatus = qcStatus;
     }
+
+    public IfProductOffLine(String workCenterCode, String partNo, String partName, String packageNo, Double itemQty, String createDatetime) {
+        this.workCenterCode = workCenterCode;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.packageNo = packageNo;
+        this.itemQty = itemQty;
+        this.createDatetime = createDatetime;
+    }
 }

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

@@ -0,0 +1,54 @@
+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.ColumnDefault;
+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 :mes看板车间配置
+ * @Reference :
+ * @Author : adair.song
+ * @CreateDate : 2020-11-09
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_AREA")
+@Api("mes看板车间配置")
+public class MesBoardArea extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 4592603687011665216L;
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "PLAN_PASS_YIELD", columnDefinition = "decimal(18,3)")
+    @ColumnDefault("0")
+    @ApiParam("目标达成率")
+    private Double planPassYield;
+
+    @Column(name = "YIELD_DIFF_VALUE", columnDefinition = "decimal(18,3)")
+    @ColumnDefault("0")
+    @ApiParam("上下偏差值")
+    private Double yieldDiffValue;
+
+
+}

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

@@ -74,5 +74,12 @@ public class MesBoardLine extends BaseBean implements Serializable {
     @ApiParam("最终良品率目标值")
     private Double planPassYield;
 
+    /**
+     * 是否展示： 1--展示  ，2--不展示
+     */
+    @Column(name = "IS_DISPLAY")
+    @ApiParam("是否展示")
+    private Integer isDisplay;
+
 
 }

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

@@ -111,8 +111,8 @@ public class MesBoardMafactAssessment extends BaseBean implements Serializable {
     @ApiParam("NOV")
     private String nov;
 
-    @Column(name = "DEC")
-    @ApiParam("DEC")
-    private String dec;
+    @Column(name = "DECEMBER")
+    @ApiParam("DECEMBER")
+    private String december;
 
 }

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

@@ -0,0 +1,44 @@
+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 : MES_容器位置
+ * @Reference :
+ * @Author : dominic.xiao
+ * @CreateDate : 2020-11-02 17:47
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CONTAINER_LOCATION")
+@Api("MES_容器位置")
+public class MesContainerLocation extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 8181007288150974903L;
+
+    @Column(name = "CT_CODE")
+    @ApiParam(value = "容器类型代码")
+    private String ctCode;
+
+    @Column(name = "CT_LOCATION_NO")
+    @ApiParam(value = "容器位置编号")
+    private String ctLocationNo;
+
+    @Column(name = "LOCATION_CAPACITY")
+    @ApiParam(value = "默认容量")
+    private String locationCapacity;
+}

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

@@ -14,7 +14,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description: MES控制计划-主表
+ * @Description: MES控制计划-主表（子表：质量标准MES_QUALITY_STANDARD）
  * @CreateDate: 2020/9/27
  * @Author: simon.song
  */

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

@@ -57,4 +57,8 @@ public class MesCustomer extends BaseBean implements Serializable {
     @Column(name = "CUST_DELIVERY_LOCATION")
     @ApiParam("客户发往地")
     private String custDeliveryLocation;
+
+    @Column(name = "IS_BI_DISPLAY")
+    @ApiParam("是否BI显示")
+    private Integer isBiDisplay = 2;
 }

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

@@ -0,0 +1,60 @@
+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 : MES_客户条码规则
+ * @Reference :
+ * @Author : dominic.xiao
+ * @CreateDate : 2020-11-02 18:19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CUSTOMER_SN_RULE")
+@Api("MES_客户条码规则")
+public class MesCustomerSnRule extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3928160156339420471L;
+
+    @Column(name = "CUSTOMER_CODE")
+    @ApiParam(value = "客户代码")
+    private String customerCode;
+
+    @Column(name = "CUSTOMER_PART_NO")
+    @ApiParam(value = "客户零件号")
+    private String customerPartNo;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料号")
+    private String partNo;
+
+    @Column(name = "LENGTH")
+    @ApiParam(value = "长度")
+    private Integer length;
+
+    @Column(name = "FROM1")
+    @ApiParam(value = "起始1")
+    private Integer from1;
+
+    @Column(name = "TO1")
+    @ApiParam(value = "至1")
+    private Integer to1;
+
+    @Column(name = "FIX1")
+    @ApiParam(value = "内容1")
+    private String fix1;
+}

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

@@ -48,6 +48,10 @@ public class MesDefect extends BaseBean implements Serializable {
     @ApiParam("项目代码")
     private String prodCfgTypeCode;
 
+    @Column(name = "DEFECT_ACTION_TYPE")
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
     @Column(name = "DEFECT_FLAG_VALUE")
     @ApiParam("缺陷标识值")
     private String defectFlagValue;
@@ -67,6 +71,7 @@ public class MesDefect extends BaseBean implements Serializable {
     @Transient
     @ApiParam("缺陷类型子集")
     private List<MesDefect> mesDefectList;
+
     public MesDefect() {
 
     }
@@ -77,4 +82,10 @@ public class MesDefect extends BaseBean implements Serializable {
         this.defectType = defectType;
         this.defectTypeName = defectTypeName;
     }
+
+    public MesDefect(String defectType, String defectCode, String defectName) {
+        this.defectType = defectType;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+    }
 }

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

@@ -0,0 +1,39 @@
+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: dominic
+ * @CreateDate: 2020\11\13 09:59
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_DEFECT_LOCATION")
+@Api("产品缺陷位置")
+public class MesDefectLocation extends BaseBean implements Serializable {
+
+    @Column(name = "DEFECT_LOCATION")
+    @ApiParam("缺陷位置代码")
+    private String defectLocation;
+
+    @Column(name = "DEFECT_NAME")
+    @ApiParam("缺陷位置名称")
+    private String defectName;
+}

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

@@ -105,7 +105,26 @@ public class MesDefectRecord extends BaseBean implements Serializable {
     @ApiParam("缺陷类型名称")
     private String defectActionTypeName;
 
+    @Transient
+    @ApiParam("缺陷数量")
+    private Integer defectQty;
+
     public int getRepairStatusVal() {
         return this.repairStatus == null ? 0 : this.repairStatus;
     }
+
+    public MesDefectRecord() {
+
+    }
+
+    public MesDefectRecord(String partNo, String partName, String workOrderNo, String defectActionType,
+                           String defectCode, String defectName, Integer defectQty) {
+        this.partNo = partNo;
+        this.partName = partName;
+        this.workOrderNo = workOrderNo;
+        this.defectActionType = defectActionType;
+        this.defectCode = defectCode;
+        this.defectName = defectName;
+        this.defectQty = defectQty;
+    }
 }

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

@@ -39,5 +39,5 @@ public class MesLineFaultRecord extends BaseBean implements Serializable {
 
     @Column(name = "FAULT_TIME")
     @ApiParam("故障时长（分）")
-    private Double faultTime;
+    private Long faultTime;
 }

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

@@ -23,7 +23,13 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")
+@Table(name = "MES_PACKAGE", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "WORK_ORDER_NO"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE"),
+        @Index(columnList = "IS_SEALED")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "PACKAGE_NO"})
 })
@@ -167,6 +173,14 @@ public class MesPackage extends BaseBean implements Serializable {
     @ApiParam("过程条码")
     private String serialNumber;
 
+    @Transient
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @Transient
+    @ApiParam("客户名称")
+    private String custName;
+
     public MesPackage() {
     }
 
@@ -198,4 +212,16 @@ public class MesPackage extends BaseBean implements Serializable {
         this.defectActionType = defectActionType;
         this.createDatetime = createDatetime;
     }
+
+    public MesPackage(String partNo, String partNameRdd,String workCenterCode, String workOrderNo,
+                      String packageNo, String lotNo, String custCode, String shiftGroup) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.workOrderNo = workOrderNo;
+        this.packageNo = packageNo;
+        this.lotNo = lotNo;
+        this.custCode = custCode;
+        this.shiftGroup = shiftGroup;
+    }
 }

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

@@ -34,6 +34,10 @@ public class MesPackageDetail extends BaseBean implements Serializable {
     @ApiParam("包装编码")
     private String packageNo;
 
+    @Column(name = "CT_LOCATION_NO")
+    @ApiParam("容器位置编号")
+    private String ctLocationNo;
+
     @Column(name = "SERIAL_NUMBER", nullable = false)
     @ApiParam("过程条码")
     private String serialNumber;

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

@@ -34,6 +34,10 @@ public class MesPackageTravel extends BaseBean implements Serializable {
     @ApiParam("包装编码")
     private String packageNo;
 
+    @Column(name = "CT_LOCATION_NO")
+    @ApiParam("容器位置编号")
+    private String ctLocationNo;
+
     @Column(name = "SERIAL_NUMBER")
     @ApiParam("过程条码")
     private String serialNumber;

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

@@ -52,7 +52,7 @@ public class MesPart extends BaseBean implements Serializable {
     @Column(name = "PART_SPEC_QTY", columnDefinition = "decimal(18,8)")
     @ColumnDefault("0")
     @ApiParam("标准包规数量")
-    private Double partSpecQty;
+    private Double partSpecQty = 0d;
 
     @Column(name = "CATEGORY_CODE1")
     @ApiParam("分类1")
@@ -84,15 +84,15 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Column(name = "PROCESS_MATCH_TYPE")
     @ApiParam("过程编码匹配类型")
-    private Integer processMatchType;
+    private Integer processMatchType = 0;
 
     @Column(name = "PACKAGE_MATCH_TYPE")
     @ApiParam("包装编码匹配类型")
-    private Integer packageMatchType;
+    private Integer packageMatchType = 0;
 
     @Column(name = "PRODUCT_MATCH_TYPE")
     @ApiParam("产品编码匹配类型")
-    private Integer productMatchType;
+    private Integer productMatchType = 0;
 
     @Column(name = "PPT_CODE")
     @ApiParam("产品类型代码")
@@ -100,7 +100,7 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Column(name = "PART_TRAIT")
     @ApiParam("物料特性")
-    private Integer partTrait;
+    private Integer partTrait = 0;
 
     @Column(name = "COLOR_CODE")
     @ApiParam("颜色代码")
@@ -112,11 +112,11 @@ public class MesPart extends BaseBean implements Serializable {
 
     @Column(name = "SHELVES_AMOUNT")
     @ApiParam("挂架数")
-    private Integer shelvesAmount;
+    private Integer shelvesAmount = 0;
 
     @Column(name = "QUANTITY_PER_RACK")
     @ApiParam("挂架可放零件数")
-    private Integer quantityPerRack;
+    private Integer quantityPerRack = 0;
 
     @Column(name = "PAINT_TANK_CODE")
     @ApiParam("供漆罐代码")

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : MES_产品容器容量配置
+ * @Reference :
+ * @Author : dominic.xiao
+ * @CreateDate : 2020-11-02 18:04
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_PART_CONTAINER_CAPACITY")
+@Api("MES_产品容器容量配置")
+public class MesPartContainerCapacity extends BaseBean {
+
+    private static final long serialVersionUID = 6438819635320965628L;
+
+    @Column(name = "PART_NO")
+    @ApiParam(value = "物料编码")
+    private String partNo;
+
+    @Column(name = "CT_CODE")
+    @ApiParam(value = "容器类型代码")
+    private String ctCode;
+
+    @Column(name = "CT_LOCATION_NO")
+    @ApiParam(value = "容器位置编号")
+    private String ctLocationNo;
+
+    @Column(name = "CT_QTY")
+    @ApiParam(value = "容量")
+    private Integer ctQty;
+}

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

@@ -96,6 +96,10 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     private Integer alreadyLandedNum;
 
     @Transient
+    @ApiParam("当前库存")
+    private Integer currentStock;
+
+    @Transient
     @ApiParam("物料名称")
     private String partName;
 }

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

@@ -39,6 +39,10 @@ public class MesProduceCtgyPicture extends BaseBean implements Serializable {
     @ApiParam("面位")
     private String sideLocation;
 
+    @Column(name = "DEFECT_LOCATION")
+    @ApiParam("缺陷位置代码")
+    private String defectLocation;
+
     @Column(name = "FILE_ID")
     @ApiParam("文件id")
     private Long fileId;

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

@@ -229,6 +229,10 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("维修状态")
     private Integer repairStatus;
 
+    @Transient
+    @ApiParam("颜色名称")
+    private String colorName;
+
     public MesProduceSn() {
     }
 

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

@@ -16,7 +16,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 
 /**
- * @Description:
+ * @Description: MES_QC_ORDER_DETAIL表的明细表
  * @Reference:
  * @Author: jessica.chen
  * @CreateDate: 2019\11\15 10:01

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
@@ -69,11 +70,11 @@ public class MesQualityStandard extends BaseBean implements Serializable {
 
     @Column(name = "IS_CONCESSION")
     @ApiParam("是否允许让步")
-    private String isConcession;
+    private Integer isConcession;
 
     @Column(name = "CHECK_INTERVAL")
     @ApiParam("间隔时间")
-    private String checkInterval;
+    private Integer checkInterval = 0;
 
     //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
     @Column(name = "NUMBER_FLAG")
@@ -99,13 +100,15 @@ public class MesQualityStandard extends BaseBean implements Serializable {
     @ApiParam("检验值类型")
     private String checkValueType;
 
-    @Column(name = "DIFFERENCE_MAX_LIMIT")
+    @Column(name = "MAXIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("公差上限")
-    private BigDecimal differenceMaxLimit;
+    private Double maximum = 0d;
 
-    @Column(name = "DIFFERENCE_MIN_LIMIT")
+    @Column(name = "MINIMUM", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
     @ApiParam("公差下限")
-    private BigDecimal differenceMinLimit;
+    private Double minimum = 0d;
 
     @Column(name = "IS_KEY_CHECK_ITEM")
     @ApiParam("是否关键检测项")

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

@@ -202,10 +202,11 @@ public class MesQueueOrder extends BaseBean implements Serializable {
         this.workType = workType;
         this.orderNo = orderNo;
     }
-    public MesQueueOrder(Double seq, String partNo, String partNameRdd,Integer boxQty,
+    public MesQueueOrder(Long id, Double seq, String partNo, String partNameRdd,Integer boxQty,
                                Integer queueType,Integer status,String createUser,
                          String createDatetime,String modifyUser,String modifyDatetime,String workType,String orderNo,
                          String workCenterCode, String workCellCode) {
+        this.id = id;
         this.seq = seq;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -45,4 +46,8 @@ public class MesShiftGroup extends BaseBean implements Serializable {
     @Column(name = "SQUAD_LEADER")
     @ApiParam("班长")
     private String squadLeader;
+
+    @Transient
+    @ApiParam("班组数")
+    private String count;
 }

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

@@ -53,4 +53,8 @@ public class MesTypeCfg extends BaseBean implements Serializable {
     @Column(name = "SEQ")
     @ApiParam("顺序")
     private Integer seq;
+
+    @Column(name = "DEFECT_ACTION_TYPE")
+    @ApiParam("不良处理类型")
+    private String defectActionType;
 }

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

@@ -26,10 +26,13 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")},
-        uniqueConstraints = {
-                @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
-        })
+@Table(name = "MES_WORK_ORDER", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "WO_STATUS")
+}, uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO"})
+})
 @Api("生产工单")
 public class MesWorkOrder extends BaseBean implements Serializable {
     private static final long serialVersionUID = -3566003375267865064L;
@@ -81,7 +84,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
 
     @Column(name = "IS_PULL")
     @ApiParam("是否投料")
-    private Integer isPull = 2;
+    private Integer isPull = 1;
 
     @Column(name = "WO_TYPE")
     @ApiParam("工单类型")
@@ -363,14 +366,6 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     private Integer isFictive = 2;
 
     @Transient
-    @ApiParam("圈数")
-    private Integer rounds;
-
-    @Transient
-    @ApiParam("小车号")
-    private String smallCarNo;
-
-    @Transient
     @ApiParam("行颜色")
     private String rowColor;
 
@@ -379,7 +374,7 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     private Integer endCheckQty;
 
     @Transient
-    @ApiParam("终检数量")
+    @ApiParam("打包数量")
     private Integer finalInspectionQty;
 
     @Transient
@@ -390,6 +385,46 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("生产节拍")
     private Integer takt;
 
+    /**********************  动态冗余字段（界面维护大写） *********************************/
+
+    @Transient
+    @ApiParam("基准时间")
+    private String standardDate;
+
+    @Transient
+    @ApiParam("圈数")
+    private Integer rounds;
+
+    @Transient
+    @ApiParam("节拍")
+    private String chainSpeed;
+
+    @Transient
+    @ApiParam("小车号")
+    private String smallCarNo;
+
+    @Transient
+    @ApiParam("小车数量")
+    private String smallCarAmount;
+
+    @Transient
+    @ApiParam("标包")
+    private String standardPackage;
+
+    @Transient
+    @ApiParam("包规代码")
+    private String packageGauge;
+
+    @Transient
+    @ApiParam("反喷标识")
+    private String reverseSprayMark;
+
+    @Transient
+    @ApiParam("模具编号集合")
+    private String mouldCodeList;
+
+
+
 
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;

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

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesDefect;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AssembleDefectModel {
+
+    @ApiParam("组织代码")
+    private String organizeCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @ApiParam("过程条码")
+    private String serialNumber;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("抛光层级model")
+    private AssembleDefectModel polishingModel;
+
+    @ApiParam("拆解层级model")
+    private AssembleDefectModel disassembleModel;
+
+    @ApiParam("不良类型集合")
+    private List<AssembleDefectModel> defectModelList;
+
+    @ApiParam("类型代码")
+    private String typeCode;
+
+    @ApiParam("类型名称")
+    private String typeName;
+
+    @ApiParam("不良集合")
+    private List<MesDefect> defectList;
+
+}

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

@@ -42,4 +42,7 @@ public class DismantleRecordModel {
 
     @ApiParam("不良集合")
     private List<MesDefect> defectList;
+
+    @ApiParam("返修工位标志")
+    private String repairFlag;
 }

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

@@ -1,16 +1,14 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
-import cn.estsh.i3plus.pojo.mes.bean.MesProdBindRecord;
-import cn.estsh.i3plus.pojo.mes.bean.MesProduceSn;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.util.List;
 
 /**
- * @Description: 条码解绑实体
+ * @Description: 异步任务model
  * @Reference:
- * @Author: siliter.yuan
+ * @Author: wangjie
  * @CreateDate: 2020-06-28-11:44
  * @Modify:
  **/
@@ -20,15 +18,6 @@ public class FutrueTaskModel<T> {
     @ApiParam("实现类")
     private Object futrueTaskService;
 
-    @ApiParam("工位请求bean")
-    private StationRequestBean stationRequestBean;
-
-    @ApiParam("产品条码表")
-    private MesProduceSn produceSn;
-
-    @ApiParam("产品绑定记录表")
-    private MesProdBindRecord prodBindRecord;
-
     @ApiParam("组织代码")
     private String organizeCode;
 
@@ -38,12 +27,10 @@ public class FutrueTaskModel<T> {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @ApiParam("总装批量执行逻辑")
-    private List<T> requestBeanList;
-
-    @ApiParam("总装批量执行逻辑")
-    private Object specialBusinessType;
-
+    @ApiParam("数据")
+    private Object Obj;
 
+    @ApiParam("集合")
+    private List<T> list;
 
 }

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

@@ -0,0 +1,33 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ *
+ */
+
+/**
+ * @Description: 中航-工位停线原因（取AndonManageQueue数据）
+ * @CreateDate: 2020/11/2
+ * @Author: simon.song
+ */
+@Data
+public class MesAndonManageQueueModel {
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("故障名称")
+    private String acDesc;
+
+    @ApiParam("故障来源")
+    private String workCellNameRdd;
+
+    @ApiParam("安灯类型")
+    private String alarmDetailNameRdd;
+
+    @ApiParam("事件描述")
+    private String ecDesc;
+
+}

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

@@ -29,6 +29,6 @@ public class MesBoardWorkCenterOverviewModel {
     @ApiParam("工单列表")
     List<MesWorkOrder> workOrderList;
 
-    @ApiParam("班组列表")
-    List<MesShiftGroup> shiftGroupList;
+    @ApiParam("班组信息")
+    MesShiftGroup shiftGroup;
 }

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

@@ -0,0 +1,31 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 中航-产线状态图
+ * @CreateDate: 2020/11/2
+ * @Author: simon.song
+ */
+@Data
+public class MesBoardWorkCenterStatusModel {
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("实时节拍")
+    private String realTimeTakt;
+
+    @ApiParam("工位状态列表")
+    private List<MesWorkCellStatusModel> workCellStatusList;
+
+    @ApiParam("工位停线原因")
+    private List<MesAndonManageQueueModel> workCellStopLineList;
+
+}

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

@@ -0,0 +1,91 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MesQcOrderDetailRecordModel implements Serializable {
+    private static final long serialVersionUID = -7216132883079491432L;
+
+    @ApiParam("检测人")
+    private String createUser;
+
+    @ApiParam("检测时间")
+    private String createDatetime;
+
+    @ApiParam("质检单号")
+    private String orderNo;
+
+    @ApiParam("判定结果")
+    private Integer checkResult = 0;
+
+    @ApiParam("检测值")
+    private String checkValue;
+
+    @ApiParam("产品条码")
+    private String serialNumber;
+
+    @ApiParam("检测顺序")
+    private Integer checkSeq;
+
+
+    @ApiParam("检测类型")
+    private Integer checkType;
+
+    @ApiParam("检测项类型")
+    private String checkItemType;
+
+    @ApiParam("检测项")
+    private String checkItem;
+
+    @ApiParam("检测标准")
+    private String checkStandard;
+
+    @ApiParam("检测指导")
+    private String checkGuide;
+
+    @ApiParam("频率")
+    private String checkFrequency;
+
+    @ApiParam("是否允许让步")
+    private Integer isConcession = 0;
+
+    @ApiParam("检验行号")
+    private Integer itemNo = 0;
+
+//    @ApiParam("产品条码")
+//    private String serialNumber;
+
+    @ApiParam("数量")
+    private Integer qty;
+
+    @ApiParam("已检数量")
+    private Integer finishQty;
+
+    @ApiParam("最大数")
+    private Double maximum = 0d;
+
+    @ApiParam("最小数")
+    private Double minimum = 0d;
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("数据源")
+    private String dataSource;
+
+    @ApiParam("检测值类型")
+    private String checkValueType;
+
+    @ApiParam("是否关键检测项")
+    private Integer isKeyCheckItem;
+
+    @ApiParam(value = "检测项类型名称")
+    private String businessTypeName;
+
+}

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

@@ -45,10 +45,10 @@ public class MesQualityStandardModel {
     private String checkFrequency;
 
     @ApiParam("是否允许让步")
-    private String isConcession;
+    private Integer isConcession;
 
     @ApiParam("间隔时间")
-    private String checkInterval;
+    private Integer checkInterval;
 
     //个数标识：标记那几个数量需要进行检验。使用逗号间隔。如：1,2
     @ApiParam("个数标识")
@@ -70,10 +70,10 @@ public class MesQualityStandardModel {
     private String checkValueType;
 
     @ApiParam("公差上限")
-    private BigDecimal differenceMaxLimit;
+    private Double maximum;
 
     @ApiParam("公差下限")
-    private BigDecimal differenceMinLimit;
+    private Double minimum;
 
     @ApiParam("是否关键检测项")
     private Integer isKeyCheckItem;

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MesWorkCellStatusModel {
+
+    @ApiParam("工位运行状态")
+    private String cellStatus;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+}

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.mes.model;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class MgnBoardAreaYieldModel {
 
@@ -15,4 +17,13 @@ public class MgnBoardAreaYieldModel {
     @ApiParam("注塑")
     private MgnBoardListModel injectMoldBoardListModel;
 
+    @ApiParam("组装集合")
+    private List<MgnBoardListModel> assembleBoardListModelList;
+
+    @ApiParam("涂装集合")
+    private List<MgnBoardListModel> paintBoardListModelList;
+
+    @ApiParam("注塑集合")
+    private List<MgnBoardListModel> injectMoldBoardListModelList;
+
 }

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

@@ -27,6 +27,9 @@ public class MgnBoardAssembleCompRateModel {
     @ApiParam("实际OEE")
     private String finaOee;
 
+    @ApiParam("OEE红线值")
+    private String oeeRedLineValue;
+
     @ApiParam("缺陷名称")
     private String defectName;
 
@@ -45,4 +48,7 @@ public class MgnBoardAssembleCompRateModel {
     @ApiParam("最终良品率")
     private String finalQualifiedRate;
 
+    @ApiParam("不良描述")
+    private String defectMemo;
+
 }

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardListColorModel {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("颜色")
+    private String color;
+
+}

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

@@ -20,28 +20,43 @@ public class MgnBoardListModel {
     @ApiParam("当班实际产量")
     private Double shiftActualYield;
 
-    @ApiParam("当前时间分钟")
+    @ApiParam("时间小时")
     private String currentMinTime;
 
     /**
-     * 开班时间到当前时间按分钟累计计划数量
+     * 开班时间到当前时间按小时累计计划数量
      */
-    @ApiParam("每分钟计划产量")
+    @ApiParam("每小时计划产量")
     private Double minPlanYield;
 
     /**
-     * 开班时间到当前时间按分钟累计实际数量
+     * 开班时间到当前时间按小时累计实际数量
      */
-    @ApiParam("每分钟实际产量")
+    @ApiParam("每小时实际产量")
     private Double minActualYield;
 
     @ApiParam("计划完成率")
     private String planCompleteRate;
 
-    @ApiParam("异常数量")
+    @ApiParam("呼叫异常数量")
     private Integer exceptQty;
 
+    @ApiParam("响应异常数量")
+    private Integer responseQty;
+
     @ApiParam("正常数量")
     private Integer normalQty;
 
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("车间")
+    private String areaCode;
+
+    @ApiParam("颜色")
+    private String color;
+
+    @ApiParam("产线集合")
+    private List<MgnBoardListColorModel> workCenterList;
+
 }

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

@@ -39,4 +39,7 @@ public class MgnPaintPolishingReportModel {
     @ApiParam("组织代码")
     private String organizeCode;
 
+    @ApiParam("不良处理类型")
+    private String defectActionType;
+
 }

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

@@ -1,6 +1,7 @@
 package cn.estsh.i3plus.pojo.mes.model;
 
 import cn.estsh.i3plus.pojo.mes.bean.MesQcCheckData;
+import cn.estsh.i3plus.pojo.mes.bean.MesQcOrder;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
@@ -18,19 +19,19 @@ public class QcCheckDataResultModel {
     private Integer isFirstCheck;
 
     @ApiParam("首检结果")
-    private List<MesQcCheckData> firstCheckResult;
+    private List<MesQcOrder> firstCheckResult;
 
     @ApiParam("是否完成巡检")
     private Integer isOnSiteCheck;
 
     @ApiParam("巡检结果")
-    private List<MesQcCheckData> onSiteCheckResult;
+    private List<MesQcOrder> onSiteCheckResult;
 
     @ApiParam("是否完成尾检")
     private Integer isEndCheck;
 
     @ApiParam("尾检结果")
-    private List<MesQcCheckData> endCheckResult;
+    private List<MesQcOrder> endCheckResult;
 
     public QcCheckDataResultModel() {
     }

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

@@ -356,9 +356,10 @@ public class QueueOrderModel implements Serializable {
     }
 
     // getQueueOrderBySerialNumber
-    public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
+    public QueueOrderModel(Long id, String orderNo, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType,
                            String partNo, String prodCfgTypeCode) {
         this.id = id;
+        this.orderNo = orderNo;
         this.queueGroupNo = queueGroupNo;
         this.jitLotNo = jitLotNo;
         this.vinCode = vinCode;

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

@@ -28,6 +28,12 @@ public class SkillsUserModel {
     @ApiParam(value ="工号")
     private String userEmpNo;
 
+    @ApiParam(value ="工位")
+    private String workCellCode;
+
+    @ApiParam(value ="产线")
+    private String workCenterCode;
+
     @ApiParam("技能矩阵信息")
     private List<MesUserSkill> mesUserSkillList;
 

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

@@ -4,12 +4,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
+import java.io.Serializable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 @Data
-public class TJMgnBoardModel extends BaseBean {
+public class TJMgnBoardModel extends BaseBean implements Serializable {
 
     @ApiParam("工单号")
     private String workOrderNo;
@@ -20,6 +22,12 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("物料名称")
     private String partNameRdd;
 
+    @ApiParam("质量状态")
+    private Integer qcStatus;
+
+    @ApiParam("条码数量")
+    private Integer snQty;
+
     @ApiParam("颜色")
     private String partColor;
 
@@ -47,10 +55,41 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("反喷标识")
     private String reverseSprayMark;
 
+    @ApiParam("班次")
+    private String shiftName;
+
+    @ApiParam("车间配置代码")
+    private String areaConfigCode;
+
     @ApiParam("列名")
     private List<List<String>> headModelList;
 
     @ApiParam("列值")
     private List<List<Double>> headValueModelList;
 
+    @ApiParam("不良汇总列名")
+    private List<String> defectNameList;
+
+    @ApiParam("不良汇总列值")
+    private List<Double> defectValueList;
+
+    @Transient
+    @ApiParam("开始工单")
+    private String workOrderNoStart;
+
+    @Transient
+    @ApiParam("结束工单")
+    private String workOrderNoEnd;
+
+    public TJMgnBoardModel() {
+    }
+
+    public TJMgnBoardModel(String partNo, String partNameRdd, Integer qcStatus, String workOrderNo, Integer snQty) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qcStatus = qcStatus;
+        this.workOrderNo = workOrderNo;
+        this.snQty = snQty;
+    }
+
 }

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

@@ -0,0 +1,28 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/3/9 15:35
+ * @desc
+ */
+@Data
+public class TjMgnBoardEquipmentMonitorModel {
+
+    @ApiParam("工位")
+    private String workCellCode;
+
+    @ApiParam("横坐标")
+    private Double xAxes = 0d;
+
+    @ApiParam("纵坐标")
+    private Double yAxes = 0d;
+
+    @ApiParam("工位状态")
+    private String workCellStatus;
+
+    @ApiParam("颜色")
+    private String color;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java

@@ -1,41 +0,0 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
-
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @Description:
- * @Author: jokelin
- * @Date: 2020/10/28 11:27 AM
- * @Modify:
- */
-@Data
-public class BjBoardModel implements Serializable {
-
-    @ApiParam("jsa数量")
-    private Integer jsaQty;
-    @ApiParam("完成数量")
-    private Integer completeQty;
-    @ApiParam("总数量")
-    private Integer totalQty;
-    @ApiParam("预警数量")
-    private Integer warnQty;
-    @ApiParam("预警率")
-    private Integer warnRate;
-    @ApiParam("目标合格率")
-    private Integer targetRate = 0;
-    @ApiParam("一次合格率")
-    private Integer onceQualityRate = 0;
-
-    @ApiParam("x坐标内容")
-    private String xAxis;
-
-    @ApiParam("x坐标内容")
-    private List<String> xAxisList;
-
-    @ApiParam("显示数据")
-    private List<BjBoardSeriesModel> seriesModels;
-}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardModel.java

@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/10/28 11:27 AM
+ * @Modify:
+ */
+@Data
+public class MgnBjBoardModel implements Serializable {
+
+    private Integer qty;
+    @ApiParam("jsa数量")
+    private Integer jsaQty;
+    @ApiParam("jsa数量")
+    private Integer jsaRate;
+    @ApiParam("完成数量")
+    private Integer completeQty;
+    @ApiParam("完成率")
+    private Integer completeRate;
+    @ApiParam("总数量")
+    private Integer totalQty;
+    @ApiParam("预警数量")
+    private Integer warnQty;
+    @ApiParam("预警率")
+    private Integer warnRate;
+    @ApiParam("目标数量")
+    private Integer targetQty;
+    @ApiParam("计划　数量")
+    private Integer planQty;
+    @ApiParam("目标合格率")
+    private Integer targetRate = 0;
+    @ApiParam("一次合格率")
+    private Integer onceQualityRate = 0;
+    @ApiParam("待生产订单数量")
+    private Integer waitProduceQty = 0;
+    @ApiParam("低于安全库存")
+    private Integer minStockQty;
+    @ApiParam("超出最大库存")
+    private Integer maxStockQty;
+
+    @ApiParam(value = "显示颜色")
+    private String color;
+
+    @ApiParam("x坐标内容")
+    private String xAxis;
+
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @ApiParam("班次人数")
+    private Integer shiftNum;
+
+    @ApiParam("产品位置代码")
+    private String produceCategoryCode;
+
+    @ApiParam("产品位置名称")
+    private String produceCtgyName;
+
+    @ApiParam("时段")
+    private String timeInterval;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxisList;
+
+    private Map<String, Object> resultMap;
+
+    @ApiParam("显示数据")
+    private List<MgnBjBoardSeriesModel> seriesModels;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjBoardSeriesModel.java

@@ -10,7 +10,7 @@ import lombok.Data;
  * @Modify:
  */
 @Data
-public class BjBoardSeriesModel {
+public class MgnBjBoardSeriesModel {
     @ApiParam("名称")
     private String name;
     @ApiParam("显示数量")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/CodeRule.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Document.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Head.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Message.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Pn;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjJitPlanModel.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/MgnBjRecipePartsModel.java

@@ -1,5 +1,6 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
+import cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi.Part;
 import lombok.Data;
 
 import java.util.List;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/OptionCode.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Part.java

@@ -1,12 +1,10 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author Wynne.Lu
@@ -57,8 +55,5 @@ public class Part implements Serializable {
     @ApiParam("Mes物料号")
     private String partNo;
 
-    @ApiParam("单元格编号")
-    private Map<String, String> cellNoMap = new HashMap<>();
-
 
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Parts.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/edi/Pn.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj.edi;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java

@@ -16,6 +16,8 @@ public class OeeModel {
 
     private Integer standardTakt;
 
+    private Double planOee;
+
     private String color;
 
     private Double threshold = 0.03;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java

@@ -21,4 +21,6 @@ public class StaffMatrixModel {
 
     private List<MesStaff> staffs;
 
+    private List<MesStaff> leaders;
+
 }

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

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.IfCustOrderData;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface IfCustOrderDataRepository extends BaseRepository<IfCustOrderData, Long> {
+}

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

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesContainerLocation;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: dominic
+ * @CreateDate: 2020\11\4 11:21
+ * @Modify:
+ **/
+@Repository
+public interface MesContainerLocationRepository extends BaseRepository<MesContainerLocation, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustomerSnRule;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: dominic
+ * @CreateDate: 2020\11\4 11:21
+ * @Modify:
+ **/
+@Repository
+public interface MesCustomerSnRuleRepository extends BaseRepository<MesCustomerSnRule, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesPartContainerCapacity;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: dominic
+ * @CreateDate: 2020\11\4 11:21
+ * @Modify:
+ **/
+@Repository
+public interface MesPartContainerCapacityRepository extends BaseRepository<MesPartContainerCapacity, Long> {
+}

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

@@ -241,10 +241,10 @@ public class MesHqlPack {
             DdlPreparedPack.getStringEqualPack(mesQueueOrder.getWorkType(), "workType", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getCustProdLineCode())) {
-            DdlPreparedPack.getStringLikePack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesQueueOrder.getCustProdLineCode(), "custProdLineCode", packBean);
         }
         if (!StringUtils.isEmpty(mesQueueOrder.getPgCode())) {
-            DdlPreparedPack.getStringLikePack(mesQueueOrder.getPgCode(), "pgCode", packBean);
+            DdlPreparedPack.getStringLikerPack(mesQueueOrder.getPgCode(), "pgCode", packBean);
         }
         if (mesQueueOrder.getQueueType() != null) {
             DdlPreparedPack.getNumEqualPack(mesQueueOrder.getQueueType(), "queueType", packBean);
@@ -708,6 +708,46 @@ public class MesHqlPack {
     }
 
     /**
+     * MES工步信息查询条件封装
+     *
+     * @param staff
+     * @return
+     */
+    public static DdlPackBean getStaff(MesStaff staff, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(staff, organizeCode);
+        if (!StringUtils.isEmpty(staff.getUserCode())) {
+            DdlPreparedPack.getStringLikerPack(staff.getUserCode(), "userCode", packBean);
+        }
+        if (!StringUtils.isEmpty(staff.getUserName())) {
+            DdlPreparedPack.getStringLikerPack(staff.getUserName(), "userName", packBean);
+        }
+        if (!StringUtils.isEmpty(staff.getSkillLevel())) {
+            DdlPreparedPack.getNumEqualPack(staff.getSkillLevel(), "skillLevel", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * 产线看板矩阵
+     *
+     * @param boardLineMatrix
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getBoardLineMatrix(MesBoardLineMatrix boardLineMatrix, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(boardLineMatrix, organizeCode);
+        if (!StringUtils.isEmpty(boardLineMatrix.getAreaCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineMatrix.getAreaCode(), "areaCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardLineMatrix.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(boardLineMatrix.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
      * MES工步参数信息查询条件封装
      *
      * @param stepParam
@@ -3480,4 +3520,109 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * MES下线报工查询条件封装
+     *
+     * @param productOffLine
+     * @return
+     */
+    public static DdlPackBean getIfProductOffLine(IfProductOffLine productOffLine) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(productOffLine, productOffLine.getOrganizeCode());
+        if (!StringUtils.isEmpty(productOffLine.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(productOffLine.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (!StringUtils.isEmpty(productOffLine.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(productOffLine.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(productOffLine.getCreateDateTimeStart()) || !StringUtils.isEmpty(productOffLine.getCreateDateTimeEnd())) {
+            DdlPreparedPack.timeBuilder(productOffLine.getCreateDateTimeStart(), productOffLine.getCreateDateTimeEnd(),
+                    "createDatetime", packBean, true);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES_看板自定义参数配置查询条件封装
+     *
+     * @param boardCustomParamCfg
+     * @return
+     */
+    public static DdlPackBean getBoardCustomParamCfg(MesBoardCustomParamCfg boardCustomParamCfg) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(boardCustomParamCfg, boardCustomParamCfg.getOrganizeCode());
+        if (!StringUtils.isEmpty(boardCustomParamCfg.getBoardCode())) {
+            DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getBoardCode(), "boardCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardCustomParamCfg.getParamCode())) {
+            DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamCode(), "paramCode", packBean);
+        }
+        if (!StringUtils.isEmpty(boardCustomParamCfg.getParamName())) {
+            DdlPreparedPack.getStringLikerPack(boardCustomParamCfg.getParamName(), "paramName", packBean);
+        }
+        return packBean;
+    }
+
+
+    /**
+     * MES容器位置查询条件封装
+     *
+     * @param mesContainerLocation
+     * @return
+     */
+    public static DdlPackBean getMesContainerLocation(MesContainerLocation mesContainerLocation) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesContainerLocation, mesContainerLocation.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesContainerLocation.getOrganizeCode())) {
+            DdlPreparedPack.getStringLikerPack(mesContainerLocation.getOrganizeCode(), "organizeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesContainerLocation.getCtCode())) {
+            DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtCode(), "ctCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesContainerLocation.getCtLocationNo())) {
+            DdlPreparedPack.getStringLikerPack(mesContainerLocation.getCtLocationNo(), "ctLocationNo", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES产品容器容量配置查询条件封装
+     *
+     * @param mesPartContainerCapacity
+     * @return
+     */
+    public static DdlPackBean getMesPartContainerCapacity(MesPartContainerCapacity mesPartContainerCapacity) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesPartContainerCapacity, mesPartContainerCapacity.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesPartContainerCapacity.getOrganizeCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getOrganizeCode(), "organizeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPartContainerCapacity.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtCode())) {
+            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtCode(), "ctCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesPartContainerCapacity.getCtLocationNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPartContainerCapacity.getCtLocationNo(), "ctLocationNo", packBean);
+        }
+        return packBean;
+    }
+
+    /**
+     * MES客户条码规则查询条件封装
+     *
+     * @param mesCustomerSnRule
+     * @return
+     */
+    public static DdlPackBean getMesCustomerSnRule(MesCustomerSnRule mesCustomerSnRule) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustomerSnRule, mesCustomerSnRule.getOrganizeCode());
+        if (!StringUtils.isEmpty(mesCustomerSnRule.getOrganizeCode())) {
+            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getOrganizeCode(), "organizeCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerCode())) {
+            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerCode(), "customerCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustomerSnRule.getCustomerPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesCustomerSnRule.getCustomerPartNo(), "customerPartNo", packBean);
+        }
+        return packBean;
+    }
 }

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

@@ -106,7 +106,7 @@ public class MesPcnHqlPack {
     public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
         DdlPackBean packBean = getAllBaseData(org);
         DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
-        DdlPreparedPack.getNumberBiggerPackContainsZero(0, "rawQty", packBean);
+        DdlPreparedPack.getNumberBiggerPackContainsZero(0d, "rawQty", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", packBean);
         return packBean;
@@ -437,6 +437,8 @@ public class MesPcnHqlPack {
             DdlPreparedPack.getStringLikerPack(mesPackage.getWorkCenterCode(), "workCenterCode", packBean);
         }
 
+        DdlPreparedPack.getStringLikerPack(mesPackage.getFixLotNo(), "fixLotNo", packBean);
+
         // 时间段查询
         DdlPreparedPack.timeBuilder(
                 mesPackage.getCreateDateTimeStart(),

modules/i3plus-pojo-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -60,4 +60,21 @@ public class WmsMessageStyleModel implements Serializable {
             this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
         }
     }
+
+    public WmsMessageStyleModel(String message, double transQty, double actQty, boolean showRed) {
+        this.message = message;
+        if (actQty == 0) {//未处理
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CREATE.getValue();
+        } else if (transQty > actQty) {//处理中
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT.getValue();
+        } else if (actQty == transQty) {//处理完成
+            this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
+        } else if (transQty < actQty) {//处理数量大于需求数量-显示红色
+            if (showRed) {
+                this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.CLOSED.getValue();
+            } else {
+                this.odStatus = WmsEnumUtil.MASTER_ORDER_STATUS.RECEIPT_FINISH.getValue();
+            }
+        }
+    }
 }

modules/i3plus-pojo-platform/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ptl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-softswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-wms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-DEV-SNAPSHOT</version>
+       <version>1.0-TEST-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description 全量BOM
@@ -103,4 +104,15 @@ public class WmsBomTotal extends BaseBean {
     public boolean hasChild() {
         return category != null && category.trim().equals(MGANA_BOM_HAS_CHILD);
     }
+
+    /**
+     * 导入列
+     */
+    @Transient
+    @ApiParam(value = "行数")
+    private Integer rows;
+
+    @Transient
+    @ApiParam(value = "状态")
+    private Integer status;
 }