From 1c8757f865bd5a0c80fa1d44ec4b62dfc6e24e39 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期一, 12 十月 2026 16:55:31 +0800
Subject: [PATCH] fix: 优化客户往来查询逻辑，修复应收金额计算及批号显示问题
---
src/main/resources/mapper/basic/CustomerMapper.xml | 48 +++++++++++++++++------
src/main/resources/mapper/sales/ShippingProductDetailMapper.xml | 36 +++++++++++++----
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 7 ++-
src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java | 1
4 files changed, 67 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
index 89041e6..92f3724 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApprovalInstanceServiceImpl.java
@@ -111,7 +111,6 @@
if (TypeEnums.PURCHASE_APPROVAL.getCode().equals(vo.getBusinessType())) {
// 閲囪喘瀹℃壒 - 鏌ヨ閲囪喘鍗曞彿
PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(vo.getBusinessId());
- System.out.println("涓氬姟绫诲瀷锛�" + purchaseLedger.getPurchaseContractNumber());
if (purchaseLedger != null) {
vo.setPurchaseContractNumber(purchaseLedger.getPurchaseContractNumber());
}
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index ea1fab5..fbe1a7a 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -109,26 +109,40 @@
</where>
order by c.id desc
</select>
+ <!--
+ 瀹㈡埛寰�鏉ワ紙鍥炴鍙拌处涓昏〃锛夛細
+ 搴旀敹閲戦 = 宸插嚭搴撻噾棰� 鈭� 宸查��璐ф 鈭� 宸插洖娆鹃噾棰濓紙涓嶅皬浜� 0锛�
+ 鍗炽�屽洖娆鹃噾棰濄�嶆槸绱鍥炴锛屻�屽簲鏀堕噾棰濄�嶆槸杩樻病鏀跺洖鏉ョ殑閮ㄥ垎銆�
+ 娉ㄦ剰 T3 鎸� (shipping_info, 浜у搧琛�) 鍏堣仛鍚堝啀姹傚拰锛岄伩鍏嶅悓涓�鍙戣揣鍗曞鎵瑰彿鍑哄簱鏃堕噸澶嶈鏁般��
+ -->
<select id="customewTransactions" resultType="com.ruoyi.sales.vo.CustomerTransactionsVo">
select T1.customer_id,
c.customer_name,
T1.contractAmounts,
IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
- IFNULL(T3.outboundAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount
+ GREATEST(
+ IFNULL(T3.outboundAmount, 0) - IFNULL(T4.returnAmount, 0)
+ - IFNULL(T2.receiptPaymentAmount, 0),
+ 0) AS receiptableAmount
from (select customer_id, sum(contract_amount) as contractAmounts from sales_ledger group by customer_id) T1
left join (select customer_id, sum(collection_amount) as receiptPaymentAmount from account_sales_collection group by customer_id) T2 on T1.customer_id = T2.customer_id
left join (
- SELECT
- sl.customer_id,
- sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as outboundAmount
- FROM stock_out_record sor
- LEFT join shipping_info s on sor.record_id = s.id
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
- WHERE sor.record_type='13'
- and sor.approval_status=1
- and slp.type = 1
- group by sl.customer_id
+ SELECT customer_id, sum(shipped_amount) as outboundAmount from (
+ SELECT
+ sl.customer_id,
+ s.id AS shipping_id,
+ s.sales_ledger_product_id,
+ sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as shipped_amount
+ FROM stock_out_record sor
+ LEFT join shipping_info s on sor.record_id = s.id
+ LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
+ LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
+ WHERE sor.record_type='13'
+ and sor.approval_status=1
+ and slp.type = 1
+ group by sl.customer_id, s.id, s.sales_ledger_product_id
+ ) g
+ group by customer_id
) T3 on T3.customer_id=T1.customer_id
left join (
select
@@ -148,6 +162,11 @@
</where>
order by T1.customer_id desc
</select>
+ <!--
+ 瀹㈡埛寰�鏉ユ槑缁嗭紙鎸夐攢鍞彴璐︼級锛氬簲鏀堕噾棰� = 璇ュ彴璐﹀凡鍑哄簱 鈭� 宸查��璐� 鈭� 宸插洖娆俱��
+ 鍗曟潯鍥炴鍙粺璁′竴娆★細鍚屼竴鍥炴鍙兘鍚屾椂鍛戒腑璇ュ彴璐︾殑澶氭潯鍑哄簱璁板綍锛�
+ 鍏堢敤 GROUP BY ascc.id, sl.id 鍘婚噸锛屽啀鎸夊彴璐︽眰鍜屻��
+ -->
<select id="customewTransactionsDetails"
resultType="com.ruoyi.sales.vo.CustomerTransactionsDetailsVo">
select sl.id salesLedgerId,
@@ -155,7 +174,10 @@
sl.execution_date,
sl.contract_amount,
IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
- IFNULL(T2.outboundAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount
+ GREATEST(
+ IFNULL(T2.outboundAmount, 0) - IFNULL(T3.returnAmount, 0)
+ - IFNULL(T1.receiptPaymentAmount, 0),
+ 0) AS receiptableAmount
from sales_ledger sl
left join (
select
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 91d8f5e..734bcc8 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -24,14 +24,17 @@
p.product_name,
sl.customer_name,
spd.totalQuantity,
+ spd.batchNos,
sor.outboundBatches
FROM shipping_info s
- LEFT JOIN (select shipping_info_id,sum(quantity) totalQuantity from shipping_product_detail GROUP BY shipping_info_id) spd ON spd.shipping_info_id = s.id
+ LEFT JOIN (select shipping_info_id, sum(quantity) totalQuantity,
+ GROUP_CONCAT(DISTINCT batch_no ORDER BY batch_no SEPARATOR ',') batchNos
+ from shipping_product_detail GROUP BY shipping_info_id) spd ON spd.shipping_info_id = s.id
LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id and slp.type = 1
left join product_model pm on slp.product_model_id = pm.id
left join product p on pm.product_id = p.id
- left join (select record_id,GROUP_CONCAT(outbound_batches SEPARATOR ',') AS outboundBatches
+ left join (select record_id, GROUP_CONCAT(DISTINCT outbound_batches SEPARATOR ',') AS outboundBatches
from stock_out_record
where record_type='13'and approval_status=1
group by record_id)sor on sor.record_id= s.id
diff --git a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
index 15a6168..af9250f 100644
--- a/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingProductDetailMapper.xml
@@ -10,22 +10,40 @@
<result column="quantity" property="quantity" />
<result column="shipping_info_id" property="shippingInfoId" />
</resultMap>
+ <!--
+ 鍙戣揣鏄庣粏锛堝彂璐у彴璐︺�岃鎯呫�嶉噷鐨勬壒鍙疯〃锛夛細
+ 鎵瑰彿鐩存帴鍙� shipping_product_detail.batch_no锛堝彂璐ф椂閫夊畾鐨勫簱瀛樻壒鍙凤級锛�
+ 浜у搧鍚嶇О/瑙勬牸鐢� spd.product_model_id 鍏宠仈銆�
+ 娉ㄦ剰锛歴tock_inventory_id 鍦ㄦ媶鎵瑰彂璐ф椂鍙兘涓虹┖锛屼笉鑳藉啀闈犲畠鍙栨壒鍙凤紝鍚﹀垯鎵瑰彿銆佽鏍奸兘浼氭槸绌恒��
+ -->
<select id="getDetail" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto">
- select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
+ select spd.batch_no,
+ coalesce(pm.model, pm_inv.model) as specification_model,
+ coalesce(p.product_name, p_inv.product_name) as product_name,
+ spd.quantity as delivery_quantity
from shipping_product_detail spd
left join stock_inventory si on si.id = spd.stock_inventory_id
- left join product_model pm on pm.id = si.product_model_id
+ left join product_model pm on pm.id = spd.product_model_id
left join product p on p.id = pm.product_id
+ left join product_model pm_inv on pm_inv.id = si.product_model_id
+ left join product p_inv on p_inv.id = pm_inv.product_id
where spd.shipping_info_id = #{id}
+ order by spd.id
</select>
<select id="getDateilByShippingNo" resultType="com.ruoyi.sales.dto.ShippingProductDetailDto">
- select si.batch_no, pm.model as specification_model, p.product_name, spd.quantity as delivery_quantity
- from shipping_product_detail spd
- left join shipping_info sp on sp.id = spd.shipping_info_id
- left join stock_inventory si on si.id = spd.stock_inventory_id
- left join product_model pm on pm.id = si.product_model_id
- left join product p on p.id = pm.product_id
- where sp.shipping_no = #{shippingNo}
+ select spd.batch_no,
+ coalesce(pm.model, pm_inv.model) as specification_model,
+ coalesce(p.product_name, p_inv.product_name) as product_name,
+ spd.quantity as delivery_quantity
+ from shipping_product_detail spd
+ left join shipping_info sp on sp.id = spd.shipping_info_id
+ left join stock_inventory si on si.id = spd.stock_inventory_id
+ left join product_model pm on pm.id = spd.product_model_id
+ left join product p on p.id = pm.product_id
+ left join product_model pm_inv on pm_inv.id = si.product_model_id
+ left join product p_inv on p_inv.id = pm_inv.product_id
+ where sp.shipping_no = #{shippingNo}
+ order by spd.id
</select>
</mapper>
--
Gitblit v1.9.3