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/procurementrecord/ProcurementRecordMapper.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
index cffeca8..e1d9381 100644
--- a/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
+++ b/src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -255,12 +255,13 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t2.product_id
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
left join sales_ledger t3 on t3.id = t2.sales_ledger_id
<where>
- t1.type = 2
+ t1.type = 2 and t1.sales_ledger_product_id != 0
<if test="req.customerName != null and req.customerName != ''">
and t3.customer_name like concat('%',#{req.customerName},'%')
</if>
@@ -297,7 +298,8 @@
t1.create_time,
t1.update_time,
t1.create_by,
- t2.warn_num
+ t2.warn_num,
+ t2.product_id
from procurement_record_storage t1
left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id and t2.type = 1
left join sales_ledger t3 on t3.id = t2.sales_ledger_id
@@ -311,6 +313,9 @@
</if>
<if test="req.timeStr != null and req.timeStr != ''">
and t1.create_time like concat('%',#{req.timeStr},'%')
+ </if>
+ <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+ and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
</if>
<if test="req.reportDate != null">
and t1.create_time >= #{req.reportDate} and t1.create_time < DATE_ADD(#{req.reportDate}, INTERVAL 1 DAY)
@@ -331,4 +336,48 @@
group by t2.product_category,t2.specification_model,t1.unit_price
order by t1.create_time desc
</select>
+ <select id="listPagePRS" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDtoCopy">
+ select *
+ from procurement_record_storage t1
+ left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id
+ <where>
+ 1=1
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t2.product_category like concat('%',#{req.productCategory},'%')
+ </if>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.create_time like concat('%',#{req.timeStr},'%')
+ </if>
+ <if test="req.salesLedgerProductId != null and req.salesLedgerProductId != ''">
+ and t1.sales_ledger_product_id = #{req.salesLedgerProductId}
+ </if>
+ </where>
+ </select>
+ <select id="getSumQuantity" resultType="BigDecimal">
+ select COALESCE(sum(inbound_num), 0)
+ from procurement_record_storage
+ where product_model_id = #{productModelId}
+ </select>
+ <select id="listPageByProductProduction" resultType="com.ruoyi.procurementrecord.dto.ProcurementPageDto">
+ select
+ t1.*,
+ t1.inbound_num as inboundNum0,
+ t2.model as specification_model ,
+ t2.unit,
+ t3.product_name as product_category
+ from procurement_record_storage t1
+ left join product_model t2 on t1.product_model_id = t2.id
+ left join product t3 on t2.product_id = t3.id
+ <where>
+ t1.type = 2 and t1.sales_ledger_product_id = 0
+ <if test="req.productCategory != null and req.productCategory != ''">
+ and t3.product_name like concat('%',#{req.productCategory},'%')
+ </if>
+
+ <if test="req.timeStr != null and req.timeStr != ''">
+ and t1.create_time like concat('%',#{req.timeStr},'%')
+ </if>
+ </where>
+ order by t1.create_time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3