From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
src/main/resources/mapper/sales/SalesLedgerMapper.xml | 85 ++++++++++++++++++++++++++++--------------
1 files changed, 56 insertions(+), 29 deletions(-)
diff --git a/src/main/resources/mapper/sales/SalesLedgerMapper.xml b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
index 5d83bb1..c5d7aed 100644
--- a/src/main/resources/mapper/sales/SalesLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerMapper.xml
@@ -15,34 +15,6 @@
<select id="selectSalesLedgerList" resultType="com.ruoyi.sales.pojo.SalesLedger">
SELECT
- T1.id,
- T1.sales_contract_no,
- T1.customer_contract_no,
- T1.project_name,
- T1.entry_date,
- T1.salesman,
- T1.customer_id,
- T1.customer_name,
- T1.entry_person,
- T1.remarks,
- T1.attachment_materials,
- T1.tenant_id,
- T1.contract_amount,
- T1.execution_date,
- T2.nick_name AS entry_person_name,
- T1.payment_method
- FROM
- sales_ledger T1
- LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
- <where>
- <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
- T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
- </if>
- </where>
- </select>
-
- <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
- SELECT
T1.id,
T1.sales_contract_no,
T1.customer_contract_no,
@@ -58,10 +30,52 @@
T1.contract_amount,
T1.execution_date,
T2.nick_name AS entry_person_name,
- T1.payment_method
+ T1.payment_method,
+ DATEDIFF(T1.delivery_date, CURDATE()) AS delivery_days_diff
FROM
sales_ledger T1
LEFT JOIN sys_user T2 ON T1.entry_person = T2.user_id
+ <where>
+ <if test="salesLedgerDto.customerName != null and salesLedgerDto.customerName != '' ">
+ T1.customer_name LIKE CONCAT('%',#{salesLedgerDto.customerName},'%')
+ </if>
+ </where>
+ </select>
+
+ <select id="selectSalesLedgerListPage" resultType="com.ruoyi.sales.pojo.SalesLedger">
+ SELECT T1.id,
+ T1.sales_contract_no,
+ T1.customer_contract_no,
+ T1.project_name,
+ T1.entry_date,
+ T1.salesman,
+ T1.customer_id,
+ T1.customer_name,
+ T1.entry_person,
+ T1.remarks,
+ T1.attachment_materials,
+ T1.tenant_id,
+ T1.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
+ 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},'%')
@@ -84,4 +98,17 @@
</where>
order by T1.entry_date desc
</select>
+
+ <select id="selectIncomeStats" resultType="com.ruoyi.home.dto.IncomeExpenseAnalysisDto">
+ SELECT DATE_FORMAT(entry_date, #{dateFormat}) as dateStr, IFNULL(SUM(contract_amount), 0) as amount
+ FROM sales_ledger
+ WHERE entry_date BETWEEN #{startDate} AND #{endDate}
+ GROUP BY dateStr
+ </select>
+
+ <select id="selectCustomerSalesComposition" resultType="com.ruoyi.dto.MapDto">
+ SELECT customer_name as name, CAST(IFNULL(SUM(contract_amount), 0) AS CHAR) as value
+ FROM sales_ledger
+ GROUP BY customer_name
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3