From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 67 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index a3c0adf..ebbd718 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -8,7 +8,7 @@
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.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
@@ -20,15 +20,15 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
-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 io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -48,7 +48,7 @@
@RestController
@RequestMapping("/purchase/ledger")
@AllArgsConstructor
-@Api(tags = "閲囪喘鍙拌处")
+@Tag(name = "閲囪喘鍙拌处")
@Slf4j
public class PurchaseLedgerController extends BaseController {
private IPurchaseLedgerService purchaseLedgerService;
@@ -66,14 +66,14 @@
*/
@Log(title = "瀵煎叆閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/import")
- @ApiOperation("瀵煎叆閲囪喘鍙拌处")
- public AjaxResult importData(@RequestParam("file")
+ @Operation(summary = "瀵煎叆閲囪喘鍙拌处")
+ public R<?> importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
return purchaseLedgerService.importData(file);
}
- @ApiOperation("瀵煎嚭閲囪喘鍙拌处妯℃澘")
+ @Operation(summary = "瀵煎嚭閲囪喘鍙拌处妯℃澘")
@PostMapping("/exportTemplate")
public void exportTemplate(HttpServletResponse response) {
// 1. 妯℃澘鏂囦欢鍦╮esources/static涓嬬殑璺緞
@@ -151,16 +151,17 @@
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditPurchase")
- public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
- return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
+ public R<?> addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
+ purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto);
+ return R.ok();
}
/**
* 鏌ヨ閲囪喘妯℃澘
*/
- @ApiOperation("/鏌ヨ閲囪喘妯℃澘")
+ @Operation(summary = "/鏌ヨ閲囪喘妯℃澘")
@GetMapping("/getPurchaseTemplateList")
- public AjaxResult getPurchaseTemplateList() {
+ public R<?> getPurchaseTemplateList() {
List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
purchaseLedgers.forEach(purchaseLedgerDto1 -> {
LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
@@ -171,14 +172,15 @@
purchaseLedgerDto1.setProductList(list);
}
});
- return AjaxResult.success(purchaseLedgers);
+ return R.ok(purchaseLedgers);
}
/**
* 淇敼閲囪喘鍙拌处瀹℃壒鐘舵��
*/
@PostMapping("/updateApprovalStatus")
- public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
- return toAjax(purchaseLedgerService.updateById(purchaseLedger));
+ public R<?> addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
+ purchaseLedgerService.updateById(purchaseLedger);
+ return R.ok();
}
/**
* 鏌ヨ閲囪喘鍙拌处鍜屼骇鍝佺埗瀛愬垪琛�
@@ -189,12 +191,21 @@
}
/**
+ * 鏌ヨ閲囪喘鍙拌处鍜屼骇鍝佺埗瀛愬垪琛�
+ */
+ @GetMapping("/getPurchaseByCode")
+ public PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto) {
+ return purchaseLedgerService.getPurchaseByCode(purchaseLedgerDto);
+ }
+
+ /**
* 鍒犻櫎閲囪喘鍙拌处
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.DELETE)
@DeleteMapping("/delPurchase")
- public AjaxResult remove(@RequestBody Long[] ids) {
- return toAjax(purchaseLedgerService.deletePurchaseLedgerByIds(ids));
+ public R<?> remove(@RequestBody Long[] ids) {
+ purchaseLedgerService.deletePurchaseLedgerByIds(ids);
+ return R.ok();
}
/**
@@ -210,8 +221,8 @@
* 鏍规嵁閿�鍞悎鍚屾煡璇骇鍝佷俊鎭�
*/
@GetMapping("/getProductBySalesNo")
- public AjaxResult getProductBySalesNo(Long id) {
- return AjaxResult.success(purchaseLedgerService.getProductBySalesNo(id));
+ public R<?> getProductBySalesNo(Long id) {
+ return R.ok(purchaseLedgerService.getProductBySalesNo(id));
}
/**
@@ -226,8 +237,8 @@
* 鏍规嵁id鏌ヨ閲囪喘鍚堝悓鍙�
*/
@GetMapping("/getPurchaseNoById")
- public AjaxResult getPurchaseNoById(Long id) {
- return AjaxResult.success(purchaseLedgerService.getPurchaseNoById(id));
+ public R<?> getPurchaseNoById(Long id) {
+ return R.ok(purchaseLedgerService.getPurchaseNoById(id));
}
/**
@@ -242,22 +253,22 @@
* 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇骇鍝�
*/
@GetMapping("/getInfo")
- public AjaxResult getInfo(PurchaseLedgerDto purchaseLedgerDto) {
- return AjaxResult.success(purchaseLedgerService.getInfo(purchaseLedgerDto));
+ public R<?> getInfo(PurchaseLedgerDto purchaseLedgerDto) {
+ return R.ok(purchaseLedgerService.getInfo(purchaseLedgerDto));
}
/**
* 鏌ヨ閲囪喘鍙拌处鍒楄〃
*/
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
- return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
+ public R<?> listPage(Page page, PurchaseLedgerDto purchaseLedger) {
+ return R.ok(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
}
- @ApiOperation("鐢熸垚閲囪喘搴忓垪鍙�")
+ @Operation(summary = "鐢熸垚閲囪喘搴忓垪鍙�")
@GetMapping("/createPurchaseNo")
@Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
- public AjaxResult createPurchaseNo() {
- return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo());
+ public R<?> createPurchaseNo() {
+ return R.ok(purchaseLedgerService.getPurchaseNo(), "鐢熸垚鎴愬姛");
}
}
--
Gitblit v1.9.3