中航 均值极差

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

@@ -6930,4 +6930,39 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     *
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXTRACT_OBJECT_TYPE {
+        MODEL(10, "实体对象（单表）"),
+        PRODUCT_DATA(20, "动态对象（生产数据表）");
+
+        private Integer value;
+        private String description;
+
+        EXTRACT_OBJECT_TYPE(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesSpcControlCoefficient.java

@@ -0,0 +1,52 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/8/24 17:47
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SPC_CONTROL_COEFFICIENT")
+@Api("MES_SPC控制图系数")
+public class MesSpcControlCoefficient extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -2790965693171941915L;
+
+    @Column(name = "SINGLE_GROUP_QTY")
+    @ApiParam("子组容量")
+    private Integer singleGroupQty;
+
+    @Column(name = "COEFFICIENT_TYPE")
+    @ApiParam("系数类型")
+    private String coefficientType;
+
+    @Column(name = "COEFFICIENT_CODE")
+    @ApiParam("系数代码")
+    private String coefficientCode;
+
+    @Column(name = "COEFFICIENT_DESC")
+    @ApiParam("系数描述")
+    private String coefficientDesc;
+
+    @Column(name = "COEFFICIENT_VALUE")
+    @ApiParam("系数值")
+    private Double coefficientValue;
+
+
+}

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

@@ -0,0 +1,70 @@
+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;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/8/24 17:47
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_SPC_KEY_DATA")
+@Api("MES_SPC关键数据")
+public class MesSpcKeyData extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 2255345691671062029L;
+
+    @Column(name = "KD_CODE")
+    @ApiParam("关键数据代码")
+    private String kdCode;
+
+    @Column(name = "KD_NAME")
+    @ApiParam("关键数据名称")
+    private String kdName;
+
+    @Column(name = "NOMINAL_VALUE")
+    @ApiParam("公称值")
+    private Double nominalValue;
+
+    @Column(name = "SPEC_USL")
+    @ApiParam("规格上限")
+    private Double specUsl;
+
+    @Column(name = "SPEC_LSL")
+    @ApiParam("规格下限")
+    private Double specLsl;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "OBJECT_TYPE")
+    @ApiParam("取值对象类型")
+    private Integer objectType;
+
+    @Column(name = "OBJECT_CODE")
+    @ApiParam("取值对象")
+    private String objectCode;
+
+    @Column(name = "FIELD_CODE")
+    @ApiParam("取值字段")
+    private String fieldCode;
+
+    @Column(name = "KD_CONDITION")
+    @ApiParam("取值条件")
+    private String kdCondition;
+}

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

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/8/24 16:50
+ * @desc
+ */
+@Data
+public class BarModel {
+
+    private String workCenterCode;
+
+    private String keyData;
+
+    private String partNo;
+
+    private Integer count;
+
+    private Integer groupCount;
+
+    private String startTime;
+
+    private String endTime;
+}

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

@@ -87,6 +87,12 @@ public class ProductBiModel {
     @ApiParam("列名")
     private Map<String, String> colMap;
 
+    @ApiParam("工位顺序")
+    private Integer workCellSeq;
+
+    @ApiParam("是否开启工单标识")
+    private Integer opWoFlag;
+
     @Deprecated
     public double getCompleteRate() {
         if (this.planQty != 0) {

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesSpcControlCoefficient;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : if不良信息接口
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-28 16:49
+ * @Modify:
+ **/
+@Repository
+public interface MesSpcControlCoefficientRepository extends BaseRepository<MesSpcControlCoefficient, Long> {
+
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesSpcKeyData;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description : if不良信息接口
+ * @Reference :
+ * @Author : siliter.yuan
+ * @CreateDate : 2020-06-28 16:49
+ * @Modify:
+ **/
+@Repository
+public interface MesSpcKeyDataRepository extends BaseRepository<MesSpcKeyData, Long> {
+    
+}