From 83f6a929a4a9ee2f67cfa6dd7d059c998380141d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 12 三月 2026 17:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
index eb0e179..448e2c0 100644
--- a/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/productionPlan/controller/ProductionPlanController.java
@@ -53,6 +53,9 @@
@Log(title = "鍚堝苟鐢熶骇璁″垝", businessType = BusinessType.INSERT)
@ApiOperation("鍚堝苟鐢熶骇璁″垝")
public AjaxResult combine(@RequestBody ProductionPlanDto productionPlanDto) {
+ if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
+ return AjaxResult.error("璇烽�夋嫨瑕佷笅鍙戠殑鐢熶骇璁″垝");
+ }
return AjaxResult.success(productionPlanService.combine(productionPlanDto));
}
@@ -63,6 +66,20 @@
return AjaxResult.success(productionPlanService.add(productionPlanDto));
}
+ @PutMapping("")
+ @Log(title = "鏇存柊鐢熶骇璁″垝", businessType = BusinessType.UPDATE)
+ @ApiOperation("鏇存柊鐢熶骇璁″垝")
+ public AjaxResult update(@RequestBody ProductionPlanDto productionPlanDto) {
+ return AjaxResult.success(productionPlanService.update(productionPlanDto));
+ }
+
+ @DeleteMapping("")
+ @Log(title = "鍒犻櫎鐢熶骇璁″垝", businessType = BusinessType.DELETE)
+ @ApiOperation("鍒犻櫎鐢熶骇璁″垝")
+ public AjaxResult delete(@RequestBody List<Long> ids) {
+ return AjaxResult.success(productionPlanService.removeByIds(ids));
+ }
+
@GetMapping("/summaryByProductType")
@ApiOperation("鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺")
@Log(title = "鎸夌収浜у搧绫诲埆姹囨�荤粺璁￠渶姹傞噺", businessType = BusinessType.OTHER)
@@ -71,7 +88,7 @@
return AjaxResult.success(list);
}
- @GetMapping("/downloadTemplate")
+ @PostMapping("/downloadTemplate")
@Log(title = "涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�", businessType = BusinessType.EXPORT)
@ApiOperation("涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�")
public void importTemplate(HttpServletResponse response) {
--
Gitblit v1.9.3