diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java index ef20b5e8..cf71d592 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingCheckoutMaterialMapper.java +++ b/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 selectCheckoutMaterialByCode(String manufacturingCheckoutCode); + /* + * 根据制程检验单号和料号查找制程检验物料 + * */ + public QualityManufacturingCheckoutMaterial selectCheckoutMaterialByCodes(Map codes); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingMaterialProcessMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingMaterialProcessMapper.java index b4676281..7aff33ef 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/quality/mapper/QualityManufacturingMaterialProcessMapper.java +++ b/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 selectCheckoutMaterialProcessByCodes(Map codes); + } + diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingCheckoutMaterialMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingCheckoutMaterialMapper.xml index 5682a9ac..e0d72384 100644 --- a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingCheckoutMaterialMapper.xml +++ b/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} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingMaterialProcessMapper.xml b/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingMaterialProcessMapper.xml index 279c504b..024320a0 100644 --- a/ruoyi-admin/src/main/resources/mapper/quality/QualityManufacturingMaterialProcessMapper.xml +++ b/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} + + \ No newline at end of file