From 9d5128803ebebb5788f13924a5775ac16494dfef Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 18 八月 2025 10:05:05 +0800
Subject: [PATCH] 仓库，树，文档，借出修改
---
src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
index 58479b1..ccffa73 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
@@ -5,21 +5,31 @@
<mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper">
- <select id="listPage" resultType="com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol">
- select * from warehouse_goods_shelves_rowcol
+ <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto">
+ SELECT
+ wgsr.*,
+ w.warehouse_name,
+ wgs.goods_shelves_name,
+ doc.*,
+ 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="warehouseGoodsShelvesRowcol.storey != null">
- and storey = #{warehouseGoodsShelvesRowcol.storey}
+ and wgsr.storey = #{warehouseGoodsShelvesRowcol.storey}
</if>
<if test="warehouseGoodsShelvesRowcol.arrange != null">
- and arrange = #{warehouseGoodsShelvesRowcol.arrange}
+ and wgsr.arrange = #{warehouseGoodsShelvesRowcol.arrange}
</if>
<if test="warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId != null">
- and warehouse_goods_shelves_id = #{warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId}
+ and wgsr.warehouse_goods_shelves_id = #{warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId}
</if>
- <if test="warehouseGoodsShelvesRowcol.warehouseId != null">
- and warehouse_id = #{warehouseGoodsShelvesRowcol.warehouseId}
+ <if test="warehouseGoodsShelvesRowcol.id != null">
+ and wgsr.id = #{warehouseGoodsShelvesRowcol.id}
</if>
</where>
</select>
--
Gitblit v1.9.3