From 4d853e25a3e28c1a8c92d105729946dd9fd5a191 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 12:04:35 +0800
Subject: [PATCH] 创建生产计划
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
index f2e238c..994e8c0 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -35,6 +35,8 @@
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
+import static com.ruoyi.productionPlan.enums.DataSourceTypeEnum.PRODUCTION_FORECAST;
+
/**
* <br>
* 閿�鍞敓浜ч渶姹傛帴鍙ｅ疄鐜扮被
@@ -88,6 +90,7 @@
* 鍚堝苟鐢熶骇璁″垝
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public boolean combine(ProductionPlanDto productionPlanDto) {
if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
return false;
@@ -116,17 +119,47 @@
.map(ProductionPlan::getVolume)
.filter(v -> v != null)
.reduce(BigDecimal.ZERO, BigDecimal::add);
+ // 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鏂规暟
+ if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalVolume) > 0) {
+ log.warn("鍚堝苟澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庢柟鏁�");
+ return false;
+ }
+
+ // 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
+ BigDecimal assignedVolume = BigDecimal.ZERO;
+ for (ProductionPlan plan : plans) {
+ BigDecimal volume = plan.getVolume();
+ if (volume == null) {
+ continue;
+ }
+
+ if (assignedVolume.add(volume).compareTo(productionPlanDto.getTotalAssignedQuantity()) >= 0) {
+ // 鏈�鍚庝竴涓鍒掞紝鍒嗛厤鍓╀綑鏂规暟
+ plan.setAssignedQuantity(productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume));
+ break;
+ }
+
+ // 鍒嗛厤褰撳墠璁″垝鏂规暟
+ plan.setAssignedQuantity(volume);
+ productionPlanMapper.updateById(plan);
+ assignedVolume = assignedVolume.add(volume);
+ }
// 鍒涘缓鐢熶骇璁㈠崟
ProductOrder productOrder = new ProductOrder();
- // 鍚堝苟鐢熶骇璁″垝ids
String combineIds = StringUtils.join(productionPlanDto.getIds(), ",");
productOrder.setCombineProductionPlanIds(combineIds);
- // 涓嬪彂鏁伴噺
productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
productOrderService.addProductOrder(productOrder);
+ return true;
+ }
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean add(ProductionPlanDto productionPlanDto) {
+ productionPlanDto.setDataSourceType(PRODUCTION_FORECAST.getCode());
+ productionPlanMapper.insert(productionPlanDto);
return true;
}
--
Gitblit v1.9.3