From b5cb83f31fbd0c1ee2d148851e2838d49912d2cd Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 七月 2026 13:01:35 +0800
Subject: [PATCH] 销售退货新增页面基本信息加上发货类型下拉框，可选货车或者快递。货车 展示发货车牌号，选择快递则展示快递公司，快递单号。对应的列表也要加上相应的字段，采购退货也是一样加下
---
src/main/resources/mapper/basic/SupplierManageMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/basic/SupplierManageMapper.xml b/src/main/resources/mapper/basic/SupplierManageMapper.xml
index 299274c..810e137 100644
--- a/src/main/resources/mapper/basic/SupplierManageMapper.xml
+++ b/src/main/resources/mapper/basic/SupplierManageMapper.xml
@@ -75,7 +75,7 @@
T1.contractAmounts,
IFNULL(T2.paymentAmount, 0) AS paymentAmount,
IFNULL(T3.InboundAmount, 0) - IFNULL(T4.returnAmount, 0) AS payableAmount
- from (select supplier_id, sum(contract_amount) as contractAmounts from purchase_ledger group by supplier_id) T1
+ from (select supplier_id, sum(COALESCE(net_contract_amount, contract_amount)) as contractAmounts from purchase_ledger group by supplier_id) T1
left join (select supplier_id, sum(payment_amount) as paymentAmount from account_purchase_payment group by supplier_id) T2 on T1.supplier_id = T2.supplier_id
left join (
SELECT
@@ -114,7 +114,7 @@
select pl.id purchaseLedgerId,
pl.purchase_contract_number,
pl.execution_date,
- pl.contract_amount,
+ COALESCE(pl.net_contract_amount, pl.contract_amount) AS contract_amount,
IFNULL(T1.paymentAmount, 0) AS paymentAmount,
IFNULL(T2.InboundAmount, 0) - IFNULL(T3.returnAmount, 0) AS payableAmount
from purchase_ledger pl
--
Gitblit v1.9.3