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/ProductWorkOrderMapper.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index d105ba1..9dc639f 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -21,11 +21,15 @@
<select id="pageProductWorkOrder" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
SELECT
pwo.*,
+ po.batch_no as batchNo,
pp.id as processId,
pp.NAME as processName,
+ pp.qualified_rate as processQualifiedRate,
pm.model,
pm.unit,
+ pm.material_code as materialCode,
p.product_name AS productName,
+ p.id AS productId,
po.nps_no AS productOrderNpsNo,
ppri.drag_sort,
ppri.product_route_id,
@@ -51,7 +55,13 @@
<if test="c.productOrderId != null and c.productOrderId != ''">
and pwo.product_order_id = #{c.productOrderId}
</if>
- order by pwo.priority
+ <if test="c.productOrderNpsNo != null and c.productOrderNpsNo != ''">
+ and po.nps_no like concat('%',#{c.productOrderNpsNo},'%')
+ </if>
+ <if test="c.processName != null and c.processName != ''">
+ and pp.NAME like concat('%',#{c.processName},'%')
+ </if>
+ order by pwo.priority asc, po.id desc, ppri.drag_sort asc
</select>
<select id="getByProductOrderId" resultType="com.ruoyi.production.dto.ProductWorkOrderDto">
@@ -66,10 +76,7 @@
po.nps_no AS productOrderNpsNo,
ppri.drag_sort,
ppri.product_route_id,
- sum(ppo.scrap_qty) scrapQty,
ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
- ROUND(sum(ppo.scrap_qty) / pwo.complete_quantity * 100, 2) AS scrapRate,
- (pwo.complete_quantity - sum(ppo.scrap_qty)) AS completeQty,
CASE
WHEN pwo.complete_quantity >= pwo.plan_quantity THEN '宸茬敓浜�'
WHEN pwo.complete_quantity > 0 AND pwo.complete_quantity < pwo.plan_quantity THEN '鐢熶骇涓�'
@@ -86,8 +93,6 @@
LEFT JOIN product_process pp ON pp.id = ppri.process_id
LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
LEFT JOIN product p ON p.id = pm.product_id
- LEFT JOIN production_product_main ppm ON ppm.work_order_id = pwo.id
- LEFT JOIN production_product_output ppo ON ppo.product_main_id = ppm.id
where po.id=#{productOrderId}
order by ppri.drag_sort
</select>
--
Gitblit v1.9.3