From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml | 75 +++++++++++++++++++++++++++++++------
1 files changed, 63 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml b/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml
index b263bb6..9edbea4 100644
--- a/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml
+++ b/src/main/resources/mapper/sales/InvoiceRegistrationMapper.xml
@@ -5,17 +5,68 @@
<mapper namespace="com.ruoyi.sales.mapper.InvoiceRegistrationMapper">
<select id="invoiceRegistrationListPage" resultType="com.ruoyi.sales.dto.InvoiceRegistrationDto">
SELECT
- id ,
- sales_ledger_id ,
- sales_contract_no ,
- customer_id ,
- salesman ,
- project_name ,
- create_time ,
- create_user ,
- update_time ,
- update_user ,
- tenant_id
- FROM invoice_registration
+ T1.id ,
+ T1.sales_ledger_id ,
+ T1.sales_contract_no ,
+ T1.customer_id ,
+ T1.salesman ,
+ T1.project_name ,
+ T1.create_time ,
+ T1.create_user ,
+ T1.update_time ,
+ T1.update_user ,
+ T1.tenant_id,
+ T2.customer_contract_no,
+ T3.customer_name,
+ T2.contract_amount,
+ CASE WHEN T4.noInvoiceAmountTotal IS NULL THEN 0 ELSE T4.noInvoiceAmountTotal END AS noInvoiceAmountTotal
+ FROM invoice_registration T1
+ LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
+ LEFT JOIN customer T3 ON T1.customer_id = T3.id
+ LEFT JOIN (
+ SELECT
+ SUM( no_invoice_amount ) AS noInvoiceAmountTotal ,
+ invoice_registration_id
+ FROM
+ invoice_registration_product
+ GROUP BY
+ invoice_registration_id
+ ) T4 ON T1.id = T4.invoice_registration_id
+ </select>
+
+ <select id="invoiceRegisAndProductExcelDtoList" resultType="com.ruoyi.sales.excel.InvoiceRegisAndProductExcelDto">
+ SELECT
+ T1.id ,
+ T1.sales_ledger_id ,
+ T1.sales_contract_no ,
+ T1.customer_id ,
+ T1.salesman ,
+ T1.project_name ,
+ T1.create_time ,
+ T1.create_user ,
+ T1.update_time ,
+ T1.update_user ,
+ T1.tenant_id,
+ T2.customer_contract_no,
+ T3.customer_name,
+ T2.contract_amount,
+ T4.product_category,
+ T4.specification_model,
+ T4.unit,
+ T4.quantity,
+ T4.tax_rate,
+ T4.tax_inclusive_unit_price,
+ T4.tax_inclusive_total_price,
+ T4.tax_exclusive_total_price,
+ T4.invoice_type,
+ T4.invoice_num,
+ T4.invoice_amount,
+ T4.no_invoice_num,
+ T4.no_invoice_amount
+ FROM invoice_registration T1
+ JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
+ JOIN customer T3 ON T1.customer_id = T3.id
+ JOIN invoice_registration_product T4 ON T1.id = T4.invoice_registration_id
+ ORDER BY T1.id ASC
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3