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/WarehouseGoodsShelvesRowcolMapper.xml |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
index 908e954..ed25288 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesRowcolMapper.xml
@@ -5,24 +5,23 @@
 <mapper namespace="com.ruoyi.warehouse.mapper.WarehouseGoodsShelvesRowcolMapper">
     <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto">
         SELECT
-        doc.doc_name,
-        doc.doc_number,
         wgsr.*,
+        doc.*,
         w.warehouse_name,
-        wgs.goods_shelves_name,
+        wgs.name,
         dc.category
-        FROM documentation doc
-        LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
+        FROM warehouse_goods_shelves_rowcol wgsr
+        LEFT JOIN documentation doc ON doc.warehouse_goods_shelves_rowcol_id = wgsr.id
         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 document_classification dc ON doc.document_classification_id = dc.id
         <where>
             1=1
-            <if test="warehouseGoodsShelvesRowcol.storey != null">
-                and wgsr.storey = #{warehouseGoodsShelvesRowcol.storey}
+            <if test="warehouseGoodsShelvesRowcol.row != null">
+                and wgsr.row = #{warehouseGoodsShelvesRowcol.row}
             </if>
-            <if test="warehouseGoodsShelvesRowcol.arrange != null">
-                and wgsr.arrange = #{warehouseGoodsShelvesRowcol.arrange}
+            <if test="warehouseGoodsShelvesRowcol.col != null">
+                and wgsr.col = #{warehouseGoodsShelvesRowcol.col}
             </if>
             <if test="warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId != null">
                 and wgsr.warehouse_goods_shelves_id = #{warehouseGoodsShelvesRowcol.warehouseGoodsShelvesId}

--
Gitblit v1.9.3