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

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

@@ -2436,7 +2436,8 @@ public class MesEnumUtil {
 
         NORMAL(10, "正常"),
         REWORK(20, "返修"),
-        ON_LINE(30, "上线工位");
+        ON_LINE(30, "上线工位"),
+        QUALITY_CHECK(40, "质检工位");
 
         private int value;
         private String description;
@@ -5310,7 +5311,8 @@ public class MesEnumUtil {
         BOARD_ORG_HOUR_OEE("BOARD_ORG_HOUR_OEE", " 工厂小时OEE"),
         BOARD_WORK_CELL_STATUS("BOARD_WORK_CELL_STATUS", " 工位状态监听看板"),
         BOARD_HNC_WC_CAPACITY("BOARD_HNC_WC_CAPACITY", " 生产线产能看板"),
-        BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板");
+        BOARD_MGN_CAPACITY("BOARD_MGN_CAPACITY", "产能看板"),
+        BOARD_MGN_STATISTICS("BOARD_MGN_STATISTICS", "天津系统看板");
 
         private String code;
         private String description;
@@ -7830,26 +7832,26 @@ public class MesEnumUtil {
         POLISHING("POLISHING", " 抛光"),
         DETERMIND("DETERMIND", " 待定");
 
-        private String code;
+        private String value;
         private String description;
 
-        DEFECT_TYPE_CODE(String code, String description) {
+        DEFECT_TYPE_CODE(String value, String description) {
-            this.code = code;
+            this.value = value;
             this.description = description;
         }
 
-        public String getCode() {
+        public String getValue() {
-            return code;
+            return value;
         }
 
         public String getDescription() {
             return description;
         }
 
-        public static String valueOfDescription(String code) {
+        public static String valueOfDescription(String value) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].code.equals(code)) {
+                if (values()[i].value.equals(value)) {
                     tmp = values()[i].description;
                 }
             }

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

@@ -5783,4 +5783,57 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 设备故障等级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum TAKET_LEVEL_CODE {
+        NORMAL(10, "A", "不需要报警和安灯处理"),
+        ALARM_CALL_ANDON(20, "B", "不需要报警,安灯记录"),
+        CALL_ANDON(30, "C", "安灯记录"),
+        FORCE_ANDON(40, "D", "强制ANDON呼叫"),
+        STOPLINE_FORCE_ANDON(50, "E", "系统进行记录并停线,强制ANDON呼叫");
+
+        private Integer value;
+        private String code;
+        private String description;
+
+        TAKET_LEVEL_CODE(Integer value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -9197,4 +9197,49 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 质检单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_STATUS_FLAG {
+        NORMAL(1, "NORMAL", "合格"),
+        ABNORMAL(2, "ABNORMAL", "超时");
+
+        private int value;
+        private String code;
+        private String description;
+
+        QC_STATUS_FLAG(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/tool/DdlPreparedPack.java

@@ -496,6 +496,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成大于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberBiggerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " >= :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成小于语句
      *
      * @param columnName 列名
@@ -508,6 +520,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成小于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " < :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成小于等于语句
      *
      * @param columnName 列名
@@ -520,6 +544,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装double对象成小于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerEqualPackContainsZero(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null) {
+            packBean.addColumnQuery(columnName, " and model." + columnName + " <= :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装long或者int的整数对象成equal语句(不等于)
      *
      * @param columnName 列名

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardCustomParamCfg.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;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/4/20 4:49 下午
+ * @Modify:
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_CUSTOM_PARAM_CFG")
+@Api("MES_看板自定义参数配置")
+public class MesBoardCustomParamCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3932883827194753734L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "PARAM_CODE")
+    @ApiParam("参数代码")
+    private String paramCode;
+
+    @Column(name = "PARAM_NAME")
+    @ApiParam("参数名称")
+    private String paramName;
+
+    @Column(name = "PARAM_VALUE")
+    @ApiParam("参数值")
+    private String paramValue;
+}

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

@@ -88,7 +88,7 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     private Integer stockQty;
 
     @Column(name = "MIN_GEN_LOT")
-    @ApiParam("最小生成批次")
+    @ApiParam("最小下达批次")
     private Integer minGenLot;
 
     @Transient

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

@@ -61,6 +61,10 @@ public class MesShift extends BaseBean implements Serializable {
     @ApiParam("班次顺序")
     private Integer shiftSeq;
 
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
     public int getShiftSeqVal() {
         return this.shiftSeq == null ? 0 : this.shiftSeq;
     }

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

@@ -48,4 +48,12 @@ public class MesShiftRest extends BaseBean implements Serializable {
     @ColumnDefault("0")
     @ApiParam("休息时长")
     private Double restTimes;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="REST_DESC")
+    @ApiParam("班休描述")
+    private String restDesc;
 }

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

@@ -77,4 +77,7 @@ public class BoardModel {
 
     @ApiParam("工位状态监控明细")
     private List<MesBoardWorkCell> boardWorkCellList;
+
+    @ApiParam("天津麦格纳看板")
+    private MgnBoardAreaYieldModel mgnBoardAreaYieldModel;
 }

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

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardAreaYieldModel {
+
+    @ApiParam("组装")
+    private MgnBoardListModel assembleBoardListModel;
+
+    @ApiParam("涂装")
+    private MgnBoardListModel paintBoardListModel;
+
+    @ApiParam("注塑")
+    private MgnBoardListModel injectMoldBoardListModel;
+
+}

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

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardAssembleCompRateModel {
+
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @ApiParam("合格率目标值")
+    private String qualifiedRateTargetValue;
+
+    @ApiParam("完成率")
+    private String planCompleteRate;
+
+    @ApiParam("合格率偏差值")
+    private String fpyDeviationValue;
+
+}

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class MgnBoardListModel {
+
+    @ApiParam("产线产量汇总")
+    private List<MgnBoardYieldModel> centerYieldList;
+
+    @ApiParam("月度产量汇总")
+    private List<MgnBoardYieldModel> monthlyYieldList;
+
+    @ApiParam("当班计划产量")
+    private Double shiftPlanYield;
+
+    @ApiParam("当班实际产量")
+    private Double shiftActualYield;
+
+    @ApiParam("计划完成率")
+    private String planCompleteRate;
+
+}

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

@@ -0,0 +1,21 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class MgnBoardYieldModel {
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("日期")
+    private String date;
+
+    @ApiParam("计划产量")
+    private Double planYield;
+
+    @ApiParam("实际产量")
+    private Double actualYield;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardCustomParamCfgRepository.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.MesBoardCustomParamCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesBoardCustomParamCfgRepository extends BaseRepository<MesBoardCustomParamCfg, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsQCStatusModel.java

@@ -0,0 +1,71 @@
+package cn.estsh.i3plus.pojo.wms.modelbean;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @质检完成状态模型
+ * @author jason.niu
+ * @date 2020/10/16
+ */
+@Data
+@Api("质检完成状态模型")
+public class WmsQCStatusModel {
+
+    @ApiParam("工厂代码")
+    private String organizeCode;
+
+    @ApiParam("ASN单号")
+    private String asnOrderNo;
+
+    @ApiParam("质检单号")
+    private String qcOrderNo;
+
+    @ApiParam("物料号")
+    private String partNo;
+
+    @ApiParam("物料名称")
+    private String partName;
+
+    @ApiParam("标准质检时间（分钟）")
+    private Double stdQcTime;
+
+    @ApiParam("收货时间")
+    private String receiveTime;
+
+    @ApiParam("计划质检完成时间")
+    private String planCompleteTime;
+
+    @ApiParam("实际质检完成实际")
+    private String actualCompleteTime;
+
+    @ApiParam("状态")
+    private Integer status;
+
+    @ApiParam("开始时间")
+    private String startDateTime;
+
+    @ApiParam("结束时间")
+    private String endDateTime;
+
+    @ApiParam("零件数量")
+    private Double qty;
+
+    @ApiParam("待质检比例")
+    private Double proportion;
+
+    @ApiParam("标准质检时间")
+    private Integer stdCheckTime;
+
+    public WmsQCStatusModel(String asnOrderNo, String qcOrderNo, String partNo, String partName, Double stdQcTime, Double qty, Double proportion, Integer stdCheckTime) {
+        this.asnOrderNo = asnOrderNo;
+        this.qcOrderNo = qcOrderNo;
+        this.partNo = partNo;
+        this.partName = partName;
+        this.stdQcTime = stdQcTime;
+        this.qty = qty;
+        this.proportion = proportion;
+        this.stdCheckTime = stdCheckTime;
+    }
+}