From 55d694aaae4e421b5e55cd941500e08f85cb5d4d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 27 八月 2026 18:21:33 +0800
Subject: [PATCH] feat(sales): 添加框架合同订单功能并优化销售台账管理
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 72 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 735a232..48632ed 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -42,7 +42,7 @@
</where>
</select>
- <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
+ <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.vo.SalesLedgerVo">
SELECT T1.id,
T1.sales_contract_no,
T1.customer_contract_no,
@@ -56,34 +56,22 @@
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
- T1.contract_amount as noInvoiceAmountTotal,
+ T1.net_contract_amount,
+ T1.contract_amount AS noInvoiceAmountTotal,
T1.execution_date,
T2.nick_name AS entry_person_name,
T1.payment_method,
T1.delivery_date,
DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
- CASE
- WHEN shipping_status_counts.total_count = 0 THEN false
- WHEN shipping_status_counts.unshipped_count = 0 THEN true
- ELSE false
- END AS is_fh,
- CASE
- WHEN EXISTS (
- SELECT 1
- FROM product_order po2
- INNER JOIN product_work_order wo2 ON wo2.product_order_id = po2.id
- INNER JOIN production_product_main pm2 ON pm2.work_order_id = wo2.id
- WHERE po2.sales_ledger_id = T1.id
- LIMIT 1
- ) THEN true
- ELSE false
- END AS has_production_record
+ IFNULL(shipping_status_counts.is_all_shipped, FALSE) AS is_fh
FROM sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
LEFT JOIN (
SELECT sales_ledger_id,
- COUNT(*) as total_count,
- SUM(CASE WHEN status != '宸插彂璐�' THEN 1 ELSE 0 END) as unshipped_count
+ CASE
+ WHEN SUM(CASE WHEN status != '宸插彂璐�' THEN 1 ELSE 0 END) = 0 THEN TRUE
+ ELSE FALSE
+ END AS is_all_shipped
FROM shipping_info
GROUP BY sales_ledger_id
) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
@@ -134,5 +122,47 @@
</if>
order by sl.execution_date desc
</select>
+ <select id="selectPurchaseReportVoPage" resultType="com.ruoyi.purchase.vo.PurchaseReportVo">
+ select sl.sales_contract_no customerContractNo,
+ c.customer_name,
+ sl.project_name,
+ sl.contract_amount contractAmount,
+ pl.contract_amount purchaseAmount,
+ sl.contract_amount-pl.contract_amount balance,
+ (sl.contract_amount-pl.contract_amount)/sl.contract_amount balanceRatio
+ from sales_ledger sl
+ left join purchase_ledger pl on sl.id = pl.sales_ledger_id
+ left join customer c on sl.customer_id = c.id
+ <where>
+ <if test="customerName != null and customerName != '' ">
+ and c.customer_name like concat('%',#{customerName},'%')
+ </if>
+ </where>
+ order by sl.entry_date desc
+ </select>
-</mapper>
\ No newline at end of file
+ <select id="listFrameworkOrders" resultType="com.ruoyi.sales.vo.FrameworkOrderVo">
+ select sl.*, IFNULL(shipped.shipped_quantity, 0) AS shippedQuantity
+ from sales_ledger sl
+ left join (
+ select slp.sales_ledger_id, SUM(spd.quantity) AS shipped_quantity
+ from sales_ledger_product slp
+ inner join shipping_info si on slp.id = si.sales_ledger_product_id and si.status = '宸插彂璐�'
+ inner join shipping_product_detail spd on si.id = spd.shipping_info_id
+ group by slp.sales_ledger_id
+ ) shipped on sl.id = shipped.sales_ledger_id
+ where sl.parent_contract_id = #{parentContractId}
+ and sl.contract_type = 3
+ order by sl.execution_date desc
+ </select>
+
+ <select id="sumShippedByParentContract" resultType="java.math.BigDecimal">
+ select IFNULL(SUM(spd.quantity), 0)
+ from sales_ledger slo
+ inner join sales_ledger_product slp on slo.id = slp.sales_ledger_id
+ inner join shipping_info si on slp.id = si.sales_ledger_product_id and si.status = '宸插彂璐�'
+ inner join shipping_product_detail spd on si.id = spd.shipping_info_id
+ where slo.parent_contract_id = #{parentContractId}
+ </select>
+
+</mapper>
--
Gitblit v1.9.3