开发天津看板功能

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;

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/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> {
+}