From 2dd645b5346f510d1207346347f1fa70a204d9d3 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 05 十一月 2026 16:11:34 +0800
Subject: [PATCH] 1. 完成项目管理全流程优化，补充阶段推进、汇报统计及生命周期记录。 2. 完成业务与项目数据关联，支持查看项目进度、详情及相关附件。 3. 完成采购审批流程接入，支持配置审批人员及采购业务审批。 4. 精简用户、角色、部门、菜单和字典，完善操作日志及附件下载。
---
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 3290499..a66a48e 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -1,14 +1,13 @@
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.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;
@@ -17,27 +16,24 @@
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.Date;
import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
/**
* 閲囪喘鍙拌处Controller
@@ -122,6 +118,16 @@
}
/**
+ * 鏌ヨ閲囪喘閫�璐у彲閫夐噰璐彴璐�
+ */
+ @GetMapping("/returnableList")
+ public TableDataInfo returnableList(PurchaseLedger purchaseLedger) {
+ startPage();
+ List<PurchaseLedger> list = purchaseLedgerService.selectReturnablePurchaseLedgerList(purchaseLedger);
+ return getDataTable(list);
+ }
+
+ /**
* 瀵煎嚭閲囪喘鍙拌处鍒楄〃
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.EXPORT)
@@ -132,19 +138,6 @@
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(), "瀵煎嚭鏉ョエ鐧昏鍒楄〃");
- }
/**
* 鏂板淇敼閲囪喘鍙拌处
@@ -153,6 +146,13 @@
@PostMapping("/addOrEditPurchase")
public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
+ }
+
+ @Operation(summary = "鎵归噺鎺ㄨ繘閲囪喘鍙拌处鍒板叆搴�")
+ @Log(title = "鎵归噺鎺ㄨ繘閲囪喘鍙拌处鍒板叆搴�", businessType = BusinessType.OTHER)
+ @PostMapping("/batchInsertPurchaseSteps")
+ public R batchInsertPurchaseSteps(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ return purchaseLedgerService.batchInsertPurchaseSteps(purchaseLedgerDto == null ? null : purchaseLedgerDto.getIds());
}
/**
@@ -177,6 +177,7 @@
* 淇敼閲囪喘鍙拌处瀹℃壒鐘舵��
*/
@PostMapping("/updateApprovalStatus")
+ @Log(title = "閲囪喘瀹℃壒", businessType = BusinessType.UPDATE)
public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
return toAjax(purchaseLedgerService.updateById(purchaseLedger));
}
@@ -219,7 +220,7 @@
*/
@GetMapping("/getProductBySalesNo")
public AjaxResult getProductBySalesNo(Long id) {
- return AjaxResult.success(purchaseLedgerService.getProductBySalesNo(id));
+ return AjaxResult.success();
}
/**
@@ -265,7 +266,7 @@
@Operation(summary = "鐢熸垚閲囪喘搴忓垪鍙�")
@GetMapping("/createPurchaseNo")
@Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
- public AjaxResult createPurchaseNo() {
- return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo());
+ public AjaxResult createPurchaseNo(@RequestParam Date entryDate) {
+ return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo(entryDate));
}
}
--
Gitblit v1.9.3