From f0b260f69bbfb53f46bbc115fce7c3fb75e1dd2d Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期四, 04 六月 2026 21:57:01 +0800
Subject: [PATCH] 提交 山西宏腾新型环保科技有限责任公司 配置文件

---
 src/main/resources/mapper/warehouse/DocumentationMapper.xml |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/DocumentationMapper.xml b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
index f5f9f73..503f175 100644
--- a/src/main/resources/mapper/warehouse/DocumentationMapper.xml
+++ b/src/main/resources/mapper/warehouse/DocumentationMapper.xml
@@ -32,6 +32,7 @@
         <if test="documentation.id != null">
             and doc.id = #{documentation.id}
         </if>
+        order by doc.create_time desc
     </select>
     <select id="listByDocumentClassificationId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
         SELECT
@@ -50,5 +51,38 @@
         LEFT JOIN warehouse w ON w.id = wgs.warehouse_id
         where doc.document_classification_id = #{documentClassificationId}
     </select>
+    <select id="list" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+        SELECT
+            doc.*,
+            dc.category,
+            CONCAT(
+                    w.warehouse_name, '-',
+                    wgs.name, '-',
+                    wgsr.row, '灞�-',
+                    wgsr.col, '鍒�'
+                ) AS location_info  -- 鍚堝苟鍚庣殑瀛楁鍚�
+        FROM documentation doc
+         LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+         LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_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
+    </select>
+    <select id="listBywarehouseGoodsShelvesRowcolId" resultType="com.ruoyi.warehouse.dto.DocumentationDto">
+        SELECT
+        doc.*,
+        dc.category,
+        CONCAT(
+        w.warehouse_name, '-',
+        wgs.name, '-',
+        wgsr.row, '灞�-',
+        wgsr.col, '鍒�'
+        ) AS location_info  -- 鍚堝苟鍚庣殑瀛楁鍚�
+        FROM documentation doc
+        LEFT JOIN document_classification dc ON doc.document_classification_id = dc.id
+        LEFT JOIN warehouse_goods_shelves_rowcol wgsr ON wgsr.id = doc.warehouse_goods_shelves_rowcol_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
+        where doc.warehouse_goods_shelves_rowcol_id = #{warehouseGoodsShelvesRowcolId}
+    </select>
 
 </mapper>

--
Gitblit v1.9.3