From cb8ee71facb5520be75dcc9b77e245edc752650e Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 13 五月 2026 15:00:12 +0800
Subject: [PATCH] fix:1.生产订单按照bom结构的单位需求数量更改 2.修改生产订单修改对应报工的数量
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 69 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 1 deletions(-)
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 344800c..ad20fe5 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -245,6 +245,7 @@
.eq(TechnologyRoutingOperation::getTechnologyRoutingId, technologyRouting.getId())
.orderByDesc(TechnologyRoutingOperation::getDragSort)
.orderByDesc(TechnologyRoutingOperation::getId));
+ Map<String, BigDecimal> operationDemandedQuantityMap = buildOperationDemandedQuantityMap(technologyRouting, productionOrder);
Map<Long, String> operationNameMap = technologyOperationMapper.selectBatchIds(
// 閬嶅巻澶勭悊鏁版嵁骞剁粍瑁呯粨鏋�
routingOperations.stream()
@@ -278,7 +279,7 @@
ProductionOperationTask task = new ProductionOperationTask();
task.setProductionOrderRoutingOperationId(targetOperation.getId());
task.setProductionOrderId(productionOrder.getId());
- task.setPlanQuantity(defaultDecimal(productionOrder.getQuantity()));
+ task.setPlanQuantity(resolveTaskPlanQuantity(sourceOperation, operationDemandedQuantityMap, productionOrder));
task.setCompleteQuantity(BigDecimal.ZERO);
task.setWorkOrderNo(generateNextTaskNo());
task.setStatus(2);
@@ -313,6 +314,72 @@
return syncedParamCount;
}
+ private Map<String, BigDecimal> buildOperationDemandedQuantityMap(TechnologyRouting technologyRouting,
+ ProductionOrder productionOrder) {
+ if (technologyRouting == null || technologyRouting.getBomId() == null) {
+ return Collections.emptyMap();
+ }
+ BigDecimal orderQuantity = defaultDecimal(productionOrder == null ? null : productionOrder.getQuantity());
+ List<TechnologyBomStructure> bomStructures = technologyBomStructureMapper.selectList(
+ Wrappers.<TechnologyBomStructure>lambdaQuery()
+ .eq(TechnologyBomStructure::getBomId, technologyRouting.getBomId())
+ .isNotNull(TechnologyBomStructure::getOperationId)
+ .orderByAsc(TechnologyBomStructure::getId));
+ if (bomStructures.isEmpty()) {
+ return Collections.emptyMap();
+ }
+
+ Map<Long, TechnologyBomStructure> structureById = bomStructures.stream()
+ .filter(item -> item != null && item.getId() != null)
+ .collect(Collectors.toMap(TechnologyBomStructure::getId, item -> item, (left, right) -> left));
+ Map<String, BigDecimal> demandedQuantityMap = new HashMap<>();
+ for (TechnologyBomStructure bomStructure : bomStructures) {
+ if (bomStructure == null || bomStructure.getOperationId() == null) {
+ continue;
+ }
+ BigDecimal unitQuantity = bomStructure.getUnitQuantity();
+ if (unitQuantity == null) {
+ continue;
+ }
+ Long outputProductModelId = resolveOutputProductModelId(bomStructure, structureById, technologyRouting.getProductModelId());
+ String key = buildOperationDemandedQuantityKey(bomStructure.getOperationId(), outputProductModelId);
+ demandedQuantityMap.merge(key, unitQuantity.multiply(orderQuantity), BigDecimal::add);
+ }
+ return demandedQuantityMap;
+ }
+
+ private BigDecimal resolveTaskPlanQuantity(TechnologyRoutingOperation sourceOperation,
+ Map<String, BigDecimal> operationDemandedQuantityMap,
+ ProductionOrder productionOrder) {
+ if (sourceOperation == null || operationDemandedQuantityMap == null || operationDemandedQuantityMap.isEmpty()) {
+ return defaultDecimal(productionOrder == null ? null : productionOrder.getQuantity());
+ }
+ String key = buildOperationDemandedQuantityKey(sourceOperation.getTechnologyOperationId(), sourceOperation.getProductModelId());
+ 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 Long resolveOutputProductModelId(TechnologyBomStructure bomStructure,
+ Map<Long, TechnologyBomStructure> structureById,
+ Long routingProductModelId) {
+ if (bomStructure == null) {
+ return routingProductModelId;
+ }
+ Long parentId = bomStructure.getParentId();
+ if (parentId == null) {
+ return routingProductModelId != null ? routingProductModelId : bomStructure.getProductModelId();
+ }
+ TechnologyBomStructure parent = structureById.get(parentId);
+ if (parent != null && parent.getProductModelId() != null) {
+ return parent.getProductModelId();
+ }
+ return routingProductModelId != null ? routingProductModelId : bomStructure.getProductModelId();
+ }
+
private ProductionOrderBom syncProductionOrderBomSnapshot(ProductionOrder productionOrder, TechnologyRouting technologyRouting) {
// 鍚屾璁㈠崟BOM蹇収缁撴瀯
if (technologyRouting.getBomId() == null) {
--
Gitblit v1.9.3