From 950dae8b64157cc3850ab64f4e4727dd139a5e3c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 15:50:02 +0800
Subject: [PATCH] 撤回生产订单
---
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 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 cb916e9..9cc0047 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -107,6 +107,7 @@
// 鏌ヨ涓荤敓浜ц鍒�
List<ProductionPlan> plans = productionPlanMapper.selectBatchIds(productionPlanDto.getIds());
+ plans.sort(Comparator.comparingLong(ProductionPlan::getId));
// 鏍￠獙鏄惁瀛樺湪涓嶅悓鐨勪骇鍝佸悕绉�
String firstProductName = plans.get(0).getProductName();
@@ -128,10 +129,14 @@
.reduce(BigDecimal.ZERO, BigDecimal::add);
// 鍒ゆ柇涓嬪彂鏁伴噺鏄惁澶т簬绛変簬鏂规暟
if (productionPlanDto.getTotalAssignedQuantity().compareTo(totalVolume) > 0) {
-
- log.warn("鎿嶄綔澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庢柟鏁�");
- return false;
+ throw new BaseException("鎿嶄綔澶辫触锛屼笅鍙戞暟閲忎笉鑳藉ぇ浜庢柟鏁�");
}
+
+ // 鍒涘缓鐢熶骇璁㈠崟
+ ProductOrder productOrder = new ProductOrder();
+ productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
+ productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
+ productOrderService.addProductOrder(productOrder);
// 鏍规嵁涓嬪彂鏁伴噺锛屼粠绗竴涓敓浜ц鍒掑紑濮嬪垎閰嶆柟鏁�
BigDecimal assignedVolume = BigDecimal.ZERO;
@@ -141,30 +146,28 @@
continue;
}
+ ProductOrderPlan productOrderPlan = new ProductOrderPlan();
+ productOrderPlan.setProductOrderId(productOrder.getId());
+ productOrderPlan.setProductionPlanId(plan.getId());
+
if (assignedVolume.add(volume).compareTo(productionPlanDto.getTotalAssignedQuantity()) >= 0) {
// 鏈�鍚庝竴涓鍒掞紝鍒嗛厤鍓╀綑鏂规暟
- plan.setAssignedQuantity(productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume));
+ BigDecimal remainingVolume = productionPlanDto.getTotalAssignedQuantity().subtract(assignedVolume);
+ plan.setAssignedQuantity(plan.getAssignedQuantity().add(remainingVolume));
+ productOrderPlan.setAssignedQuantity(remainingVolume);
productionPlanMapper.updateById(plan);
+ productOrderPlanMapper.insert(productOrderPlan);
break;
}
// 鍒嗛厤褰撳墠璁″垝鏂规暟
- plan.setAssignedQuantity(volume);
+ plan.setAssignedQuantity(plan.getAssignedQuantity().add(volume));
+ productOrderPlan.setAssignedQuantity(volume);
+ // 鏇存柊鐢熶骇璁″垝
productionPlanMapper.updateById(plan);
- assignedVolume = assignedVolume.add(volume);
- }
-
- // 鍒涘缓鐢熶骇璁㈠崟
- ProductOrder productOrder = new ProductOrder();
- productOrder.setQuantity(productionPlanDto.getTotalAssignedQuantity());
- productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
- productOrderService.addProductOrder(productOrder);
-
- for (Long planId : productionPlanDto.getIds()) {
- ProductOrderPlan productOrderPlan = new ProductOrderPlan();
- productOrderPlan.setProductOrderId(productOrder.getId());
- productOrderPlan.setProductionPlanId(planId);
+ // 鍒涘缓鍏宠仈鍏崇郴
productOrderPlanMapper.insert(productOrderPlan);
+ assignedVolume = assignedVolume.add(volume);
}
return true;
}
--
Gitblit v1.9.3