过程检测 演示修改

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

@@ -7217,4 +7217,149 @@ public class MesEnumUtil {
         }
 
     }
+
+    /**
+     * 质检单审批处理意见
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_ORDER_APPROVAL_CHOICE {
+
+        STOP_LINE(10, "停线"),
+        RELEASE(20, "放行");
+
+        private int value;
+        private String description;
+
+        QC_ORDER_APPROVAL_CHOICE(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)
+    public enum CHECK_RESULT {
+
+        PASS(10, "通过"),
+        NON_PASS(20, "不通过"),
+        CONCESSION_PRODUCTION(30, "让步生产");
+
+        private int value;
+        private String description;
+
+        CHECK_RESULT(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)
+    public enum QC_ORDER_APPROVAL_TYPE {
+
+        STOP_LINE(10, "停线"),
+        RELEASE(20, "放行");
+
+        private int value;
+        private String description;
+
+        QC_ORDER_APPROVAL_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;
+        }
+    }
+
+    /**
+     * 检测单明细的检测结果
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QC_ORDER_DETAIL_CHECK_RESULT {
+
+        OK(10, "OK"),
+        NG(20, "NG");
+
+        private int value;
+        private String description;
+
+        QC_ORDER_DETAIL_CHECK_RESULT(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-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java

@@ -80,7 +80,9 @@ public class MesPcnEnumUtil {
             return value;
         }
 
-        public String getData() { return data; }
+        public String getData() {
+            return data;
+        }
 
         public String getDescription() {
             return description;
@@ -5216,9 +5218,9 @@ public class MesPcnEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum QC_CHECK_DATA_SOURCE {
-        DB(10, "10", "数据库"),
+        MANUAL_INPUT(10, "10", "人工输入"),
-        PLC(20, "20", "PLC"),
+        DB(30, "30", "数据库"),
-        MANUAL_INPUT(30, "30", "人工输入");
+        PLC(20, "20", "PLC");
 
         private int value;
         private String description;

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

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: jessica.chen
+ * @CreateDate: 2019\11\15 10:01
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_GENERATE_QC_ORDER")
+@Api("待生成检验单")
+public class MesGenerateQcOrder extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 14873669015484197L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("质检单号")
+    private String orderNo;
+
+    @Column(name = "IS_GENERATED")
+    @ApiParam("是否生成了末检单")
+    private Integer isGenerated = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @Column(name = "GENERATE_TIME")
+    @ApiParam("生成时间")
+    private String generateTime;
+
+
+}

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

@@ -100,6 +100,10 @@ public class MesQcCheckStandard extends BaseBean implements Serializable {
     @ApiParam("任务单类型")
     private String checkValueType;
 
+    @Column(name = "CHECK_CFG_NO")
+    @ApiParam("检测值配置编号")
+    private String checkCfgNo;
+
     @Column(name = "MAXIMUM")
     @ApiParam("最大数")
     private Double maximum = 0d;

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

@@ -14,6 +14,7 @@ import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description:
@@ -29,7 +30,7 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QC_ORDER")
 @Api("MES_检验单")
-public class MesQcOrder extends BaseBean  implements Serializable {
+public class MesQcOrder extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = -5412635747424111476L;
     @Column(name = "ORDER_NO")
@@ -84,9 +85,9 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("状态")
     private Integer status;
 
-    @Column(name = "CHECK_REULST")
+    @Column(name = "CHECK_RESULT")
     @ApiParam("检测整体结果")
-    private Integer checkReulst = 0;
+    private Integer checkResult = 0;
 
     @Column(name = "MEMO")
     @ApiParam("备注")
@@ -116,9 +117,14 @@ public class MesQcOrder extends BaseBean  implements Serializable {
     @ApiParam("任务单类型")
     private String checkOrderType;
 
+    @Deprecated
     @ApiParam(value = "检测结果")
     @Transient
-    private String reulstStatus;
+    private String resultStatus;
+
+    @ApiParam(value = "显示按钮")
+    @Transient
+    private List<String> buttons;
 
     @ApiParam(value = "产品条码")
     @Transient

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import java.io.Serializable;
 
@@ -26,7 +27,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QC_ORDER_RECORD")
+@Table(name = "MES_QC_ORDER_RECORD", indexes = {
+        @Index(columnList = "QC_ORDER_DETAIL_ID"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "ORDER_NO")
+})
 @Api("MES_检验单检验记录")
 public class MesQcOrderRecord extends BaseBean implements Serializable {
     private static final long serialVersionUID = -5245624982023882232L;
@@ -51,4 +56,8 @@ public class MesQcOrderRecord extends BaseBean implements Serializable {
     @ApiParam("检测顺序")
     private Integer checkSeq;
 
+    @Column(name = "QC_ORDER_DETAIL_ID")
+    @ApiParam("质检单明细id")
+    private Long qcOrderDetailId;
+
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesGenerateQcOrderRepository.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.MesGenerateQcOrder;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesGenerateQcOrderRepository extends BaseRepository<MesGenerateQcOrder, Long> {
+}