From 274dd8b724dd4485658e1d2a3f825a007f625bd7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 17 七月 2026 09:10:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 92 ++++++++++++++++------------------------------
1 files changed, 32 insertions(+), 60 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 0a765bd..814f10e 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
@@ -5,8 +5,8 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
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.ErpPurchaseRequestPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestRespVO;
@@ -40,7 +40,6 @@
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMultiMap;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserDeptId;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@Tag(name = "绠＄悊鍚庡彴 - ERP 閲囪喘鐢宠")
@@ -65,7 +64,7 @@
@Operation(summary = "鍒涘缓閲囪喘鐢宠")
@PreAuthorize("@ss.hasPermission('erp:purchase-request:create')")
public CommonResult<Long> createPurchaseRequest(@Valid @RequestBody ErpPurchaseRequestSaveReqVO createReqVO) {
- return success(purchaseRequestService.createPurchaseRequest(createReqVO, getLoginUserId(), getLoginUserDeptId()));
+ return success(purchaseRequestService.createPurchaseRequest(createReqVO));
}
@PutMapping("/update")
@@ -73,15 +72,6 @@
@PreAuthorize("@ss.hasPermission('erp:purchase-request:update')")
public CommonResult<Boolean> updatePurchaseRequest(@Valid @RequestBody ErpPurchaseRequestSaveReqVO updateReqVO) {
purchaseRequestService.updatePurchaseRequest(updateReqVO);
- return success(true);
- }
-
- @PutMapping("/submit")
- @Operation(summary = "鎻愪氦閲囪喘鐢宠瀹℃壒")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:submit')")
- public CommonResult<Boolean> submitPurchaseRequest(@RequestParam("id") Long id,
- @RequestParam("processDefinitionKey") String processDefinitionKey) {
- purchaseRequestService.submitPurchaseRequest(id, processDefinitionKey, getLoginUserId());
return success(true);
}
@@ -106,13 +96,11 @@
List<ErpPurchaseRequestItemDO> purchaseRequestItemList = purchaseRequestService.getPurchaseRequestItemListByRequestId(id);
Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductId));
- return success(BeanUtils.toBean(purchaseRequest, ErpPurchaseRequestRespVO.class, vo -> {
- vo.setItems(BeanUtils.toBean(purchaseRequestItemList, ErpPurchaseRequestRespVO.Item.class, item ->
+ 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()))));
- // 濉厖鍏宠仈瀛楁
- fillPurchaseRequestRelatedFields(vo);
- }));
+ .setProductBarCode(mdmItem.getBarCode()));
+ }))));
}
@GetMapping("/page")
@@ -130,9 +118,25 @@
public void exportPurchaseRequestExcel(@Valid ErpPurchaseRequestPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List<ErpPurchaseRequestRespVO> list = buildPurchaseRequestVOPageResult(
- purchaseRequestService.getPurchaseRequestPage(pageReqVO)).getList();
+ List<ErpPurchaseRequestRespVO> list = buildPurchaseRequestVOPageResult(purchaseRequestService.getPurchaseRequestPage(pageReqVO)).getList();
ExcelUtils.write(response, "閲囪喘鐢宠.xls", "鏁版嵁", ErpPurchaseRequestRespVO.class, list);
+ }
+
+ @PutMapping("/submit")
+ @Operation(summary = "鎻愪氦閲囪喘鐢宠瀹℃壒")
+ @PreAuthorize("@ss.hasPermission('erp:purchase-request:submit')")
+ public CommonResult<Boolean> submitPurchaseRequest(@RequestParam("id") Long id,
+ @RequestParam("processDefinitionKey") String processDefinitionKey) {
+ Long userId = getLoginUserId();
+ purchaseRequestService.submitPurchaseRequest(id, processDefinitionKey, userId);
+ 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());
}
@PostMapping("/generate-order")
@@ -140,14 +144,7 @@
@PreAuthorize("@ss.hasPermission('erp:purchase-request:generate-order')")
public CommonResult<Long> generatePurchaseOrder(@RequestParam("id") Long id,
@RequestParam("supplierId") Long supplierId) {
- return success(purchaseRequestService.generatePurchaseOrder(id, supplierId, getLoginUserId()));
- }
-
- @GetMapping("/approve-process-list")
- @Operation(summary = "鑾峰彇閲囪喘鐢宠瀹℃壒娴佺▼鍒楄〃")
- @PreAuthorize("@ss.hasPermission('erp:purchase-request:query')")
- public CommonResult<List<Map<String, Object>>> getPurchaseRequestApproveProcessList() {
- return success(purchaseRequestService.getPurchaseRequestApproveProcessDefinitionList());
+ return success(purchaseRequestService.generatePurchaseOrder(id, supplierId));
}
private PageResult<ErpPurchaseRequestRespVO> buildPurchaseRequestVOPageResult(PageResult<ErpPurchaseRequestDO> pageResult) {
@@ -170,41 +167,16 @@
// 1.5 閮ㄩ棬淇℃伅
Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(
convertSet(pageResult.getList(), ErpPurchaseRequestDO::getRequestDeptId));
-
// 2. 寮�濮嬫嫾鎺�
- return BeanUtils.toBean(pageResult, ErpPurchaseRequestRespVO.class, vo -> {
- vo.setItems(BeanUtils.toBean(purchaseRequestItemMap.get(vo.getId()), ErpPurchaseRequestRespVO.Item.class,
+ return BeanUtils.toBean(pageResult, ErpPurchaseRequestRespVO.class, purchaseRequest -> {
+ purchaseRequest.setItems(BeanUtils.toBean(purchaseRequestItemMap.get(purchaseRequest.getId()), ErpPurchaseRequestRespVO.Item.class,
item -> MapUtils.findAndThen(itemMap, item.getProductId(), mdmItem -> item.setProductName(mdmItem.getName())
.setProductBarCode(mdmItem.getBarCode()))));
- vo.setProductNames(CollUtil.join(vo.getItems(), "锛�", ErpPurchaseRequestRespVO.Item::getProductName));
- MapUtils.findAndThen(supplierMap, vo.getSupplierId(), supplier -> vo.setSupplierName(supplier.getName()));
- MapUtils.findAndThen(userMap, vo.getRequestUserId(), user -> vo.setRequestUserName(user.getNickname()));
- MapUtils.findAndThen(deptMap, vo.getRequestDeptId(), dept -> vo.setRequestDeptName(dept.getName()));
+ purchaseRequest.setProductNames(CollUtil.join(purchaseRequest.getItems(), "锛�", ErpPurchaseRequestRespVO.Item::getProductName));
+ MapUtils.findAndThen(supplierMap, purchaseRequest.getSupplierId(), supplier -> purchaseRequest.setSupplierName(supplier.getName()));
+ MapUtils.findAndThen(userMap, purchaseRequest.getRequestUserId(), user -> purchaseRequest.setRequestUserName(user.getNickname()));
+ MapUtils.findAndThen(deptMap, purchaseRequest.getRequestDeptId(), dept -> purchaseRequest.setRequestDeptName(dept.getName()));
});
}
- private void fillPurchaseRequestRelatedFields(ErpPurchaseRequestRespVO vo) {
- // 濉厖鐢宠浜哄悕绉�
- if (vo.getRequestUserId() != null) {
- AdminUserRespDTO user = adminUserApi.getUser(vo.getRequestUserId());
- if (user != null) {
- vo.setRequestUserName(user.getNickname());
- }
- }
- // 濉厖閮ㄩ棬鍚嶇О
- if (vo.getRequestDeptId() != null) {
- DeptRespDTO dept = deptApi.getDept(vo.getRequestDeptId());
- if (dept != null) {
- vo.setRequestDeptName(dept.getName());
- }
- }
- // 濉厖渚涘簲鍟嗗悕绉�
- if (vo.getSupplierId() != null) {
- ErpSupplierDO supplier = supplierService.getSupplier(vo.getSupplierId());
- if (supplier != null) {
- vo.setSupplierName(supplier.getName());
- }
- }
- }
-
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3