feat(mes): 来料检验与不合格退货闭环优化

gaoluyang

5 天以前 6fa82a1ad7c3ae061ef499f0d0806a16846e122b

 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 ->
                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")
@@ -142,12 +158,11 @@
    public void importTemplate(HttpServletResponse response) throws IOException {
        List<ErpPurchaseRequestImportExcelVO> list = Arrays.asList(
                ErpPurchaseRequestImportExcelVO.builder()
                        .no("CGSQ20260101000001").supplierName("示例供应商")
                        .no("CGSQ20260101000001")
                        .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());
                        .count(new BigDecimal("100")).demandTime("2026-01-10")
                        .remark("示例").build());
        ExcelUtils.write(response, "采购申请导入模板.xls", "采购申请", ErpPurchaseRequestImportExcelVO.class, list);
    }

@@ -189,7 +204,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));
    }