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/purchase/InvoicePurchaseMapper.xml | 55 ++++++++++++++++++-------------------------------------
1 files changed, 18 insertions(+), 37 deletions(-)
diff --git a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
index 413f293..c5a99f9 100644
--- a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
+++ b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
@@ -7,49 +7,27 @@
<select id="selectPurchaseReport" resultType="com.ruoyi.purchase.dto.InvoicePurchaseReportDto">
SELECT
- A.*,
- FORMAT(A.sales_tax_amount - A.purchase_tax_amount, 2) AS balance_amount
- FROM (
- SELECT
- sl.customer_contract_no,
- sl.id,
- pl.id AS pl_id,
+ sl.sales_contract_no AS customerContractNo,
sl.customer_name,
- sl.project_name,
- slp.tax_inclusive_total_price - slp.tax_exclusive_total_price AS contract_amount,
- SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price) AS purchase_amount,
- (slp.tax_exclusive_total_price) / COUNT(slp.id) AS sale_tax_exclusive_total_price,
- SUM(slp1.tax_exclusive_total_price) AS tax_exclusive_total_price,
- (slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) -
- SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price) AS balance,
- CONCAT(
- FORMAT(
- ((slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) -
- SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price)) /
- (slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) * 100,
- 2),
- '%'
- ) AS balance_ratio,
- (slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) AS sales_tax_amount,
- SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price) AS purchase_tax_amount
+ sl.contract_amount AS contract_amount,
+ SUM( pl.contract_amount ) AS purchase_amount,
+ (
+ sl.contract_amount - SUM( pl.contract_amount )) AS balance,
+ CONCAT( ROUND( ( sl.contract_amount - SUM( pl.contract_amount )) / sl.contract_amount * 100, 1 ), '%' ) AS balance_ratio
FROM
- purchase_ledger pl
- LEFT JOIN
- sales_ledger sl ON pl.sales_ledger_id = sl.id
- LEFT JOIN
- sales_ledger_product slp ON slp.sales_ledger_id = sl.id AND slp.type = 1
- LEFT JOIN
- sales_ledger_product slp1 ON slp1.sales_ledger_id = pl.id AND slp1.type = 2
- GROUP BY
- sl.customer_contract_no, sl.customer_name, sl.project_name, sl.id, pl.id
- HAVING
- sl.customer_contract_no IS NOT NULL
- ) A
+ sales_ledger sl
+ INNER JOIN purchase_ledger pl ON sl.sales_contract_no = pl.sales_contract_no
<where>
<if test="c.customerName != null and c.customerName != ''">
- AND A.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
+ AND sl.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
</if>
</where>
+ GROUP BY
+ sl.sales_contract_no,
+ sl.customer_name,
+ sl.contract_amount
+ ORDER BY
+ sl.sales_contract_no
</select>
<select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
select *
@@ -66,6 +44,7 @@
LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
WHERE il.invoice_no IS NOT NULL
AND invoice_type = '澧炰笓绁�'
+ AND DATE_FORMAT(il.invoice_date, '%Y-%m') IS NOT NULL -- 鏂板锛氳繃婊onth涓篘ULL鐨勬儏
GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
) a1
LEFT JOIN (
@@ -124,12 +103,14 @@
LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
WHERE il.invoice_no IS NOT NULL
AND invoice_type = '澧炰笓绁�'
+ AND DATE_FORMAT(il.invoice_date, '%Y-%m') IS NOT NULL -- 鏂板锛氳繃婊onth涓篘ULL鐨勬儏
GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
) a1 ON a1.month = a2.month
WHERE a1.month IS NULL
ORDER BY month
)as a
<where>
+ a.month is not null
<if test="month != null">
and a.month = #{month}
</if>
--
Gitblit v1.9.3