From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index b552627..8942425 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -13,14 +13,18 @@
<select id="listItem" resultType="com.ruoyi.production.dto.ProductProcessRouteItemDto">
select ppri.*,
pp.name as process_name,
- slp.specification_model,
- slp.unit,
- slp.product_category
+ pm.model,
+ pm.unit,
+ pm.material_code as materialCode,
+ p.product_name,
+ case when pwo.complete_quantity>0 then true else false end as is_complete
from product_process_route_item ppri
- left join sales_ledger_product slp on ppri.product_model_id = slp.id
+ left join product_model pm on ppri.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
left join product_process pp on pp.id = ppri.process_id
- where ppri.route_id = #{orderId}
- order by ppri.id
+ left join product_work_order pwo on pwo.product_process_route_item_id = ppri.id
+ where ppri.product_order_id = #{orderId}
+ order by ppri.drag_sort
</select>
--
Gitblit v1.9.3