From 6f5111e437ab84749dca1708bf60403091f79e63 Mon Sep 17 00:00:00 2001
From: wusiyu <2015098864@qq.com>
Date: Mon, 8 Jun 2026 14:31:07 +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

---
 .../springblade/wms/mapper/StGoodsMapper.xml  | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

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 d119ea1ca..6fb3ab9c6 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
@@ -107,22 +107,21 @@
     </select>
 
     <select id="queryByShId" resultType="org.springblade.wms.pojo.vo.StGoodsVO">
-        SELECT t.*, s.sh_id
-        FROM st_goods t
-        INNER JOIN ST_STORAGE_LOCATION s
-        ON t.goods_code = s.goods_code
-        <where>
-            AND t.is_deleted = 0
-            AND t.used = 1
-            <!-- 物料编码模糊查询 -->
-            <if test="stGoods.goodsCode != null and stGoods.goodsCode != ''">
-                AND t.goods_code LIKE '%' || #{stGoods.goodsCode} || '%'
-            </if>
-
-            <if test="stGoods.shId != null and stGoods.shId != ''">
-                AND s.sh_id = #{stGoods.shId}
-            </if>
-        </where>
+        SELECT * FROM (
+        SELECT g.*, sl.sh_id,
+        ROW_NUMBER() OVER(PARTITION BY g.goods_code ORDER BY g.id) rn
+        FROM st_goods g
+        INNER JOIN ST_STORAGE_LOCATION sl
+        ON g.goods_code = sl.goods_code
+        WHERE g.is_deleted = 0
+        AND g.used = 1
+        <if test="stGoods.goodsCode != null and stGoods.goodsCode != ''">
+            AND g.goods_code LIKE '%' || #{stGoods.goodsCode} || '%'
+        </if>
+        <if test="stGoods.shId != null and stGoods.shId != ''">
+            AND sl.sh_id = #{stGoods.shId}
+        </if>
+        ) WHERE rn = 1
     </select>
 
 </mapper>