From 6cffc89eadbbd98e717d21efbccc5ebd83ef1efe Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Fri, 12 Jan 2024 15:40:50 +0800
Subject: [PATCH] =?UTF-8?q?2024-1-12=20=E5=9F=BA=E7=A1=80=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF-BOM=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml b/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml
index acb44733..f9ccc826 100644
--- a/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml
+++ b/op-modules/op-wms/src/main/resources/mapper/wms/BaseBomMapper.xml
@@ -48,6 +48,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		left join base_product bp on right(bp.product_code,11) = bbc.component
 		<where>
 			<if test="bomCode != null  and bomCode != ''"> and bbc.bom_code like concat('%', #{bomCode}, '%')</if>
+			<if test="productDescZh != null  and productDescZh != ''"> and b1.product_desc_zh like concat('%', #{productDescZh}, '%')</if>
+			<if test="productCode != null  and productCode != ''"> and bbc.product_code like concat('%', #{productCode}, '%')</if>
 		</where>
 		GROUP BY bbc.bom_code,bb.bom_bo,b1.product_desc_zh,bbc.product_code
 		order by bbc.bom_code desc