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/basic/ProductModelMapper.xml | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/basic/ProductModelMapper.xml b/src/main/resources/mapper/basic/ProductModelMapper.xml
index afdfc4a..317f5d9 100644
--- a/src/main/resources/mapper/basic/ProductModelMapper.xml
+++ b/src/main/resources/mapper/basic/ProductModelMapper.xml
@@ -13,7 +13,6 @@
<result column="tenant_id" property="tenantId" />
<result column="product_name" property="productName" />
<result column="product_id" property="productId" />
- <result column="product_code" property="productCode" />
</resultMap>
<select id="listPageProductModel" resultType="com.ruoyi.basic.pojo.ProductModel">
select pm.*,p.product_name
@@ -35,5 +34,77 @@
LIMIT 1
</select>
+ <select id="listPageProductionStock" resultType="com.ruoyi.basic.pojo.ProductModel">
+ SELECT
+ pm.id,
+ pm.product_id,
+ pm.model,
+ pm.unit,
+ p.product_name,
+ GREATEST(s.last_in_time, o.last_out_time) AS create_time,
+ COALESCE(s.inboundNum, 0) AS inboundNum,
+ COALESCE(o.outboundNum, 0) AS outboundNum,
+ COALESCE(s.inboundNum, 0) - COALESCE(o.outboundNum, 0) AS stockQuantity
+ FROM product_model pm
+ LEFT JOIN product p ON pm.product_id = p.id
+
+ -- 鍏ュ簱姹囨��
+ LEFT JOIN (
+ SELECT
+ product_model_id,
+ SUM(inbound_num) AS inboundNum,
+ MAX(create_time) AS last_in_time
+ FROM procurement_record_storage
+ <where>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ AND create_time >= #{req.timeStr}
+ AND create_time < DATE_ADD(#{req.timeStr}, INTERVAL 1 DAY)
+ </if>
+ </where>
+ GROUP BY product_model_id
+ ) s ON s.product_model_id = pm.id
+
+ -- 鍑哄簱姹囨��
+ LEFT JOIN (
+ SELECT
+ product_model_id,
+ SUM(inbound_num) AS outboundNum,
+ MAX(create_time) AS last_out_time
+ FROM procurement_record_out
+ <where>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ AND create_time >= #{req.timeStr}
+ AND create_time < DATE_ADD(#{req.timeStr}, INTERVAL 1 DAY)
+ </if>
+ </where>
+ GROUP BY product_model_id
+ ) o ON o.product_model_id = pm.id
+
+ <where>
+ <if test="req.timeStr != null and req.timeStr != ''">
+ AND (s.product_model_id IS NOT NULL OR o.product_model_id IS NOT NULL)
+ </if>
+
+ <if test="req.productCategory != null and req.productCategory != ''">
+ AND EXISTS (
+ SELECT 1
+ FROM sales_ledger_product slp
+ WHERE slp.product_id = p.id
+ AND slp.product_category LIKE CONCAT('%', #{req.productCategory}, '%')
+ )
+ </if>
+ </where>
+
+ ORDER BY pm.id DESC
+ </select>
+ <select id="getProductAndModelList" resultType="java.util.Map">
+ select p.id as id,
+ pm.id as modelId,
+ p.product_name as productName ,
+ pm.model as model
+ from product_model pm
+ left join product p on p.id = pm.product_id
+ order by p.id,pm.id desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3