From c545c8c94e08b4925335b828f5674574c3734e8c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 11:59:58 +0800
Subject: [PATCH] 合并下发生产计划分配每个计划的下发数量
---
src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java | 3 ++-
src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java | 28 +++++++++++++++++++++++++---
2 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
index 75f16b4..d472af4 100644
--- a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
@@ -48,10 +48,11 @@
@PostMapping("/combine")
@Log(title = "鍚堝苟鐢熶骇璁″垝", businessType = BusinessType.INSERT)
+ @ApiOperation("鍚堝苟鐢熶骇璁″垝")
public AjaxResult combine(@RequestBody ProductionPlanDto productionPlanDto) {
return AjaxResult.success(productionPlanService.combine(productionPlanDto));
}
-
+
@GetMapping("/summaryByProductType")
@ApiOperation("鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺")
@Log(title = "鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺", businessType = BusinessType.OTHER)
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..7f8d5e1 100644
--- a/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java
@@ -116,17 +116,39 @@
.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;
}
--
Gitblit v1.9.3