过程检测 16 后端接口完毕

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

@@ -29,7 +29,7 @@ import java.io.Serializable;
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_LOOP_QC_GENERATE_DETAIL")
 @Api("MES_巡检项生成明细")
-public class MesLoopQcGenerateDetail extends BaseBean  implements Serializable {
+public class MesLoopQcGenerateDetail extends BaseBean implements Serializable {
 
     private static final long serialVersionUID = -5412635747424111476L;
     @Column(name = "RELATION_ORDER_NO")
@@ -44,9 +44,13 @@ public class MesLoopQcGenerateDetail extends BaseBean  implements Serializable {
     @ApiParam("检测项")
     private String checkItem;
 
-    @Column(name = "LASR_TIME")
+    @Column(name = "CHECK_ORDER_TYPE")
+    @ApiParam("任务单类型")
+    private String checkOrderType;
+
+    @Column(name = "LAST_TIME")
     @ApiParam("末次时间")
-    private String lasrTime;
+    private String lastTime;
 
     @ApiParam(value = "物料号")
     @Transient

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

@@ -0,0 +1,89 @@
+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 java.io.Serializable;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/4/18 21:05
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_QC_ORDER_APPROVAL_STATUS")
+@Api("检测单审批状态表")
+public class MesQcOrderApprovalStatus extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -3157480917343280506L;
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("质检单号")
+    private String orderNo;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线")
+    private String workCenterCode;
+
+    @Column(name = "PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name = "WORK_ORDER_NO")
+    @ApiParam("工单号")
+    private String workOrderNo;
+
+    @Column(name = "PLAN_QTY")
+    @ApiParam("计划数量")
+    private Double planQty;
+
+    @Column(name = "CHECK_TYPE")
+    @ApiParam("检验类型")
+    private Integer checkType;
+
+    @Column(name = "QC_USER")
+    @ApiParam("检查人")
+    private String qcUser;
+
+    @Column(name = "CHECK_RESULT")
+    @ApiParam("检验结果")
+    private String checkResult;
+
+    @Column(name = "IS_KEY_CHECK_ITEM")
+    @ApiParam("是否关键检测")
+    private Integer isKeyCheckItem;
+
+    @Column(name = "QUALITY_APPROVAL_STATUS")
+    @ApiParam("质量经理审批状态")
+    private Integer qualityApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @Column(name = "QUALITY_CHOICE")
+    @ApiParam("质量经理审批状态")
+    private Integer qualityChoice;
+
+    @Column(name = "PRODUCE_APPROVAL_STATUS")
+    @ApiParam("生产经理审批状态")
+    private Integer produceApprovalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+    @Column(name = "PRODUCE_CHOICE")
+    @ApiParam("生产经理审批状态")
+    private Integer produceChoice;
+
+    @Column(name = "APPROVAL_STATUS")
+    @ApiParam("生产经理审批状态")
+    private Integer approvalStatus = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
+
+
+}

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

@@ -0,0 +1,48 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/9/16 00:24
+ * @desc
+ */
+@Data
+public class QcOrderCheckDataDetailModel {
+
+    private Integer checkType;
+
+    private String checkItem;
+
+    private String checkStandard;
+
+    private Integer checkCount;
+
+    private Integer isConcession;
+
+    private Integer isKeyCheckItem;
+
+    private Double max;
+
+    private Double min;
+
+    private String checkValue;
+
+    private Integer checkResult;
+
+
+    public QcOrderCheckDataDetailModel(Integer checkType, String checkItem, String checkStandard, Integer checkCount,
+                                       Integer isConcession, Integer isKeyCheckItem, Double max, Double min,
+                                       String checkValue, Integer checkResult) {
+        this.checkType = checkType;
+        this.checkItem = checkItem;
+        this.checkStandard = checkStandard;
+        this.checkCount = checkCount;
+        this.isConcession = isConcession;
+        this.isKeyCheckItem = isKeyCheckItem;
+        this.max = max;
+        this.min = min;
+        this.checkValue = checkValue;
+        this.checkResult = checkResult;
+    }
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesQcOrderApprovalStatusRepository.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.MesQcOrderApprovalStatus;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\18 10:34
+ * @Modify:
+ **/
+public interface MesQcOrderApprovalStatusRepository extends BaseRepository<MesQcOrderApprovalStatus, Long> {
+}