仓库管理修改

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