From a8d514292f781af37e95d08cd6edbcbeec20aa74 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 五月 2026 14:29:16 +0800
Subject: [PATCH] feat(shipping): 增加通过发货单号查询发货审批详情接口

---
 src/main/java/com/ruoyi/production/controller/ProductionPlanController.java |   45 +++++++++++++++++++--------------------------
 1 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
index 0edd898..923f95c 100644
--- a/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
+++ b/src/main/java/com/ruoyi/production/controller/ProductionPlanController.java
@@ -10,10 +10,11 @@
 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.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -31,28 +32,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,48 +57,48 @@
         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.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("涓荤敓浜ц鍒掓暟鎹鍏�")
+    @PostMapping(value = "/import", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    @Operation(summary = "涓荤敓浜ц鍒掓暟鎹鍏�")
     @Log(title = "涓荤敓浜ц鍒掓暟鎹鍏�", businessType = BusinessType.IMPORT)
-    public R importProdData(@RequestParam("file") MultipartFile file) {
+    public R importProdData(@RequestPart("file") MultipartFile file) {
         productionPlanService.importProdData(file);
         return R.ok("瀵煎叆鎴愬姛");
     }
 
     @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);
+    public void exportProdData(HttpServletResponse response, @RequestBody(required = false) ProductionPlanDto requestDto) {
+        productionPlanService.exportProdData(response, requestDto);
     }
 
 }

--
Gitblit v1.9.3