From f9a3ac34d690aafc96757370e1f6f948ad98368d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 九月 2025 17:28:12 +0800
Subject: [PATCH] yys 1.回款登记台账页面，增加一个开票日期列 2.销售台账，在合同金额后面，增加已开票金额、待开票金额、已回款金额、待回款金额
---
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