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

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

@@ -5897,4 +5897,40 @@ public class MesPcnEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 控制计划审核状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CONTROL_PLAN_AUDIT_TYPE {
+        WAIT_AUDIT(10, "待审核"),
+        AUDIT_PASS(20, "审核通过"),
+        AUDIT_NON_PASS(30, "审核驳回");
+
+        private int value;
+        private String description;
+
+        CONTROL_PLAN_AUDIT_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardImage.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:
+ * @CreateDate: 2020/10/13
+ * @Author: simon.song
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_IMAGE")
+@Api("MES_看板图片")
+public class MesBoardImage extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -3757764185082659130L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "IMAGE_URL")
+    @ApiParam("图片路径")
+    private String imageUrl;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardSwitchCfg.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:
+ * @CreateDate: 2020/10/13
+ * @Author: simon.song
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_SWITCH_CFG")
+@Api("MES_看板切换配置")
+public class MesBoardSwitchCfg extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -9101785840595985385L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "SWITCH_INTERRVAL")
+    @ApiParam("屏切换频次")
+    private Integer switchInterrval;
+
+    @Column(name = "LINE_SWITCH_INTERRVAL")
+    @ApiParam("产线切换频次")
+    private Integer lineSwitchInterrval;
+
+}

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

@@ -0,0 +1,34 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesShiftGroup;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 中航-产线概况-产线概况
+ * @CreateDate: 2020/10/19
+ * @Author: simon.song
+ */
+@Data
+public class MesBoardWorkCenterOverviewModel {
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam(value = "工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("图片路径")
+    private String imageUrl;
+
+    @ApiParam("工单列表")
+    List<MesWorkOrder> workOrderList;
+
+    @ApiParam("班组列表")
+    List<MesShiftGroup> shiftGroupList;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardImageRepository.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.MesBoardImage;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/10/13
+ * @Author: simon.song
+ */
+@Repository
+public interface MesBoardImageRepository extends BaseRepository<MesBoardImage, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardSwitchCfgRepository.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.MesBoardSwitchCfg;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @CreateDate: 2020/10/13
+ * @Author: simon.song
+ */
+@Repository
+public interface MesBoardSwitchCfgRepository extends BaseRepository<MesBoardSwitchCfg, Long> {
+}

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

@@ -216,7 +216,7 @@ public class WmsPart extends BaseBean {
             isRequire = 2, dataSrc = "/wms/work-center/list", listColumnName = "workCenterName", explicitColumnName = "workCenterCode")
     private String productLines;
 
-    @Column(name = "PROPORTION", columnDefinition = "decimal(10,5)")
+    @Column(name = "PROPORTION", columnDefinition = "decimal(10,8)")
     @ApiParam(value = "待质检比例", example = "1")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
     private Double proportion;