From 0d7d874912d0147376826b55667a1deb6547ed91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 21 五月 2026 15:25:27 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

---
 src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java |   49 +++++++++++++++++++++++++------------------------
 1 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
index 1fb594b..8d8e62f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
@@ -6,18 +6,17 @@
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
-import com.ruoyi.procurementrecord.dto.ProcurementRecordOutAdd;
-import com.ruoyi.procurementrecord.dto.ProcurementRecordOutPageDto;
-import com.ruoyi.procurementrecord.dto.ProcurementUpdateDto;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.procurementrecord.bean.dto.ProcurementRecordOutAdd;
+import com.ruoyi.procurementrecord.bean.dto.ProcurementRecordOutPageDto;
+import com.ruoyi.procurementrecord.bean.dto.ProcurementUpdateDto;
 import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
 import com.ruoyi.procurementrecord.service.ProcurementRecordOutService;
-import io.swagger.annotations.Api;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -25,55 +24,57 @@
  * @date : 2025/7/8 13:30
  */
 @RestController
-@Api(tags = "閲囪喘鍑哄簱")
+@Tag(name = "閲囪喘鍑哄簱")
 @RequestMapping("/stockmanagement")
+@AllArgsConstructor
 public class ProcurementRecordOutController extends BaseController {
 
-    @Autowired
     private ProcurementRecordOutService procurementRecordOutService;
+    private ProcurementRecordOutMapper procurementRecordOutMapper;
 
     @PostMapping("/stockout")
     @Log(title = "閲囪喘鍑哄簱-鍑哄簱绠＄悊-鍑哄簱", businessType = BusinessType.INSERT)
-    public AjaxResult stockout(@RequestBody ProcurementRecordOutAdd procurementRecordOutAdd) {
-        return AjaxResult.success(procurementRecordOutService.stockout(procurementRecordOutAdd));
+    public R<?> stockout(@RequestBody ProcurementRecordOutAdd procurementRecordOutAdd) {
+        return R.ok(procurementRecordOutService.stockout(procurementRecordOutAdd));
     }
 
     @GetMapping("/listPage")
     @Log(title = "閲囪喘鍑哄簱-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult listPage(Page page, ProcurementRecordOutPageDto procurementDto) {
+    public R<?> listPage(Page page, ProcurementRecordOutPageDto procurementDto) {
         IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPage(page, procurementDto);
-        return AjaxResult.success(result);
+        return R.ok(result);
     }
 
     @GetMapping("/listPageByProduct")
     @Log(title = "鐢熶骇鍑哄簱-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult listPageByProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
+    public R<?> listPageByProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
         IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageByProduct(page, procurementDto);
-        return AjaxResult.success(result);
+        return R.ok(result);
     }
 
     @GetMapping("/listPageBySemiProduct")
     @Log(title = "鐢熶骇鍑哄簱-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult listPageBySemiProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
+    public R<?> listPageBySemiProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
         IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageBySemiProduct(page, procurementDto);
-        return AjaxResult.success(result);
+        return R.ok(result);
     }
 
     @GetMapping("/listPageByCustom")
     @Log(title = "鑷畾涔夊嚭搴�-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
-    public AjaxResult listPageByCustom(Page page, ProcurementRecordOutPageDto procurementDto) {
+    public R<?> listPageByCustom(Page page, ProcurementRecordOutPageDto procurementDto) {
         IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageByCustom(page, procurementDto);
-        return AjaxResult.success(result);
+        return R.ok(result);
     }
 
     @PostMapping("/del")
     @Log(title = "閲囪喘鍑哄簱-鍑哄簱鍙拌处-鍒犻櫎鍑哄簱", businessType = BusinessType.DELETE)
-    public AjaxResult deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
-        return AjaxResult.success(procurementRecordOutService.deletePro(procurementDto));
+    public R<?> deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
+        return R.ok(procurementRecordOutService.deletePro(procurementDto));
     }
 
     /**
      * 閲囪喘鍑哄簱瀵煎嚭
+     *
      * @param response
      */
     @PostMapping("/export")
@@ -82,10 +83,9 @@
     }
 
 
-    @Autowired
-    public ProcurementRecordOutMapper procurementRecordOutMapper;
     /**
      * 鐢熶骇鍑哄簱瀵煎嚭
+     *
      * @param response
      */
     @PostMapping("/exportOne")
@@ -97,6 +97,7 @@
 
     /**
      * 鑷畾涔夊嚭搴撳鍑�
+     *
      * @param response
      */
     @PostMapping("/exportTwo")

--
Gitblit v1.9.3