[feat]

品质管理 制程检验
修改制程检验实体类，数字字段类型修改为int；
修改制程检验物料实体类，数字字段类型修改为int，新增物料生产工序列表属性；
修改制程检验物料生产工序实体类，新增制程检验单号、工序检验项目、OK允收报告、特采/让步报告字段；
修改制程检验物料生产工序mapper，新增字段；
修改不合格分类实体类，新增制程检验单号字段；
修改不合格分类mapper，新增字段；

ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingCheckout.java

@@ -45,19 +45,19 @@ public class QualityManufacturingCheckout extends BaseEntity
 
     /** 物料数合计 */
     @Excel(name = "物料数合计")
-    private String materialTotal;
+    private int materialTotal;
 
     /** 数量合计 */
     @Excel(name = "数量合计")
-    private String numTotal;
+    private int numTotal;
 
     /** 制程工序合格数 */
     @Excel(name = "制程工序合格数")
-    private String processQualifiedNum;
+    private int processQualifiedNum;
 
     /** 制程工序不合格数 */
     @Excel(name = "制程工序不合格数")
-    private String processUnqualifiedNum;
+    private int processUnqualifiedNum;
 
     /** 制程工序编号 */
     private String manufacturingProcessCode;
@@ -122,39 +122,39 @@ public class QualityManufacturingCheckout extends BaseEntity
     {
         return materialName;
     }
-    public void setMaterialTotal(String materialTotal) 
+    public void setMaterialTotal(int materialTotal)
     {
         this.materialTotal = materialTotal;
     }
 
-    public String getMaterialTotal() 
+    public int getMaterialTotal()
     {
         return materialTotal;
     }
-    public void setNumTotal(String numTotal) 
+    public void setNumTotal(int numTotal)
     {
         this.numTotal = numTotal;
     }
 
-    public String getNumTotal() 
+    public int getNumTotal()
     {
         return numTotal;
     }
-    public void setProcessQualifiedNum(String processQualifiedNum) 
+    public void setProcessQualifiedNum(int processQualifiedNum)
     {
         this.processQualifiedNum = processQualifiedNum;
     }
 
-    public String getProcessQualifiedNum() 
+    public int getProcessQualifiedNum()
     {
         return processQualifiedNum;
     }
-    public void setProcessUnqualifiedNum(String processUnqualifiedNum) 
+    public void setProcessUnqualifiedNum(int processUnqualifiedNum)
     {
         this.processUnqualifiedNum = processUnqualifiedNum;
     }
 
-    public String getProcessUnqualifiedNum() 
+    public int getProcessUnqualifiedNum()
     {
         return processUnqualifiedNum;
     }

ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingCheckoutMaterial.java

@@ -1,6 +1,8 @@
 package com.ruoyi.quality.domain;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -67,23 +69,23 @@ public class QualityManufacturingCheckoutMaterial extends BaseEntity
 
     /** 生产订单数 */
     @Excel(name = "生产订单数")
-    private String makeTotal;
+    private int makeTotal;
 
     /** 已检验数 */
     @Excel(name = "已检验数")
-    private String checkedNum;
+    private int checkedNum;
 
     /** 本次检验数 */
     @Excel(name = "本次检验数")
-    private String currentCheckoutNum;
+    private int currentCheckoutNum;
 
     /** 工序合格数 */
     @Excel(name = "工序合格数")
-    private String processQualifiedNum;
+    private int processQualifiedNum;
 
     /** 工序不合格数 */
     @Excel(name = "工序不合格数")
-    private String processUnqualifiedNum;
+    private int processUnqualifiedNum;
 
     /** 制程工序编号 */
     @Excel(name = "制程工序编号")
@@ -98,6 +100,8 @@ public class QualityManufacturingCheckoutMaterial extends BaseEntity
     @Excel(name = "检验完成时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date checkoutCompletionTime;
 
+    List<QualityManufacturingMaterialProcess> materialProcessList;
+
     public void setManufacturingCheckoutMaterialId(Long manufacturingCheckoutMaterialId) 
     {
         this.manufacturingCheckoutMaterialId = manufacturingCheckoutMaterialId;
@@ -206,48 +210,48 @@ public class QualityManufacturingCheckoutMaterial extends BaseEntity
     {
         return materialProcessMethod;
     }
-    public void setMakeTotal(String makeTotal) 
+    public void setMakeTotal(int makeTotal)
     {
         this.makeTotal = makeTotal;
     }
 
-    public String getMakeTotal() 
+    public int getMakeTotal()
     {
         return makeTotal;
     }
-    public void setCheckedNum(String checkedNum) 
+    public void setCheckedNum(int checkedNum)
     {
         this.checkedNum = checkedNum;
     }
 
-    public String getCheckedNum() 
+    public int getCheckedNum()
     {
         return checkedNum;
     }
-    public void setCurrentCheckoutNum(String currentCheckoutNum) 
+    public void setCurrentCheckoutNum(int currentCheckoutNum)
     {
         this.currentCheckoutNum = currentCheckoutNum;
     }
 
-    public String getCurrentCheckoutNum() 
+    public int getCurrentCheckoutNum()
     {
         return currentCheckoutNum;
     }
-    public void setProcessQualifiedNum(String processQualifiedNum) 
+    public void setProcessQualifiedNum(int processQualifiedNum)
     {
         this.processQualifiedNum = processQualifiedNum;
     }
 
-    public String getProcessQualifiedNum() 
+    public int getProcessQualifiedNum()
     {
         return processQualifiedNum;
     }
-    public void setProcessUnqualifiedNum(String processUnqualifiedNum) 
+    public void setProcessUnqualifiedNum(int processUnqualifiedNum)
     {
         this.processUnqualifiedNum = processUnqualifiedNum;
     }
 
-    public String getProcessUnqualifiedNum() 
+    public int getProcessUnqualifiedNum()
     {
         return processUnqualifiedNum;
     }
@@ -279,6 +283,14 @@ public class QualityManufacturingCheckoutMaterial extends BaseEntity
         return checkoutCompletionTime;
     }
 
+    public List<QualityManufacturingMaterialProcess> getMaterialProcessList() {
+        return materialProcessList;
+    }
+
+    public void setMaterialProcessList(List<QualityManufacturingMaterialProcess> materialProcessList) {
+        this.materialProcessList = materialProcessList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingMaterialProcess.java

@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 品质管理制程检验物料生产工序对象 quality_manufacturing_material_process
  * 
@@ -18,6 +20,10 @@ public class QualityManufacturingMaterialProcess extends BaseEntity
     /** 物料生产工序Id */
     private Long manufacturingMaterialProcessId;
 
+    /** 制程检验单号 */
+    @Excel(name = "制程检验单号")
+    private String manufacturingCheckoutCode;
+
     /** 料号 */
     @Excel(name = "料号")
     private String materialNo;
@@ -56,13 +62,56 @@ public class QualityManufacturingMaterialProcess extends BaseEntity
 
     /** OK允收数 */
     @Excel(name = "OK允收数")
-    private String okAcceptedNum;
+    private int okAcceptedNum;
 
     /** 特采/让步数 */
     @Excel(name = "特采/让步数")
-    private String specialConcessionsNum;
+    private int specialConcessionsNum;
+
+    /** OK允收报告 */
+    private String okAcceptedPhotourl;
+
+    /** 特采/让步报告 */
+    private String specialConcessionsPhotourl;
+
+//    工序检验项目
+    private String processInspectionItem;
+
+    private List<QualityManufacturingUnqualifiedClass> unqualifiedClassList;
+
+    public String getManufacturingCheckoutCode() {
+        return manufacturingCheckoutCode;
+    }
+
+    public void setManufacturingCheckoutCode(String manufacturingCheckoutCode) {
+        this.manufacturingCheckoutCode = manufacturingCheckoutCode;
+    }
+
+    public String getOkAcceptedPhotourl() {
+        return okAcceptedPhotourl;
+    }
+
+    public void setOkAcceptedPhotourl(String okAcceptedPhotourl) {
+        this.okAcceptedPhotourl = okAcceptedPhotourl;
+    }
+
+    public String getSpecialConcessionsPhotourl() {
+        return specialConcessionsPhotourl;
+    }
+
+    public void setSpecialConcessionsPhotourl(String specialConcessionsPhotourl) {
+        this.specialConcessionsPhotourl = specialConcessionsPhotourl;
+    }
+
+    public String getProcessInspectionItem() {
+        return processInspectionItem;
+    }
 
-    public void setManufacturingMaterialProcessId(Long manufacturingMaterialProcessId) 
+    public void setProcessInspectionItem(String processInspectionItem) {
+        this.processInspectionItem = processInspectionItem;
+    }
+
+    public void setManufacturingMaterialProcessId(Long manufacturingMaterialProcessId)
     {
         this.manufacturingMaterialProcessId = manufacturingMaterialProcessId;
     }
@@ -152,25 +201,33 @@ public class QualityManufacturingMaterialProcess extends BaseEntity
     {
         return modName;
     }
-    public void setOkAcceptedNum(String okAcceptedNum) 
+    public void setOkAcceptedNum(int okAcceptedNum)
     {
         this.okAcceptedNum = okAcceptedNum;
     }
 
-    public String getOkAcceptedNum() 
+    public int getOkAcceptedNum()
     {
         return okAcceptedNum;
     }
-    public void setSpecialConcessionsNum(String specialConcessionsNum) 
+    public void setSpecialConcessionsNum(int specialConcessionsNum)
     {
         this.specialConcessionsNum = specialConcessionsNum;
     }
 
-    public String getSpecialConcessionsNum() 
+    public int getSpecialConcessionsNum()
     {
         return specialConcessionsNum;
     }
 
+    public List<QualityManufacturingUnqualifiedClass> getUnqualifiedClassList() {
+        return unqualifiedClassList;
+    }
+
+    public void setUnqualifiedClassList(List<QualityManufacturingUnqualifiedClass> unqualifiedClassList) {
+        this.unqualifiedClassList = unqualifiedClassList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-admin/src/main/java/com/ruoyi/quality/domain/QualityManufacturingUnqualifiedClass.java

@@ -18,6 +18,10 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity
     /** 工序不合格分类Id */
     private Long manufacturingUnqualifiedClassId;
 
+    /** 制程检验单号 */
+    @Excel(name = "制程检验单号")
+    private String manufacturingCheckoutCode;
+
     /** 制程工序编号 */
     @Excel(name = "制程工序编号")
     private String manufacturingProcessCode;
@@ -93,6 +97,14 @@ public class QualityManufacturingUnqualifiedClass extends BaseEntity
         return processBadNum;
     }
 
+    public String getManufacturingCheckoutCode() {
+        return manufacturingCheckoutCode;
+    }
+
+    public void setManufacturingCheckoutCode(String manufacturingCheckoutCode) {
+        this.manufacturingCheckoutCode = manufacturingCheckoutCode;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingMaterialProcessMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="QualityManufacturingMaterialProcess" id="QualityManufacturingMaterialProcessResult">
         <result property="manufacturingMaterialProcessId"    column="manufacturing_material_process_id"    />
+        <result property="manufacturingCheckoutCode"    column="manufacturing_checkout_code"    />
         <result property="materialNo"    column="material_no"    />
         <result property="materialName"    column="material_name"    />
         <result property="manufacturingProcessCode"    column="manufacturing_process_code"    />
@@ -22,10 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="okAcceptedPhotourl"    column="ok_accepted_photourl"    />
+        <result property="specialConcessionsPhotourl"    column="special_concessions_photourl"    />
+        <result property="processInspectionItem"    column="process_inspection_item"    />
+
     </resultMap>
 
     <sql id="selectQualityManufacturingMaterialProcessVo">
-        select manufacturing_material_process_id, material_no, material_name, manufacturing_process_code, manufacturing_process_name, device_name, device_model_code, process_sequence, workshop_name, mod_name, ok_accepted_num, special_concessions_num, remark, create_by, create_time, update_by, update_time from quality_manufacturing_material_process
+        select manufacturing_material_process_id, manufacturing_checkout_code, material_no, material_name, manufacturing_process_code, manufacturing_process_name, device_name, device_model_code, process_sequence, workshop_name, mod_name, ok_accepted_num, special_concessions_num, remark, create_by, create_time, update_by, update_time, ok_accepted_photourl, special_concessions_photourl, process_inspection_item from quality_manufacturing_material_process
     </sql>
 
     <select id="selectQualityManufacturingMaterialProcessList" parameterType="QualityManufacturingMaterialProcess" resultMap="QualityManufacturingMaterialProcessResult">
@@ -42,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertQualityManufacturingMaterialProcess" parameterType="QualityManufacturingMaterialProcess" useGeneratedKeys="true" keyProperty="manufacturingMaterialProcessId">
         insert into quality_manufacturing_material_process
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="manufacturingCheckoutCode != null">manufacturing_checkout_code,</if>
             <if test="materialNo != null">material_no,</if>
             <if test="materialName != null">material_name,</if>
             <if test="manufacturingProcessCode != null">manufacturing_process_code,</if>
@@ -58,8 +64,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="okAcceptedPhotourl != null">ok_accepted_photourl,</if>
+            <if test="specialConcessionsPhotourl != null">special_concessions_photourl,</if>
+            <if test="processInspectionItem != null">process_inspection_item,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="manufacturingCheckoutCode != null">#{manufacturingCheckoutCode},</if>
             <if test="materialNo != null">#{materialNo},</if>
             <if test="materialName != null">#{materialName},</if>
             <if test="manufacturingProcessCode != null">#{manufacturingProcessCode},</if>
@@ -76,12 +86,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="okAcceptedPhotourl != null">#{okAcceptedPhotourl},</if>
+            <if test="specialConcessionsPhotourl != null">#{specialConcessionsPhotourl},</if>
+            <if test="processInspectionItem != null">#{processInspectionItem},</if>
          </trim>
     </insert>
 
     <update id="updateQualityManufacturingMaterialProcess" parameterType="QualityManufacturingMaterialProcess">
         update quality_manufacturing_material_process
         <trim prefix="SET" suffixOverrides=",">
+            <if test="manufacturingCheckoutCode != null">manufacturing_checkout_code = #{manufacturingCheckoutCode},</if>
             <if test="materialNo != null">material_no = #{materialNo},</if>
             <if test="materialName != null">material_name = #{materialName},</if>
             <if test="manufacturingProcessCode != null">manufacturing_process_code = #{manufacturingProcessCode},</if>
@@ -98,6 +112,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="okAcceptedPhotourl != null">ok_accepted_photourl = #{okAcceptedPhotourl},</if>
+            <if test="specialConcessionsPhotourl != null">special_concessions_photourl = #{specialConcessionsPhotourl},</if>
+            <if test="processInspectionItem != null">process_inspection_item = #{processInspectionItem},</if>
         </trim>
         where manufacturing_material_process_id = #{manufacturingMaterialProcessId}
     </update>

ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingUnqualifiedClassMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="QualityManufacturingUnqualifiedClass" id="QualityManufacturingUnqualifiedClassResult">
         <result property="manufacturingUnqualifiedClassId"    column="manufacturing_unqualified_class_id"    />
+        <result property="manufacturingCheckoutCode"    column="manufacturing_checkout_code"    />
         <result property="manufacturingProcessCode"    column="manufacturing_process_code"    />
         <result property="manufacturingProcessName"    column="manufacturing_process_name"    />
         <result property="processBadClassification"    column="process_bad_classification"    />
@@ -19,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQualityManufacturingUnqualifiedClassVo">
-        select manufacturing_unqualified_class_id, manufacturing_process_code, manufacturing_process_name, process_bad_classification, process_bad_grade, process_bad_num, remark, create_by, create_time, update_by, update_time from quality_manufacturing_unqualified_class
+        select manufacturing_unqualified_class_id, manufacturing_checkout_code, manufacturing_process_code, manufacturing_process_name, process_bad_classification, process_bad_grade, process_bad_num, remark, create_by, create_time, update_by, update_time from quality_manufacturing_unqualified_class
     </sql>
 
     <select id="selectQualityManufacturingUnqualifiedClassList" parameterType="QualityManufacturingUnqualifiedClass" resultMap="QualityManufacturingUnqualifiedClassResult">
@@ -36,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="insertQualityManufacturingUnqualifiedClass" parameterType="QualityManufacturingUnqualifiedClass" useGeneratedKeys="true" keyProperty="manufacturingUnqualifiedClassId">
         insert into quality_manufacturing_unqualified_class
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="manufacturingCheckoutCode != null">manufacturing_checkout_code,</if>
             <if test="manufacturingProcessCode != null">manufacturing_process_code,</if>
             <if test="manufacturingProcessName != null">manufacturing_process_name,</if>
             <if test="processBadClassification != null">process_bad_classification,</if>
@@ -48,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="manufacturingCheckoutCode != null">#{manufacturingCheckoutCode},</if>
             <if test="manufacturingProcessCode != null">#{manufacturingProcessCode},</if>
             <if test="manufacturingProcessName != null">#{manufacturingProcessName},</if>
             <if test="processBadClassification != null">#{processBadClassification},</if>
@@ -64,6 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateQualityManufacturingUnqualifiedClass" parameterType="QualityManufacturingUnqualifiedClass">
         update quality_manufacturing_unqualified_class
         <trim prefix="SET" suffixOverrides=",">
+            <if test="manufacturingCheckoutCode != null">manufacturing_checkout_code = #{manufacturingCheckoutCode},</if>
             <if test="manufacturingProcessCode != null">manufacturing_process_code = #{manufacturingProcessCode},</if>
             <if test="manufacturingProcessName != null">manufacturing_process_name = #{manufacturingProcessName},</if>
             <if test="processBadClassification != null">process_bad_classification = #{processBadClassification},</if>