From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 68 +++++++++++----------------------
1 files changed, 23 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index ebbd718..0951d3b 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -1,14 +1,12 @@
package com.ruoyi.purchase.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
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.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
@@ -17,27 +15,23 @@
import com.ruoyi.purchase.pojo.PurchaseLedgerTemplate;
import com.ruoyi.purchase.pojo.SalesLedgerProductTemplate;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import com.ruoyi.sales.service.ISalesLedgerService;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import jakarta.servlet.http.HttpServletResponse;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
/**
* 閲囪喘鍙拌处Controller
@@ -67,7 +61,7 @@
@Log(title = "瀵煎叆閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/import")
@Operation(summary = "瀵煎叆閲囪喘鍙拌处")
- public R<?> importData(@RequestParam("file")
+ public AjaxResult importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
return purchaseLedgerService.importData(file);
@@ -132,28 +126,14 @@
util.exportExcel(response, list, "銆愯濉啓鍔熻兘鍚嶇О銆戞暟鎹�");
}
- /**
- * 瀵煎嚭鏉ョエ鐧昏鍒楄〃
- */
- @Log(title = "瀵煎嚭鏉ョエ鐧昏鍒楄〃", businessType = BusinessType.EXPORT)
- @PostMapping("/exportOne")
- public void exportOne(HttpServletResponse response, PurchaseLedger purchaseLedger) {
- Page page = new Page();
- page.setCurrent(-1);
- page.setSize(-1);
- IPage<PurchaseLedgerDto> purchaseLedgerDtoIPage = purchaseLedgerService.selectPurchaseLedgerListPage(page, new PurchaseLedgerDto());
- ExcelUtil<PurchaseLedgerDto> util = new ExcelUtil<PurchaseLedgerDto>(PurchaseLedgerDto.class);
- util.exportExcel(response, purchaseLedgerDtoIPage.getRecords(), "瀵煎嚭鏉ョエ鐧昏鍒楄〃");
- }
/**
* 鏂板淇敼閲囪喘鍙拌处
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditPurchase")
- public R<?> addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
- purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto);
- return R.ok();
+ public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
+ return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
}
/**
@@ -161,7 +141,7 @@
*/
@Operation(summary = "/鏌ヨ閲囪喘妯℃澘")
@GetMapping("/getPurchaseTemplateList")
- public R<?> getPurchaseTemplateList() {
+ public AjaxResult getPurchaseTemplateList() {
List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
purchaseLedgers.forEach(purchaseLedgerDto1 -> {
LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
@@ -172,15 +152,14 @@
purchaseLedgerDto1.setProductList(list);
}
});
- return R.ok(purchaseLedgers);
+ return AjaxResult.success(purchaseLedgers);
}
/**
* 淇敼閲囪喘鍙拌处瀹℃壒鐘舵��
*/
@PostMapping("/updateApprovalStatus")
- public R<?> addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
- purchaseLedgerService.updateById(purchaseLedger);
- return R.ok();
+ public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
+ return toAjax(purchaseLedgerService.updateById(purchaseLedger));
}
/**
* 鏌ヨ閲囪喘鍙拌处鍜屼骇鍝佺埗瀛愬垪琛�
@@ -203,9 +182,8 @@
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.DELETE)
@DeleteMapping("/delPurchase")
- public R<?> remove(@RequestBody Long[] ids) {
- purchaseLedgerService.deletePurchaseLedgerByIds(ids);
- return R.ok();
+ public AjaxResult remove(@RequestBody Long[] ids) {
+ return toAjax(purchaseLedgerService.deletePurchaseLedgerByIds(ids));
}
/**
@@ -221,8 +199,8 @@
* 鏍规嵁閿�鍞悎鍚屾煡璇骇鍝佷俊鎭�
*/
@GetMapping("/getProductBySalesNo")
- public R<?> getProductBySalesNo(Long id) {
- return R.ok(purchaseLedgerService.getProductBySalesNo(id));
+ public AjaxResult getProductBySalesNo(Long id) {
+ return AjaxResult.success();
}
/**
@@ -237,8 +215,8 @@
* 鏍规嵁id鏌ヨ閲囪喘鍚堝悓鍙�
*/
@GetMapping("/getPurchaseNoById")
- public R<?> getPurchaseNoById(Long id) {
- return R.ok(purchaseLedgerService.getPurchaseNoById(id));
+ public AjaxResult getPurchaseNoById(Long id) {
+ return AjaxResult.success(purchaseLedgerService.getPurchaseNoById(id));
}
/**
@@ -253,22 +231,22 @@
* 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇骇鍝�
*/
@GetMapping("/getInfo")
- public R<?> getInfo(PurchaseLedgerDto purchaseLedgerDto) {
- return R.ok(purchaseLedgerService.getInfo(purchaseLedgerDto));
+ public AjaxResult getInfo(PurchaseLedgerDto purchaseLedgerDto) {
+ return AjaxResult.success(purchaseLedgerService.getInfo(purchaseLedgerDto));
}
/**
* 鏌ヨ閲囪喘鍙拌处鍒楄〃
*/
@GetMapping("/listPage")
- public R<?> listPage(Page page, PurchaseLedgerDto purchaseLedger) {
- return R.ok(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
+ public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
+ return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
}
@Operation(summary = "鐢熸垚閲囪喘搴忓垪鍙�")
@GetMapping("/createPurchaseNo")
@Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
- public R<?> createPurchaseNo() {
- return R.ok(purchaseLedgerService.getPurchaseNo(), "鐢熸垚鎴愬姛");
+ public AjaxResult createPurchaseNo() {
+ return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo());
}
}
--
Gitblit v1.9.3