From 2cc19f8033348f34df382d27f63810b2d6f56a05 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 10:26:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 161 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 156 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 70809d8..2358caf 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -1,5 +1,9 @@
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;
@@ -7,15 +11,33 @@
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;
+import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
+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.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 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
@@ -26,10 +48,68 @@
@RestController
@RequestMapping("/purchase/ledger")
@AllArgsConstructor
+@Api(tags = "閲囪喘鍙拌处")
+@Slf4j
public class PurchaseLedgerController extends BaseController {
private IPurchaseLedgerService purchaseLedgerService;
private ISalesLedgerService salesLedgerService;
+ private ISalesLedgerProductService salesLedgerProductService;
+
+ private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
+
+ private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
+
+
+ /**
+ * 瀵煎叆閲囪喘鍙拌处
+ */
+ @Log(title = "瀵煎叆閲囪喘鍙拌处", businessType = BusinessType.INSERT)
+ @PostMapping("/import")
+ @ApiOperation("瀵煎叆閲囪喘鍙拌处")
+ public AjaxResult importData(@RequestParam("file")
+ @ApiParam(value = "Excel鏂囦欢", required = true)
+ MultipartFile file) {
+ return purchaseLedgerService.importData(file);
+ }
+
+ @ApiOperation("瀵煎嚭閲囪喘鍙拌处妯℃澘")
+ @PostMapping("/exportTemplate")
+ public void exportTemplate(HttpServletResponse response) {
+ // 1. 妯℃澘鏂囦欢鍦╮esources/static涓嬬殑璺緞
+ String templatePath = "static/閲囪喘鍙拌处瀵煎叆妯℃澘.xlsx";
+
+ // 2. 鑾峰彇妯℃澘鏂囦欢鐨勮緭鍏ユ祦
+ try (InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream(templatePath)) {
+ if (inputStream == null) {
+ throw new FileNotFoundException("妯℃澘鏂囦欢涓嶅瓨鍦細" + templatePath);
+ }
+
+ // 3. 璁剧疆鍝嶅簲澶达紝瑙﹀彂娴忚鍣ㄤ笅杞�
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("閲囪喘鍙拌处瀵煎叆妯℃澘.xlsx", "utf-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName);
+
+ // 4. 灏嗘ā鏉挎枃浠跺啓鍏ュ搷搴旇緭鍑烘祦
+ try (OutputStream outputStream = response.getOutputStream()) {
+ byte[] buffer = new byte[1024];
+ int len;
+ while ((len = inputStream.read(buffer)) > 0) {
+ outputStream.write(buffer, 0, len);
+ }
+ outputStream.flush();
+ }
+ } catch (IOException e) {
+ log.error("瀵煎嚭閿�鍞彴璐︽ā鏉垮け璐�", e);
+ // 鑻ユā鏉挎枃浠惰鍙栧け璐ワ紝杩斿洖閿欒鎻愮ず
+ try {
+ response.getWriter().write("妯℃澘瀵煎嚭澶辫触锛�" + e.getMessage());
+ } catch (IOException ex) {
+ log.error("鍝嶅簲杈撳嚭閿欒", ex);
+ }
+ }
+ }
/**
* 鏌ヨ閲囪喘鍙拌处鍒楄〃
@@ -53,20 +133,67 @@
}
/**
+ * 瀵煎嚭鏉ョエ鐧昏鍒楄〃
+ */
+ @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 AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws IOException {
+ public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
}
+ /**
+ * 鏌ヨ閲囪喘妯℃澘
+ */
+ @ApiOperation("/鏌ヨ閲囪喘妯℃澘")
+ @GetMapping("/getPurchaseTemplateList")
+ public AjaxResult getPurchaseTemplateList() {
+ List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
+ purchaseLedgers.forEach(purchaseLedgerDto1 -> {
+ LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SalesLedgerProductTemplate::getSalesLedgerId, purchaseLedgerDto1.getId())
+ .eq(SalesLedgerProductTemplate::getType, 2);
+ List<SalesLedgerProductTemplate> list = salesLedgerProductTemplateMapper.selectList(queryWrapper);
+ if (!list.isEmpty()) {
+ purchaseLedgerDto1.setProductList(list);
+ }
+ });
+ return AjaxResult.success(purchaseLedgers);
+ }
+ /**
+ * 淇敼閲囪喘鍙拌处瀹℃壒鐘舵��
+ */
+ @PostMapping("/updateApprovalStatus")
+ public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
+ return toAjax(purchaseLedgerService.updateById(purchaseLedger));
+ }
/**
* 鏌ヨ閲囪喘鍙拌处鍜屼骇鍝佺埗瀛愬垪琛�
*/
@GetMapping("/getPurchaseById")
public PurchaseLedgerDto getPurchaseById(PurchaseLedgerDto purchaseLedgerDto) {
return purchaseLedgerService.getPurchaseById(purchaseLedgerDto);
+ }
+
+ /**
+ * 鏌ヨ閲囪喘鍙拌处鍜屼骇鍝佺埗瀛愬垪琛�
+ */
+ @GetMapping("/getPurchaseByCode")
+ public PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto) {
+ return purchaseLedgerService.getPurchaseByCode(purchaseLedgerDto);
}
/**
@@ -86,6 +213,15 @@
return salesLedgerService.getSalesNo();
}
+
+ /**
+ * 鏍规嵁閿�鍞悎鍚屾煡璇骇鍝佷俊鎭�
+ */
+ @GetMapping("/getProductBySalesNo")
+ public AjaxResult getProductBySalesNo(Long id) {
+ return AjaxResult.success(purchaseLedgerService.getProductBySalesNo(id));
+ }
+
/**
* 鏌ヨ閲囪喘鍚堝悓鍙�
*/
@@ -98,8 +234,8 @@
* 鏍规嵁id鏌ヨ閲囪喘鍚堝悓鍙�
*/
@GetMapping("/getPurchaseNoById")
- public PurchaseLedgerDto getPurchaseNoById(Long id) {
- return purchaseLedgerService.getPurchaseNoById(id);
+ public AjaxResult getPurchaseNoById(Long id) {
+ return AjaxResult.success(purchaseLedgerService.getPurchaseNoById(id));
}
/**
@@ -114,7 +250,22 @@
* 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇骇鍝�
*/
@GetMapping("/getInfo")
- public PurchaseLedgerDto getInfo(PurchaseLedgerDto purchaseLedgerDto) {
- return purchaseLedgerService.getInfo(purchaseLedgerDto);
+ public AjaxResult getInfo(PurchaseLedgerDto purchaseLedgerDto) {
+ return AjaxResult.success(purchaseLedgerService.getInfo(purchaseLedgerDto));
+ }
+
+ /**
+ * 鏌ヨ閲囪喘鍙拌处鍒楄〃
+ */
+ @GetMapping("/listPage")
+ public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
+ return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
+ }
+
+ @ApiOperation("鐢熸垚閲囪喘搴忓垪鍙�")
+ @GetMapping("/createPurchaseNo")
+ @Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
+ public AjaxResult createPurchaseNo() {
+ return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo());
}
}
--
Gitblit v1.9.3