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 acb447337..f9ccc8263 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