gaoluyang
3 天以前 d39e4f7d839167c16425086dfa2f8747bccfdff9
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -109,13 +109,29 @@
                convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductId));
        Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureMap(
                convertSet(purchaseRequestItemList, ErpPurchaseRequestItemDO::getProductUnitId));
        return success(BeanUtils.toBean(purchaseRequest, ErpPurchaseRequestRespVO.class, purchaseRequestVO ->
        // 供应商 / 申请人 / 申请部门名称:审批详情页直接展示该接口的数据,缺失会显示为“-”
        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))));
            })).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")
@@ -189,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));
    }