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/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