From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro

---
 src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index ff0416b..458be2d 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -2,8 +2,8 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.approve.bean.vo.ApproveProcessVO;
 import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
-import com.ruoyi.approve.vo.ApproveProcessVO;
 import com.ruoyi.common.utils.OrderUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -12,12 +12,13 @@
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
 import com.ruoyi.sales.dto.ShippingInfoDto;
 import com.ruoyi.sales.mapper.ShippingInfoMapper;
 import com.ruoyi.sales.pojo.ShippingInfo;
 import com.ruoyi.sales.service.ShippingInfoService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,7 +34,7 @@
  */
 @RestController
 @RequestMapping("/shippingInfo")
-@Api(tags = "鍙戣揣淇℃伅绠＄悊")
+@Tag(name = "鍙戣揣淇℃伅绠＄悊")
 @AllArgsConstructor
 public class ShippingInfoController extends BaseController {
 
@@ -43,14 +44,14 @@
 
 
     @GetMapping("/listPage")
-    @ApiOperation("鍙戣揣淇℃伅鍒楄〃")
+    @Operation(summary = "鍙戣揣淇℃伅鍒楄〃")
     public AjaxResult listPage(Page page, ShippingInfo req) {
         IPage<ShippingInfoDto> listPage = shippingInfoService.listPage(page,req);
         return AjaxResult.success(listPage);
     }
 
     @PostMapping("/add")
-    @ApiOperation("娣诲姞鍙戣揣淇℃伅")
+    @Operation(summary = "娣诲姞鍙戣揣淇℃伅")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
     public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
@@ -68,11 +69,11 @@
         // 娣诲姞鍙戣揣娑堟伅
         req.setShippingNo(sh);
         req.setStatus("寰呭鏍�");
-        boolean save = shippingInfoService.save(req);
+        boolean save = shippingInfoService.add(req);
         return save ? AjaxResult.success() : AjaxResult.error();
     }
 
-    @ApiOperation("鍙戣揣鎵ｅ簱瀛�")
+    @Operation(summary = "鍙戣揣鎵ｅ簱瀛�")
     @PostMapping("/deductStock")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
@@ -81,7 +82,7 @@
     }
 
     @PostMapping("/update")
-    @ApiOperation("淇敼鍙戣揣淇℃伅")
+    @Operation(summary = "淇敼鍙戣揣淇℃伅")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody ShippingInfo req) {
@@ -94,7 +95,7 @@
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("鍒犻櫎鍙戣揣淇℃伅")
+    @Operation(summary = "鍒犻櫎鍙戣揣淇℃伅")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.DELETE)
     public AjaxResult delete(@RequestBody List<Long> ids) {
@@ -106,7 +107,7 @@
      * 瀵煎嚭鍙戣揣淇℃伅绠＄悊
      */
     @PostMapping("/export")
-    @ApiOperation("瀵煎嚭鍙戣揣淇℃伅")
+    @Operation(summary = "瀵煎嚭鍙戣揣淇℃伅")
     public void export(HttpServletResponse response) {
         List<ShippingInfo> list = shippingInfoMapper.listAll();
         ExcelUtil<ShippingInfo> util = new ExcelUtil<ShippingInfo>(ShippingInfo.class);
@@ -115,8 +116,13 @@
 
 
     @GetMapping("/getByCustomerName")
-    @ApiOperation("閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
+    @Operation(summary = "閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
     public AjaxResult getByCustomerName(String customerName) {
         return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
     }
+
+    @GetMapping("/getDateil/{id}")
+    public R getDateil(@PathVariable("id") Long id) {
+        return R.ok(shippingInfoService.getDetail(id));
+    }
 }

--
Gitblit v1.9.3