From 76640d343082d1473a482e7ba48461db9b26c035 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:36:57 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/controller/ProductionPlanController.java | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
index df8a6fd..6190a47 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
@@ -10,13 +10,13 @@
import com.ruoyi.production.bean.dto.ProductionPlanImportDto;
import com.ruoyi.production.bean.vo.ProductionPlanVo;
import com.ruoyi.production.service.ProductionPlanService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List;
@@ -31,28 +31,20 @@
@RestController
@RequestMapping("/productionPlan")
@RequiredArgsConstructor
-@Api(tags = "涓荤敓浜ц鍒�")
+@Tag(name = "涓荤敓浜ц鍒�")
public class ProductionPlanController {
private final ProductionPlanService productionPlanService;
@GetMapping("/listPage")
- @ApiOperation("鑾峰彇鐢熶骇璁″垝鍒楄〃")
+ @Operation(summary = "鑾峰彇鐢熶骇璁″垝鍒楄〃")
public R<IPage<ProductionPlanVo>> productionPlanListPage(Page<ProductionPlanDto> page, ProductionPlanDto productionPlanDto) {
return R.ok(productionPlanService.listPage(page, productionPlanDto));
}
- @GetMapping("/loadProdData")
- @ApiOperation("鎷夊彇閿�鍞敓浜ц鍒�")
- @Log(title = "鎷夊彇閿�鍞敓浜ц鍒�", businessType = BusinessType.INSERT)
- public R loadProdData() {
- productionPlanService.loadProdData();
- return R.ok();
- }
-
@PostMapping("/combine")
@Log(title = "鍚堝苟鐢熶骇璁″垝", businessType = BusinessType.INSERT)
- @ApiOperation("鍚堝苟鐢熶骇璁″垝")
+ @Operation(summary = "鍚堝苟鐢熶骇璁″垝")
public R combine(@RequestBody ProductionPlanDto productionPlanDto) {
if (productionPlanDto.getIds() == null || productionPlanDto.getIds().isEmpty()) {
return R.fail("璇烽�夋嫨瑕佷笅鍙戠殑鐢熶骇璁″垝");
@@ -64,37 +56,37 @@
return R.ok(productionPlanService.combine(productionPlanDto));
}
- @PostMapping("")
+ @PostMapping("addProductionPlan")
@Log(title = "鍒涘缓鐢熶骇璁″垝", businessType = BusinessType.INSERT)
- @ApiOperation("鍒涘缓鐢熶骇璁″垝")
+ @Operation(summary = "鍒涘缓鐢熶骇璁″垝")
public R add(@RequestBody ProductionPlanDto productionPlanDto) {
return R.ok(productionPlanService.add(productionPlanDto));
}
- @PutMapping("")
+ @PutMapping("updateProductionPlan")
@Log(title = "鏇存柊鐢熶骇璁″垝", businessType = BusinessType.UPDATE)
- @ApiOperation("鏇存柊鐢熶骇璁″垝")
+ @Operation(summary = "鏇存柊鐢熶骇璁″垝")
public R update(@RequestBody ProductionPlanDto productionPlanDto) {
return R.ok(productionPlanService.update(productionPlanDto));
}
- @DeleteMapping("")
+ @DeleteMapping("deleteProductionPlan")
@Log(title = "鍒犻櫎鐢熶骇璁″垝", businessType = BusinessType.DELETE)
- @ApiOperation("鍒犻櫎鐢熶骇璁″垝")
+ @Operation(summary = "鍒犻櫎鐢熶骇璁″垝")
public R delete(@RequestBody List<Long> ids) {
- return R.ok(productionPlanService.removeByIds(ids));
+ return R.ok(productionPlanService.delete(ids));
}
@PostMapping("/downloadTemplate")
@Log(title = "涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�", businessType = BusinessType.EXPORT)
- @ApiOperation("涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�")
+ @Operation(summary = "涓嬭浇涓荤敓浜ц鍒掑鍏ユā鏉�")
public void importTemplate(HttpServletResponse response) {
ExcelUtil<ProductionPlanImportDto> excelUtil = new ExcelUtil<>(ProductionPlanImportDto.class);
excelUtil.importTemplateExcel(response, "涓荤敓浜ц鍒掑鍏ユā鏉�");
}
@PostMapping("/import")
- @ApiOperation("涓荤敓浜ц鍒掓暟鎹鍏�")
+ @Operation(summary = "涓荤敓浜ц鍒掓暟鎹鍏�")
@Log(title = "涓荤敓浜ц鍒掓暟鎹鍏�", businessType = BusinessType.IMPORT)
public R importProdData(@RequestParam("file") MultipartFile file) {
productionPlanService.importProdData(file);
@@ -102,7 +94,7 @@
}
@PostMapping("/export")
- @ApiOperation("涓荤敓浜ц鍒掓暟鎹鍑�")
+ @Operation(summary = "涓荤敓浜ц鍒掓暟鎹鍑�")
@Log(title = "涓荤敓浜ц鍒掓暟鎹鍑�", businessType = BusinessType.EXPORT)
public void exportProdData(HttpServletResponse response, @RequestBody(required = false) List<Long> ids) {
productionPlanService.exportProdData(response, ids);
--
Gitblit v1.9.3