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/production/ProductionProductMainMapper.xml | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionProductMainMapper.xml b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
index 36b0204..691accc 100644
--- a/src/main/resources/mapper/production/ProductionProductMainMapper.xml
+++ b/src/main/resources/mapper/production/ProductionProductMainMapper.xml
@@ -21,6 +21,7 @@
pp.name as process,
pp.qualified_rate as processQualifiedRate,
pm.model as productModelName,
+ pm.material_code as materialCode,
ppo.quantity,
ppo.scrap_qty,
(ppo.quantity - ppo.scrap_qty) as qualifiedQty,
@@ -67,7 +68,6 @@
ppo.quantity,
ppo.scrap_qty,
ppo.other_data,
- (ppo.quantity - ppo.scrap_qty) as qualifiedQty,
pm.unit
from
production_product_main ppm
@@ -100,6 +100,7 @@
p.product_name,
pm.model as product_model_name,
pm.unit,
+ pm.material_code as materialCode,
slpa.process,
ppo.quantity,
slpa.work_hours,
@@ -150,4 +151,16 @@
#{id}
</foreach>
</delete>
+
+ <select id="checkPreviousProcessReported" resultType="java.lang.Boolean">
+ SELECT CASE WHEN COUNT(*) > 0 THEN TRUE ELSE FALSE END
+ FROM product_work_order current_pwo
+ JOIN product_process_route_item current_ppri ON current_pwo.product_process_route_item_id = current_ppri.id
+ JOIN product_work_order previous_pwo ON previous_pwo.product_order_id = current_pwo.product_order_id
+ JOIN product_process_route_item previous_ppri ON previous_pwo.product_process_route_item_id = previous_ppri.id
+ JOIN production_product_main ppm ON ppm.work_order_id = previous_pwo.id
+ WHERE current_pwo.id = #{workOrderId}
+ AND previous_ppri.product_route_id = current_ppri.product_route_id
+ AND previous_ppri.drag_sort = #{currentDragSort} - 1
+ </select>
</mapper>
--
Gitblit v1.9.3