diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java
index f51e76601..4ab9af3e6 100644
--- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java
+++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java
@@ -30,4 +30,7 @@ public class StGoodsVO extends StGoods {
 	@Schema(description = "库房ID（关联st_storehouse表）")
 	private Long shId;
 
+	@TableField(exist = false)
+	private String goodsCodeAndGoodsName;
+
 }
diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
index 2eb30708a..0af9a2cbc 100644
--- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
+++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StGoodsMapper.xml
@@ -115,6 +115,11 @@
         ON g.goods_code = sl.goods_code
         WHERE g.is_deleted = 0
         AND g.used = 1
+        <if test="stGoods.goodsCodeAndGoodsName != null and stGoods.goodsCodeAndGoodsName != ''">
+            AND (g.goods_code LIKE '%' || #{stGoods.goodsCodeAndGoodsName} || '%'
+            OR g.goods_name LIKE '%' || #{stGoods.goodsCodeAndGoodsName} || '%')
+        </if>
+
         <if test="stGoods.goodsCode != null and stGoods.goodsCode != ''">
             AND g.goods_code LIKE '%' || #{stGoods.goodsCode} || '%'
         </if>