[feat]

品质管理 制程检验
修改制程检验物料mapper，新增按检验单号、料号查找物料方法；
修改制程检验物料工序mapper，新增按检验单号、料号查找工序列表方法；

ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.quality.mapper;
 
 import java.util.List;
+import java.util.Map;
 
 import com.ruoyi.quality.domain.QualityManufacturingCheckout;
 import com.ruoyi.quality.domain.QualityManufacturingCheckoutMaterial;
@@ -82,4 +83,9 @@ public interface QualityManufacturingCheckoutMaterialMapper
      * */
     List<QualityManufacturingCheckoutMaterial> selectCheckoutMaterialByCode(String manufacturingCheckoutCode);
 
+    /*
+     * 根据制程检验单号和料号查找制程检验物料
+     * */
+    public QualityManufacturingCheckoutMaterial selectCheckoutMaterialByCodes(Map codes);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingMaterialProcessMapper.java

@@ -1,6 +1,9 @@
 package com.ruoyi.quality.mapper;
 
 import java.util.List;
+import java.util.Map;
+
+import com.ruoyi.quality.domain.QualityManufacturingCheckoutMaterial;
 import com.ruoyi.quality.domain.QualityManufacturingMaterialProcess;
 
 /**
@@ -74,4 +77,11 @@ public interface QualityManufacturingMaterialProcessMapper
      * @return 结果
      */
     public int restoreQualityManufacturingMaterialProcessById(Long manufacturingMaterialProcessId);
+
+    /*
+     * 根据料号和制程检验单号查找工序列表
+     * */
+    public List<QualityManufacturingMaterialProcess> selectCheckoutMaterialProcessByCodes(Map codes);
+
 }
+

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

@@ -159,4 +159,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update quality_manufacturing_checkout_material set del_flag = '0' where manufacturing_checkout_material_id = #{manufacturingCheckoutMaterialId}
     </update>
 
+    <select id="selectCheckoutMaterialByCodes" parameterType="map" resultMap="QualityManufacturingCheckoutMaterialResult">
+        <include refid="selectQualityManufacturingCheckoutMaterialVo"/>
+        <where>
+            <if test="manufacturingCheckoutCode != null">
+                manufacturing_checkout_code = #{manufacturingCheckoutCode}
+            </if>
+            <if test="materialNo != null">
+                and material_no = #{materialNo}
+            </if>
+        </where>
+    </select>
+
 </mapper>

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

@@ -138,4 +138,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update quality_manufacturing_material_process set del_flag = '0' where manufacturing_material_process_id = #{manufacturingMaterialProcessId}
     </update>
 
+    <select id="selectCheckoutMaterialProcessByCodes" parameterType="map" resultMap="QualityManufacturingMaterialProcessResult">
+        <include refid="selectQualityManufacturingMaterialProcessVo"/>
+        <where>
+            <if test="manufacturingCheckoutCode != null">
+                manufacturing_checkout_code = #{manufacturingCheckoutCode}
+            </if>
+            <if test="materialNo != null">
+                and material_no = #{materialNo}
+            </if>
+        </where>
+    </select>
+
 </mapper>