PC出库单商品名称编码查询修改

2026-03-31 10:40:59 +08:00
parent 8dda7c17b6
commit c48ff1babd
4 changed files with 61 additions and 0 deletions
@@ -286,6 +286,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <if test="auditTimeEnd != null and auditTimeEnd != ''">
            and date_format(a.audit_time,'%Y-%m-%d') &lt;= #{auditTimeEnd}
        </if>
+        <!-- 出库明细：物料名称、物料编码（同一明细行同时满足；与出库明细口径一致）。关联 material_base_info 避免明细冗余名称与主档不一致时筛不到 -->
+        <if test="(materialName != null and materialName != '') or (materialCode != null and materialCode != '')">
+            and exists (
+                select 1 from out_material_detail omd
+                left join material_base_info mb on omd.material_base_info_id = mb.material_base_info_id and mb.del_flag = 1
+                where omd.out_order_number = a.out_order_number
+                  and omd.del_flag = 1
+                  and (omd.level is null or omd.level = 1)
+                <if test="materialName != null and materialName != ''">
+                    and (
+                        omd.material_name like concat('%', #{materialName}, '%')
+                        or mb.material_name like concat('%', #{materialName}, '%')
+                    )
+                </if>
+                <if test="materialCode != null and materialCode != ''">
+                    and (
+                        omd.material_code like concat('%', #{materialCode}, '%')
+                        or mb.material_code like concat('%', #{materialCode}, '%')
+                    )
+                </if>
+            )
+        </if>
        <choose>
            <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
            <otherwise> and a.del_flag = 1 </otherwise>