From 530b456eded06e0692e1d8bd5891069439c8f8f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 17 四月 2026 15:10:56 +0800
Subject: [PATCH] fix: 1.已发货的销售台账对应的出入库记录做限制不能删除;2.销售台账入库操作后，点击删除，对应的销售入库记录未一并删除；3.销售台账入库状态新增部分入库
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 01e269c..38592a3 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -31,7 +31,8 @@
T1.execution_date,
T2.nick_name AS entry_person_name,
T1.payment_method,
- DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff
+ DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff,
+ T1.delivery_status AS deliveryStatus
FROM
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
@@ -43,7 +44,8 @@
</select>
<select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
- SELECT T1.id,
+ SELECT
+ T1.id,
T1.sales_contract_no,
T1.customer_contract_no,
T1.project_name,
@@ -53,6 +55,7 @@
T1.customer_name,
T1.entry_person,
T1.remarks,
+ T1.customer_remarks,
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
@@ -61,21 +64,11 @@
T2.nick_name AS entry_person_name,
T1.payment_method,
T1.delivery_date,
+ T1.stock_status,
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
+ T1.delivery_status AS deliveryStatus
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
- FROM shipping_info
- GROUP BY sales_ledger_id
- ) shipping_status_counts ON T1.id = shipping_status_counts.sales_ledger_id
<where>
<if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
AND T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
@@ -95,8 +88,15 @@
<if test="salesLedgerDto.entryDateEnd != null and salesLedgerDto.entryDateEnd != '' ">
AND T1.entry_date <= DATE_FORMAT(#{salesLedgerDto.entryDateEnd},'%Y-%m-%d')
</if>
+
+ <if test="salesLedgerDto.deliveryStatus != null">
+ AND T1.delivery_status = #{salesLedgerDto.deliveryStatus}
+ </if>
+ <if test="salesLedgerDto.stockStatus != null">
+ AND T1.stock_status = #{salesLedgerDto.stockStatus}
+ </if>
</where>
- order by T1.entry_date desc
+ ORDER BY T1.entry_date DESC,T1.id DESC
</select>
<select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
--
Gitblit v1.9.3