From a0d55bcc8bfebd408d16166b27b7e05b3e4c9f4a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:50 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径拆税，供应商合同补供应商名称与附件
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 104 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 91 insertions(+), 13 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 1bc4f5a..270196f 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
@@ -8,16 +8,21 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestDeptStatisticsRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpSupplierDO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.erp.service.purchase.ErpPurchaseRequestService;
-import cn.iocoder.yudao.module.erp.service.purchase.ErpSupplierService;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
@@ -30,10 +35,17 @@
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -52,10 +64,12 @@
@Resource
private ErpPurchaseRequestService purchaseRequestService;
@Resource
- private ErpSupplierService supplierService;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private MdmItemApi mdmItemApi;
+ @Resource
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private AdminUserApi adminUserApi;
@Resource
@@ -90,7 +104,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) {
@@ -99,16 +112,31 @@
List<ErpPurchaseRequestItemDO> purchaseRequestItemList = purchaseRequestService.getPurchaseRequestItemListByRequestId(id);
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductId));
- 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()));
- })).setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_request", id))));
+ Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
+ convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductUnitId));
+ // 渚涘簲鍟� / 鐢宠浜� / 鐢宠閮ㄩ棬鍚嶇О锛堝崟鏉¤鎯呬笌鍒嗛〉淇濇寔涓�鑷达紝瀹℃壒璇︽儏椤典緷璧栬繖浜涘悕绉帮級
+ Map<Long, SrmSupplierRespDTO> supplierMap = getSupplierMap(
+ convertSet(Collections.singletonList(purchaseRequest), ErpPurchaseRequestDO::getSupplierId));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
+ convertSet(Collections.singletonList(purchaseRequest), ErpPurchaseRequestDO::getRequestUserId));
+ Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
+ convertSet(Collections.singletonList(purchaseRequest), 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()));
+ }));
+ 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()));
+ purchaseRequestVO.setAttachmentList(storageAttachmentApi.listAttachments("erp_purchase_request", id));
+ }));
}
@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));
@@ -125,6 +153,31 @@
ExcelUtils.write(response, "閲囪喘鐢宠.xls", "鏁版嵁", ErpPurchaseRequestRespVO.class, list);
}
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱瀵煎叆閲囪喘鐢宠妯℃澘")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-request:import')")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ List<ErpPurchaseRequestImportExcelVO> list = Arrays.asList(
+ ErpPurchaseRequestImportExcelVO.builder()
+ .no("CGSQ20260101000001").supplierName("绀轰緥渚涘簲鍟�")
+ .requestTime("2026-01-01 10:00:00").requestReason("绀轰緥锛氱敓浜ч渶瑕�")
+ .productCode("ITEM001").productName("绀轰緥浜у搧A")
+ .count(new BigDecimal("100")).productPrice(new BigDecimal("10.00"))
+ .taxPercent(new BigDecimal("13")).demandTime("2026-01-10")
+ .qcCheckFlag("鍚�").remark("绀轰緥").build());
+ ExcelUtils.write(response, "閲囪喘鐢宠瀵煎叆妯℃澘.xls", "閲囪喘鐢宠", ErpPurchaseRequestImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆閲囪喘鐢宠")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-request:import')")
+ public CommonResult<ErpPurchaseRequestImportRespVO> importPurchaseRequestExcel(
+ @RequestParam("file") MultipartFile file) throws Exception {
+ List<ErpPurchaseRequestImportExcelVO> list = ExcelUtils.read(file, ErpPurchaseRequestImportExcelVO.class);
+ return success(purchaseRequestService.importPurchaseRequestList(list));
+ }
+
+
@PutMapping("/submit")
@Operation(summary = "鎻愪氦閲囪喘鐢宠瀹℃壒")
@PreAuthorize("@ss.hasPermission('erp:purchase-request:submit')")
@@ -135,11 +188,31 @@
return success(true);
}
+ @PutMapping("/reset-status")
+ @Operation(summary = "閲嶇疆閲囪喘鐢宠鐘舵�侊紙椹冲洖鈫掕崏绋匡級")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-request:update')")
+ public CommonResult<Boolean> resetPurchaseRequestStatus(@RequestParam("id") Long id) {
+ purchaseRequestService.resetPurchaseRequestStatus(id);
+ return success(true);
+ }
+
@GetMapping("/approve-process-list")
@Operation(summary = "鑾峰彇閲囪喘鐢宠瀹℃壒娴佺▼鍒楄〃")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
public CommonResult<List<Map<String, Object>>> getApproveProcessList() {
return success(purchaseRequestService.getPurchaseRequestApproveProcessDefinitionList());
+ }
+
+ @GetMapping("/statistics/dept")
+ @Operation(summary = "鑾峰緱閲囪喘鐢宠閮ㄩ棬缁熻")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-request:statistics')")
+ public CommonResult<List<ErpPurchaseRequestDeptStatisticsRespVO>> getDeptStatistics(
+ @Parameter(name = "beginTime", description = "鐢宠鏃堕棿寮�濮�", example = "2026-01-01 00:00:00")
+ @RequestParam(value = "beginTime", required = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
+ @Parameter(name = "endTime", description = "鐢宠鏃堕棿缁撴潫", example = "2026-12-31 23:59:59")
+ @RequestParam(value = "endTime", required = false)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime) {
+ return success(purchaseRequestService.getDeptStatistics(beginTime, endTime));
}
@PostMapping("/generate-order")
@@ -162,7 +235,7 @@
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductId));
// 1.3 渚涘簲鍟嗕俊鎭�
- Map<Long, ErpSupplierDO> supplierMap = supplierService.getSupplierMap(
+ Map<Long, SrmSupplierRespDTO> supplierMap = getSupplierMap(
convertSet(pageResult.getList(), ErpPurchaseRequestDO::getSupplierId));
// 1.4 鐢ㄦ埛淇℃伅
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
@@ -182,4 +255,9 @@
});
}
-}
\ No newline at end of file
+ private Map<Long, SrmSupplierRespDTO> getSupplierMap(Collection<Long> supplierIds) {
+ return srmSupplierApi.getSupplierList(supplierIds).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
+ }
+
+}
--
Gitblit v1.9.3