From a530b9e774fb657d283927ec7d9e396c930b67ef Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Tue, 16 Jun 2026 13:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/springblade/wms/pojo/vo/StGoodsVO.java | 3 +++ .../main/java/org/springblade/wms/mapper/StGoodsMapper.xml | 5 +++++ 2 files changed, 8 insertions(+) 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 + + AND (g.goods_code LIKE '%' || #{stGoods.goodsCodeAndGoodsName} || '%' + OR g.goods_name LIKE '%' || #{stGoods.goodsCodeAndGoodsName} || '%') + + AND g.goods_code LIKE '%' || #{stGoods.goodsCode} || '%'