From 73e27a267afa5eb2c94b3c70aa3556aaef690cea Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 19 八月 2025 09:07:07 +0800
Subject: [PATCH] 修改完善1
---
src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
index dd6371b..8493e2d 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
@@ -4,20 +4,34 @@
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesMapper">
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.WarehouseGoodsShelves">
- select * from warehouse_goods_shelves
+ <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
+ SELECT
+ doc.doc_name,
+ doc.doc_number,
+ wgs.*,
+ w.warehouse_name,
+ dc.category
+ FROM warehouse_goods_shelves_rowcol wgsr
+ LEFT JOIN warehouse_goods_shelves wgs ON wgs.id = wgsr.warehouse_goods_shelves_id
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
+ LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
+ LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
<where>
1=1
- <if test="goodsShelvesName != null and goodsShelvesName != ''">
- and goods_shelves_name like concat('%',#{goodsShelvesName},'%')
+ <if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
+ and wgs.goods_shelves_name like concat('%',#{warehouseGoodsShelves.goodsShelvesName},'%')
</if>
- <if test="warehouseId != null">
- and warehouse_id = #{warehouseId}
+ <if test="warehouseGoodsShelves.warehouseId != null">
+ and wgs.warehouse_id = #{warehouseGoodsShelves.warehouseId}
+ </if>
+ <if test="warehouseGoodsShelves.id != null">
+ and wgs.id = #{warehouseGoodsShelves.id}
</if>
</where>
</select>
- <select id="list" resultType="com.ruoyi.warehouse.pojo.WarehouseGoodsShelves">
- select * from warehouse_goods_shelves
+ <select id="listAll" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
+ select wgs.*,w.warehouse_name from warehouse_goods_shelves wgs
+ LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
<where>
1=1
<if test="warehouseGoodsShelves.goodsShelvesName != null and warehouseGoodsShelves.goodsShelvesName != ''">
@@ -26,7 +40,11 @@
<if test="warehouseGoodsShelves.warehouseId != null">
and warehouse_id = #{warehouseGoodsShelves.warehouseId}
</if>
+ <if test="warehouseGoodsShelves.id != null">
+ and id = #{warehouseGoodsShelves.id}
+ </if>
</where>
</select>
+
</mapper>
--
Gitblit v1.9.3