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/InvoiceLedgerMapper.xml | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
index 11d1538..2874f48 100644
--- a/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceLedgerMapper.xml
@@ -111,15 +111,19 @@
<select id="invoiceLedgerSalesAccount" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
SELECT
- customer_id,
- T2.customer_name,
- SUM( invoice_amount ) invoiceAmount
- FROM
- invoice_ledger T1
- LEFT JOIN customer T2 ON T1.customer_id = T2.id
- GROUP BY
- customer_id,
- T2.customer_name;
+ T1.customer_id as id,
+ T1.customer_name,
+ SUM(contract_amount) AS invoice_total,
+ IFNULL( SUM(T2.receipt_payment_amount) , 0 ) AS receipt_payment_amount,
+ IFNULL((IFNULL(SUM(contract_amount),0) - IFNULL(SUM(T2.receipt_payment_amount),0)),0) AS unReceipt_payment_amount
+ FROM sales_ledger T1
+ LEFT JOIN receipt_payment T2 ON T1.id = T2.sales_ledger_id
+ <where>
+ <if test="invoiceLedgerDto.searchText != null and invoiceLedgerDto.searchText != '' ">
+ T1.customer_name LIKE CONCAT ('%',#{invoiceLedgerDto.searchText},'%')
+ </if>
+ </where>
+ GROUP BY T1.customer_name
</select>
<select id="invoiceLedgerProductInfo" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
@@ -160,5 +164,22 @@
WHERE T1.id = #{id}
</select>
+ <select id="invoicedTotal" resultType="com.ruoyi.sales.dto.InvoiceLedgerDto">
+ SELECT
+ IFNULL(SUM(T1.invoice_total),0) AS invoice_total,
+ T2.sales_ledger_id
+ FROM
+ invoice_ledger T1
+ LEFT JOIN invoice_registration_product T2 ON T1.invoice_registration_product_id = T2.id
+ <where>
+ AND T2.sales_ledger_id IN
+ <foreach collection="salesLedgerIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </where>
+ GROUP BY
+ T2.sales_ledger_id
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3