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 | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
index f024bfe..8d8e62f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
@@ -6,10 +6,10 @@
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.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.v3.oas.annotations.tags.Tag;
@@ -34,42 +34,42 @@
@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));
}
/**
--
Gitblit v1.9.3