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 | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
index 5a07915..d472af4 100644
--- a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
@@ -7,11 +7,10 @@
import com.ruoyi.productionPlan.dto.ProductionPlanDto;
import com.ruoyi.productionPlan.dto.ProductionPlanSummaryDto;
import com.ruoyi.productionPlan.service.ProductionPlanService;
+import com.ruoyi.staff.dto.StaffLeaveDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -47,6 +46,13 @@
return AjaxResult.success();
}
+ @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)
--
Gitblit v1.9.3