From ec3fcef0186691c0dd4e457a4e7154b592f1edb4 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Fri, 6 Jun 2025 13:05:13 +0800
Subject: [PATCH] =?UTF-8?q?update=20mes=E7=89=A9=E6=96=99BOM=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=88=A0=E9=99=A4xml=E9=87=87=E7=94=A8del=5Fflag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/mes/ProdMaterialBomMapper.xml     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml
index deb859b8..127c34b0 100644
--- a/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml
+++ b/ruoyi-modules/hwmom-mes/src/main/resources/mapper/mes/ProdMaterialBomMapper.xml
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--        JOIN base_material_type bmt_parent ON b.parent_material_type_id = bmt_parent.matrial_type_id-->
 <!--        JOIN base_material_type bmt_child ON b.material_type_id = bmt_child.matrial_type_id-->
 <!--        <where>-->
-<!--            b.delete_flag='0'-->
+<!--            b.del_flag='0'-->
 <!--            <if test="parentId != null and parentId != ''">-->
 <!--                AND b.parent_id = #{parentId}-->
 <!--            </if>-->
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--        JOIN base_material_type bmt_parent ON b.parent_material_type_id = bmt_parent.matrial_type_id-->
 <!--        JOIN base_material_type bmt_child ON b.material_type_id = bmt_child.matrial_type_id-->
 <!--        WHERE c.level &lt; 100-->
-<!--        AND b.delete_flag='0'-->
+<!--        AND b.del_flag='0'-->
 <!--        )-->
 <!--        SELECT * FROM BomCTE ORDER BY level, path-->
 <!--    </select>-->
@@ -116,10 +116,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         pmb.material_bom_desc,
         bmt.matrial_type_name as parent_material_type_name
         from base_material_info bmi
-        left join prod_material_bom pmb on pmb.parent_id=bmi.material_id and pmb.material_bom_version = #{materialBomVersion} and pmb.delete_flag='0'
+        left join prod_material_bom pmb on pmb.parent_id=bmi.material_id and pmb.material_bom_version = #{materialBomVersion} and pmb.del_flag='0'
         left join base_material_type bmt on bmi.material_type_id = bmt.matrial_type_id
         <where>
-            pmb.del_flag='0'
             <if test="parentId != null ">and bmi.material_id = #{parentId}</if>
         </where>
         order by bmi.material_id desc
@@ -162,11 +161,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         bmt.matrial_type_code as material_type_code,
         bmt.matrial_type_name as material_type_name
         from base_structure_bom bsb
-        left join prod_material_bom pmb on pmb.material_type_id = bsb.material_type_id and pmb.parent_id = #{parentId} and pmb.material_bom_version=#{materialBomVersion} and pmb.delete_flag='0'
+        left join prod_material_bom pmb on pmb.material_type_id = bsb.material_type_id and pmb.parent_id = #{parentId} and pmb.material_bom_version=#{materialBomVersion} and pmb.del_flag='0'
         left join base_material_info bmi on pmb.material_id=bmi.material_id
         left join base_material_type bmt on bsb.material_type_id = bmt.matrial_type_id
         <where>
-            pmb.del_flag='0'
             <if test="materialTypeCode != null  and materialTypeCode != ''">and bmt.matrial_type_code like concat('%', #{materialTypeCode},
                 '%')
             </if>