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 | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 7612cda..38592a3 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -55,6 +55,7 @@
T1.customer_name,
T1.entry_person,
T1.remarks,
+ T1.customer_remarks,
T1.attachment_materials,
T1.tenant_id,
T1.contract_amount,
@@ -63,6 +64,7 @@
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,
T1.delivery_status AS deliveryStatus
FROM sales_ledger T1
@@ -90,8 +92,11 @@
<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