From d39e4f7d839167c16425086dfa2f8747bccfdff9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 17:39:01 +0800
Subject: [PATCH] feat: 打通销售采购财务闭环并完成累计业务优化
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
index 0175677..3c86b7f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -99,7 +99,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閲囪喘鐢宠")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<ErpPurchaseRequestRespVO> getPurchaseRequest(@RequestParam("id") Long id) {
ErpPurchaseRequestDO purchaseRequest = purchaseRequestService.getPurchaseRequest(id);
if (purchaseRequest == null) {
@@ -110,18 +109,33 @@
convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductId));
Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductUnitId));
- return success(BeanUtils.toBean(purchaseRequest, ErpPurchaseRequestRespVO.class, purchaseRequestVO ->
- purchaseRequestVO.setItems(BeanUtils.toBean(purchaseRequestItemList, ErpPurchaseRequestRespVO.Item.class, item -> {
- MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
- .setProductBarCode(mdmItem.getBarCode()));
- MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
- item.setProductUnitName(unit.getName()));
- })).setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_request", id))));
+ // 渚涘簲鍟� / 鐢宠浜� / 鐢宠閮ㄩ棬鍚嶇О锛氬鎵硅鎯呴〉鐩存帴灞曠ず璇ユ帴鍙ｇ殑鏁版嵁锛岀己澶变細鏄剧ず涓衡��-鈥�
+ List<ErpPurchaseRequestDO> singleList = java.util.Collections.singletonList(purchaseRequest);
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
+ convertSet(singleList, ErpPurchaseRequestDO::getSupplierId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(singleList, ErpPurchaseRequestDO::getRequestUserId));
+ Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
+ convertSet(singleList, ErpPurchaseRequestDO::getRequestDeptId));
+ return success(BeanUtils.toBean(purchaseRequest, ErpPurchaseRequestRespVO.class, purchaseRequestVO -> {
+ purchaseRequestVO.setItems(BeanUtils.toBean(purchaseRequestItemList, ErpPurchaseRequestRespVO.Item.class, item -> {
+ MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
+ .setProductBarCode(mdmItem.getBarCode()));
+ MapUtils.findAndThen(unitMeasureMap, item.getProductUnitId(), unit ->
+ item.setProductUnitName(unit.getName()));
+ })).setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_request", id));
+ MapUtils.findAndThen(supplierMap, purchaseRequestVO.getSupplierId(),
+ supplier -> purchaseRequestVO.setSupplierName(supplier.getName()));
+ MapUtils.findAndThen(userMap, purchaseRequestVO.getRequestUserId(),
+ user -> purchaseRequestVO.setRequestUserName(user.getNickname()));
+ MapUtils.findAndThen(deptMap, purchaseRequestVO.getRequestDeptId(),
+ dept -> purchaseRequestVO.setRequestDeptName(dept.getName()));
+ }));
}
@GetMapping("/page")
@Operation(summary = "鑾峰緱閲囪喘鐢宠鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<PageResult<ErpPurchaseRequestRespVO>> getPurchaseRequestPage(@Valid ErpPurchaseRequestPageReqVO pageReqVO) {
PageResult<ErpPurchaseRequestDO> pageResult = purchaseRequestService.getPurchaseRequestPage(pageReqVO);
return success(buildPurchaseRequestVOPageResult(pageResult));
@@ -183,7 +197,6 @@
@GetMapping("/approve-process-list")
@Operation(summary = "鑾峰彇閲囪喘鐢宠瀹℃壒娴佺▼鍒楄〃")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
return success(purchaseRequestService.getPurchaseRequestApproveProcessDefinitionList());
}
@@ -192,7 +205,7 @@
@Operation(summary = "鐢熸垚閲囪喘璁㈠崟")
@PreAuthorize("@ss.hasPermission('erp:purchase-request:generate-order')")
public CommonResult<Long> generatePurchaseOrder(@RequestParam("id") Long id,
- @RequestParam("supplierId") Long supplierId) {
+ @RequestParam(value = "supplierId", required = false) Long supplierId) {
return success(purchaseRequestService.generatePurchaseOrder(id, supplierId));
}
--
Gitblit v1.9.3