From 931beabfe37a733b6d2fb92119dab3aabe869c98 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 11:08:34 +0800
Subject: [PATCH] Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java | 22 +++++++++++++++++++---
1 files changed, 19 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 af1965b..75f16b4 100644
--- a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
@@ -5,14 +5,15 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
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;
/**
* <br>
@@ -38,9 +39,24 @@
}
@GetMapping("/loadProdData")
+ @ApiOperation("鎷夊彇閿�鍞敓浜ц鍒�")
@Log(title = "鎷夊彇閿�鍞敓浜ц鍒�", businessType = BusinessType.INSERT)
public AjaxResult loadProdData() {
productionPlanService.loadProdData();
return AjaxResult.success();
}
+
+ @PostMapping("/combine")
+ @Log(title = "鍚堝苟鐢熶骇璁″垝", businessType = BusinessType.INSERT)
+ public AjaxResult combine(@RequestBody ProductionPlanDto productionPlanDto) {
+ return AjaxResult.success(productionPlanService.combine(productionPlanDto));
+ }
+
+ @GetMapping("/summaryByProductType")
+ @ApiOperation("鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺")
+ @Log(title = "鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺", businessType = BusinessType.OTHER)
+ public AjaxResult summaryByProductType(ProductionPlanSummaryDto query) {
+ List<ProductionPlanSummaryDto> list = productionPlanService.summaryByProductType(query);
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.9.3