From 10570a9fa5e87231210a449eddc732c7d0599349 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 24 八月 2026 16:02:55 +0800
Subject: [PATCH] fix: 报工计算修改
---
src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java | 12 ++
src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java | 10 -
src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java | 13 +++
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 99 +++---------------------
src/main/java/com/ruoyi/production/util/TaskPlanQuantityUtil.java | 54 +++++++++++++
5 files changed, 93 insertions(+), 95 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java
index c1e665c..acad3ef 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionBomStructureServiceImpl.java
@@ -822,14 +822,22 @@
if (bomStructure == null) {
return null;
}
- // The root node is the first output node; other rows use their direct parent as the current operation output.
- if (bomStructure.getParentId() == null) {
+ if (bomStructure.getParentId() == null || hasChildren(bomStructure, structureById)) {
return bomStructure;
}
ProductionBomStructure parent = structureById.get(bomStructure.getParentId());
return parent != null ? parent : bomStructure;
}
+ private boolean hasChildren(ProductionBomStructure bomStructure,
+ Map<Long, ProductionBomStructure> structureById) {
+ if (bomStructure == null || bomStructure.getId() == null || structureById == null) {
+ return false;
+ }
+ return structureById.values().stream()
+ .anyMatch(child -> child != null && Objects.equals(child.getParentId(), bomStructure.getId()));
+ }
+
private Long resolveOutputProductModelId(ProductionBomStructure outputNode,
Long rootProductModelId) {
if (outputNode == null) {
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
index 75d0696..a9ef7ae 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderRoutingOperationServiceImpl.java
@@ -39,7 +39,6 @@
private final ProductionOrderRoutingMapper productionOrderRoutingMapper;
private final ProductionOrderBomMapper productionOrderBomMapper;
private final ProductionBomStructureMapper productionBomStructureMapper;
- private final TechnologyRoutingOperationMapper technologyRoutingOperationMapper;
@Override
public R addRouteItem(ProductionOrderRoutingOperation productionOrderRoutingOperation) {
@@ -159,14 +158,11 @@
Map<String, BigDecimal> operationDemandedQuantityMap =
TaskPlanQuantityUtil.buildOperationDemandedQuantityMap(orderBomStructureList, rootProductModelId);
- // 鑾峰彇宸ヨ壓璺嚎宸ュ簭锛堢敤浜庤绠楄鍒掓暟閲忥級
- TechnologyRoutingOperation sourceOperation = technologyRoutingOperationMapper.selectById(
- updatedOperation.getTechnologyRoutingOperationId());
- // 灏嗗師鏉ョ殑绉佹湁鏂规硶鏇挎崲涓鸿皟鐢ㄥ伐鍏风被
+ // 鎸夎鍗曞伐鑹鸿矾绾垮揩鐓х殑浜у嚭瑙勬牸璇诲彇瀵瑰簲 BOM 闇�姹傞噺銆�
BigDecimal planQuantity = TaskPlanQuantityUtil.resolveTaskPlanQuantity(
- sourceOperation,
+ updatedOperation,
operationDemandedQuantityMap,
- productionOrder,
+ productionOrder.getQuantity(),
rootProductModelId);
task.setPlanQuantity(planQuantity);
task.setCompleteQuantity(BigDecimal.ZERO);
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
index 00a20de..4d98b79 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -34,6 +34,7 @@
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
import com.ruoyi.production.service.ProductionOrderService;
+import com.ruoyi.production.util.TaskPlanQuantityUtil;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.stock.mapper.StockInventoryMapper;
@@ -250,7 +251,7 @@
.eq(TechnologyRoutingOperation::getTechnologyRoutingId, technologyRouting.getId())
.orderByDesc(TechnologyRoutingOperation::getDragSort)
.orderByDesc(TechnologyRoutingOperation::getId));
- // Build task plan quantities from order BOM snapshot demand instead of recomputing from technology BOM units.
+ // 宸ュ崟璁″垝鏁伴噺鐩存帴浣跨敤璁㈠崟 BOM 蹇収涓殑闇�姹傞噺锛岄伩鍏嶄笌 BOM 椤甸潰灞曠ず鍙e緞涓嶄竴鑷淬��
Long rootProductModelId = orderBom != null && orderBom.getProductModelId() != null
? orderBom.getProductModelId()
: productionOrder.getProductModelId();
@@ -261,7 +262,9 @@
.eq(ProductionBomStructure::getProductionOrderBomId, orderBom.getId())
.orderByAsc(ProductionBomStructure::getId));
Map<String, BigDecimal> operationDemandedQuantityMap =
- buildOperationDemandedQuantityMap(orderBomStructureList, rootProductModelId);
+ TaskPlanQuantityUtil.buildOperationDemandedQuantityMap(orderBomStructureList, rootProductModelId);
+ Map<Long, Set<Long>> operationOutputProductModelMap =
+ TaskPlanQuantityUtil.buildOperationOutputProductModelMap(orderBomStructureList, rootProductModelId);
Map<Long, String> operationNameMap = technologyOperationMapper.selectBatchIds(
// 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
routingOperations.stream()
@@ -281,7 +284,12 @@
targetOperation.setProductionOrderId(productionOrder.getId());
targetOperation.setTechnologyRoutingOperationId(sourceOperation.getId());
targetOperation.setOrderRoutingId(orderRouting.getId());
- targetOperation.setProductModelId(sourceOperation.getProductModelId());
+ Long outputProductModelId = TaskPlanQuantityUtil.resolveOperationOutputProductModelId(
+ sourceOperation.getTechnologyOperationId(),
+ sourceOperation.getProductModelId(),
+ operationOutputProductModelMap,
+ rootProductModelId);
+ targetOperation.setProductModelId(outputProductModelId);
targetOperation.setDragSort(sourceOperation.getDragSort());
targetOperation.setIsProduction(sourceOperation.getIsProduction());
targetOperation.setIsQuality(sourceOperation.getIsQuality());
@@ -295,10 +303,10 @@
ProductionOperationTask task = new ProductionOperationTask();
task.setProductionOrderRoutingOperationId(targetOperation.getId());
task.setProductionOrderId(productionOrder.getId());
- task.setPlanQuantity(resolveTaskPlanQuantity(
- sourceOperation,
+ task.setPlanQuantity(TaskPlanQuantityUtil.resolveTaskPlanQuantity(
+ targetOperation,
operationDemandedQuantityMap,
- productionOrder,
+ productionOrder.getQuantity(),
rootProductModelId));
task.setCompleteQuantity(BigDecimal.ZERO);
task.setWorkOrderNo(generateNextTaskNo());
@@ -332,85 +340,6 @@
}
}
return syncedParamCount;
- }
-
- private Map<String, BigDecimal> buildOperationDemandedQuantityMap(List<ProductionBomStructure> bomStructures,
- Long rootProductModelId) {
- if (bomStructures == null || bomStructures.isEmpty()) {
- return Collections.emptyMap();
- }
- Map<Long, ProductionBomStructure> structureById = bomStructures.stream()
- .filter(item -> item != null && item.getId() != null)
- .collect(Collectors.toMap(ProductionBomStructure::getId, item -> item, (left, right) -> left));
- Map<String, BigDecimal> demandedQuantityMap = new HashMap<>();
- Set<String> mergedOutputNodeKeySet = new HashSet<>();
- for (ProductionBomStructure bomStructure : bomStructures) {
- if (bomStructure == null || bomStructure.getTechnologyOperationId() == null) {
- continue;
- }
- // The BOM row points to the producing operation; task quantity should come from that operation's output node.
- ProductionBomStructure outputNode = resolveOperationOutputNode(bomStructure, structureById);
- Long outputProductModelId = resolveOutputProductModelId(outputNode, rootProductModelId);
- if (outputProductModelId == null) {
- continue;
- }
- String mergedOutputNodeKey = buildOperationOutputNodeKey(
- bomStructure.getTechnologyOperationId(),
- outputNode == null ? null : outputNode.getId(),
- outputProductModelId);
- if (!mergedOutputNodeKeySet.add(mergedOutputNodeKey)) {
- continue;
- }
- // demandedQuantity is already the order-level required output quantity for the current output node.
- BigDecimal demandedQuantity = defaultDecimal(outputNode == null ? null : outputNode.getDemandedQuantity());
- String key = buildOperationDemandedQuantityKey(bomStructure.getTechnologyOperationId(), outputProductModelId);
- demandedQuantityMap.merge(key, demandedQuantity, BigDecimal::add);
- }
- return demandedQuantityMap;
- }
-
- private BigDecimal resolveTaskPlanQuantity(TechnologyRoutingOperation sourceOperation,
- Map<String, BigDecimal> operationDemandedQuantityMap,
- ProductionOrder productionOrder,
- Long rootProductModelId) {
- if (sourceOperation == null || operationDemandedQuantityMap == null || operationDemandedQuantityMap.isEmpty()) {
- return defaultDecimal(productionOrder == null ? null : productionOrder.getQuantity());
- }
- Long outputProductModelId = sourceOperation.getProductModelId() != null
- ? sourceOperation.getProductModelId()
- : rootProductModelId;
- String key = buildOperationDemandedQuantityKey(sourceOperation.getTechnologyOperationId(), outputProductModelId);
- BigDecimal planQuantity = operationDemandedQuantityMap.get(key);
- return planQuantity != null ? planQuantity : defaultDecimal(productionOrder == null ? null : productionOrder.getQuantity());
- }
-
- private String buildOperationDemandedQuantityKey(Long operationId, Long outputProductModelId) {
- return String.valueOf(operationId) + "#" + String.valueOf(outputProductModelId);
- }
-
- private String buildOperationOutputNodeKey(Long operationId, Long outputNodeId, Long outputProductModelId) {
- return String.valueOf(operationId) + "#" + String.valueOf(outputNodeId) + "#" + String.valueOf(outputProductModelId);
- }
-
- private ProductionBomStructure resolveOperationOutputNode(ProductionBomStructure bomStructure,
- Map<Long, ProductionBomStructure> structureById) {
- if (bomStructure == null) {
- return null;
- }
- // The root node is the first output node; child rows use their direct parent as the current operation output.
- if (bomStructure.getParentId() == null) {
- return bomStructure;
- }
- ProductionBomStructure parent = structureById.get(bomStructure.getParentId());
- return parent != null ? parent : bomStructure;
- }
-
- private Long resolveOutputProductModelId(ProductionBomStructure outputNode,
- Long rootProductModelId) {
- if (outputNode == null) {
- return rootProductModelId;
- }
- return outputNode.getProductModelId() != null ? outputNode.getProductModelId() : rootProductModelId;
}
private ProductionOrderBom syncProductionOrderBomSnapshot(ProductionOrder productionOrder, TechnologyRouting technologyRouting) {
diff --git a/src/main/java/com/ruoyi/production/util/TaskPlanQuantityUtil.java b/src/main/java/com/ruoyi/production/util/TaskPlanQuantityUtil.java
index e82d7e4..1e1696e 100644
--- a/src/main/java/com/ruoyi/production/util/TaskPlanQuantityUtil.java
+++ b/src/main/java/com/ruoyi/production/util/TaskPlanQuantityUtil.java
@@ -88,6 +88,49 @@
return demandedQuantityMap;
}
+ public Map<Long, Set<Long>> buildOperationOutputProductModelMap(List<ProductionBomStructure> bomStructures,
+ Long rootProductModelId) {
+ if (bomStructures == null || bomStructures.isEmpty()) {
+ return Collections.emptyMap();
+ }
+ Map<Long, ProductionBomStructure> structureById = new HashMap<>();
+ for (ProductionBomStructure item : bomStructures) {
+ if (item != null && item.getId() != null) {
+ structureById.put(item.getId(), item);
+ }
+ }
+ Map<Long, Set<Long>> outputProductModelMap = new HashMap<>();
+ for (ProductionBomStructure bomStructure : bomStructures) {
+ if (bomStructure == null || bomStructure.getTechnologyOperationId() == null) {
+ continue;
+ }
+ ProductionBomStructure outputNode = resolveOperationOutputNode(bomStructure, structureById);
+ Long outputProductModelId = resolveOutputProductModelId(outputNode, rootProductModelId);
+ if (outputProductModelId != null) {
+ outputProductModelMap.computeIfAbsent(
+ bomStructure.getTechnologyOperationId(), key -> new LinkedHashSet<>())
+ .add(outputProductModelId);
+ }
+ }
+ return outputProductModelMap;
+ }
+
+ public Long resolveOperationOutputProductModelId(Long operationId,
+ Long preferredProductModelId,
+ Map<Long, Set<Long>> outputProductModelMap,
+ Long rootProductModelId) {
+ Set<Long> candidates = outputProductModelMap == null ? null : outputProductModelMap.get(operationId);
+ if (candidates != null && !candidates.isEmpty()) {
+ if (preferredProductModelId != null && candidates.contains(preferredProductModelId)) {
+ return preferredProductModelId;
+ }
+ if (candidates.size() == 1) {
+ return candidates.iterator().next();
+ }
+ }
+ return preferredProductModelId != null ? preferredProductModelId : rootProductModelId;
+ }
+
/**
* 鏋勫缓宸ュ簭闇�姹傞噺key
*/
@@ -110,13 +153,22 @@
if (bomStructure == null) {
return null;
}
- if (bomStructure.getParentId() == null) {
+ if (bomStructure.getParentId() == null || hasChildren(bomStructure, structureById)) {
return bomStructure;
}
ProductionBomStructure parent = structureById.get(bomStructure.getParentId());
return parent != null ? parent : bomStructure;
}
+ private boolean hasChildren(ProductionBomStructure bomStructure,
+ Map<Long, ProductionBomStructure> structureById) {
+ if (bomStructure == null || bomStructure.getId() == null || structureById == null) {
+ return false;
+ }
+ return structureById.values().stream()
+ .anyMatch(child -> child != null && Objects.equals(child.getParentId(), bomStructure.getId()));
+ }
+
/**
* 瑙f瀽杈撳嚭浜у搧瑙勬牸ID
*/
diff --git a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
index 6750f03..3e2fb0c 100644
--- a/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
+++ b/src/main/java/com/ruoyi/technology/service/impl/TechnologyRoutingServiceImpl.java
@@ -177,6 +177,10 @@
if (bomStructure == null) {
return routingProductModelId;
}
+ if (hasChildren(bomStructure, structureById)) {
+ return bomStructure.getProductModelId() != null
+ ? bomStructure.getProductModelId() : routingProductModelId;
+ }
Long parentId = bomStructure.getParentId();
if (parentId == null) {
return routingProductModelId != null ? routingProductModelId : bomStructure.getProductModelId();
@@ -188,6 +192,15 @@
return routingProductModelId != null ? routingProductModelId : bomStructure.getProductModelId();
}
+ private boolean hasChildren(TechnologyBomStructure bomStructure,
+ Map<Long, TechnologyBomStructure> structureById) {
+ if (bomStructure == null || bomStructure.getId() == null || structureById == null) {
+ return false;
+ }
+ return structureById.values().stream()
+ .anyMatch(child -> child != null && java.util.Objects.equals(child.getParentId(), bomStructure.getId()));
+ }
+
private void syncRoutingOperationParams(Long technologyRoutingOperationId, Long technologyOperationId) {
List<TechnologyOperationParam> operationParamList = technologyOperationParamMapper.selectList(
Wrappers.<TechnologyOperationParam>lambdaQuery()
--
Gitblit v1.9.3