From 47e4fbbae343e37b4697ae786a147333ec8acf82 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 10 六月 2026 15:34:34 +0800
Subject: [PATCH] refactor(production): 优化生产订单服务实现
---
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 920188e..124373c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -446,7 +446,8 @@
target.setProductModelId(source.getProductModelId());
target.setTechnologyOperationId(source.getOperationId());
target.setUnitQuantity(source.getUnitQuantity());
- target.setDemandedQuantity(source.getUnitQuantity().multiply(orderQuantity));
+ // 鐩存帴浣跨敤璁㈠崟鏁伴噺 脳 褰撳墠BOM鐨勫崟浣嶄骇鍑猴紝涓嶅啀閫愬眰绱Н
+ target.setDemandedQuantity(orderQuantity.multiply(source.getUnitQuantity()));
target.setUnit(source.getUnit());
productionBomStructureMapper.insert(target);
idMap.put(source.getId(), target.getId());
@@ -1049,9 +1050,11 @@
continue;
}
Long productModelId = stockItem.getProductModelId();
- stockQuantityMap.merge(productModelId, defaultDecimal(stockItem.getQualitity()), BigDecimal::add);
+ BigDecimal quantity = defaultDecimal(stockItem.getQualitity());
+ stockQuantityMap.merge(productModelId, quantity, BigDecimal::add);
String batchNo = stockItem.getBatchNo();
- if (batchNo != null && !batchNo.trim().isEmpty()) {
+ // 鍙坊鍔犲簱瀛樻暟閲忓ぇ浜�0鐨勬壒鍙�
+ if (batchNo != null && !batchNo.trim().isEmpty() && quantity.compareTo(BigDecimal.ZERO) > 0) {
stockBatchNoMap.computeIfAbsent(productModelId, key -> new LinkedHashSet<>()).add(batchNo);
}
}
--
Gitblit v1.9.3