From db5eb7cf96d20071bcd7df6194577165aa217bee Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 15 一月 2026 16:59:57 +0800
Subject: [PATCH] 1.修改来票台账详情接口,实时返回未来票数,未来票金额 2.未进行来票登记操作,同步未来票数,金额 3.字段数据类型修改 4.来票台账搜索当天记录sql语句

---
 src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
index 8b1d771..8493e2d 100644
--- a/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
+++ b/src/main/resources/mapper/warehouse/WarehouseGoodsShelvesMapper.xml
@@ -6,10 +6,10 @@
 
     <select id="findList" resultType="com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto">
         SELECT
-        wgsr.*,
+        doc.doc_name,
+        doc.doc_number,
+        wgs.*,
         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
@@ -29,8 +29,9 @@
             </if>
         </where>
     </select>
-    <select id="listAll" 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 != ''">

--
Gitblit v1.9.3