From 85016ed2734e91e4c8ea03623cde11c29964ba5a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 25 四月 2026 14:00:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java |   52 +++++++++++++++-------------------------------------
 1 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index eed5ffa..49ef859 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -1,12 +1,9 @@
 package com.ruoyi.sales.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.approve.mapper.ApproveProcessMapper;
 import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
-import com.ruoyi.approve.vo.ApproveProcessVO;
-import com.ruoyi.common.enums.FileNameType;
+import com.ruoyi.approve.bean.vo.ApproveProcessVO;
 import com.ruoyi.common.utils.OrderUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -15,27 +12,17 @@
 import com.ruoyi.framework.security.LoginUser;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.other.service.impl.TempFileServiceImpl;
-import com.ruoyi.procurementrecord.utils.StockUtils;
 import com.ruoyi.sales.dto.ShippingInfoDto;
-import com.ruoyi.sales.mapper.ShipmentApprovalMapper;
 import com.ruoyi.sales.mapper.ShippingInfoMapper;
-import com.ruoyi.sales.pojo.SalesLedger;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import com.ruoyi.sales.pojo.ShipmentApproval;
 import com.ruoyi.sales.pojo.ShippingInfo;
-import com.ruoyi.sales.service.ISalesLedgerProductService;
-import com.ruoyi.sales.service.ISalesLedgerService;
 import com.ruoyi.sales.service.ShippingInfoService;
-import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections4.CollectionUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.List;
@@ -46,30 +33,24 @@
  */
 @RestController
 @RequestMapping("/shippingInfo")
-@Api(tags = "鍙戣揣淇℃伅绠＄悊")
+@Tag(name = "鍙戣揣淇℃伅绠＄悊")
+@AllArgsConstructor
 public class ShippingInfoController extends BaseController {
 
-    @Autowired
     private ShippingInfoService shippingInfoService;
-
-    @Autowired
-    private CommonFileServiceImpl commonFileService;
-
-    @Autowired
     private ApproveProcessServiceImpl approveProcessService;
-    @Autowired
-    private StockUtils stockUtils;
+    private ShippingInfoMapper shippingInfoMapper;
 
 
     @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 {
@@ -91,7 +72,7 @@
         return save ? AjaxResult.success() : AjaxResult.error();
     }
 
-    @ApiOperation("鍙戣揣鎵ｅ簱瀛�")
+    @Operation(summary = "鍙戣揣鎵ｅ簱瀛�")
     @PostMapping("/deductStock")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
@@ -100,7 +81,7 @@
     }
 
     @PostMapping("/update")
-    @ApiOperation("淇敼鍙戣揣淇℃伅")
+    @Operation(summary = "淇敼鍙戣揣淇℃伅")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
     public AjaxResult update(@RequestBody ShippingInfo req) {
@@ -113,7 +94,7 @@
     }
 
     @DeleteMapping("/delete")
-    @ApiOperation("鍒犻櫎鍙戣揣淇℃伅")
+    @Operation(summary = "鍒犻櫎鍙戣揣淇℃伅")
     @Transactional(rollbackFor = Exception.class)
     @Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.DELETE)
     public AjaxResult delete(@RequestBody List<Long> ids) {
@@ -121,14 +102,11 @@
         return shippingInfoService.delete(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
     }
 
-    @Autowired
-    private ShippingInfoMapper shippingInfoMapper;
-
     /**
      * 瀵煎嚭鍙戣揣淇℃伅绠＄悊
      */
     @PostMapping("/export")
-    @ApiOperation("瀵煎嚭鍙戣揣淇℃伅")
+    @Operation(summary = "瀵煎嚭鍙戣揣淇℃伅")
     public void export(HttpServletResponse response) {
         List<ShippingInfo> list = shippingInfoMapper.listAll();
         ExcelUtil<ShippingInfo> util = new ExcelUtil<ShippingInfo>(ShippingInfo.class);
@@ -137,7 +115,7 @@
 
 
     @GetMapping("/getByCustomerName")
-    @ApiOperation("閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
+    @Operation(summary = "閫氳繃瀹㈡埛鍚嶇О鏌ヨ")
     public AjaxResult getByCustomerName(String customerName) {
         return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
     }

--
Gitblit v1.9.3