Merge remote-tracking branch 'origin/master'

xuhy

2026-02-04 07a08efc3bd17142a81c2128be99abb34c498577

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.api;


import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest;
@@ -16,11 +17,19 @@
import com.ruoyi.system.dto.DetailProcurementSendDto;
import com.ruoyi.system.dto.UpdateStatusProcurementDto;
import com.ruoyi.system.dto.UpdateStatusProcurementLastDto;
import com.ruoyi.system.export.WarehouseProcurementReportDetailExport;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpProcurementQuery;
import com.ruoyi.system.query.ProcurementReportDetailQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.*;
import com.ruoyi.system.export.ProcurementReportDetailExport;
import com.ruoyi.common.utils.WebUtils;
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import io.swagger.annotations.ApiParam;
import org.apache.poi.ss.usermodel.Workbook;
import com.ruoyi.web.core.config.LakalaConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -38,6 +47,10 @@
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
import java.io.IOException;
import java.net.URLEncoder;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;

/**
 * <p>
@@ -528,6 +541,49 @@
    }


    /**
     * 采购单详情列表（仓库角色专用）
     */
    @ApiOperation(value = "【20260130】采购单详情列表--仓库角色专用")
    @PostMapping(value = "/procurementReportDetail/{id}")
    public R<List<ClinicProcurementReportDetailVO>> procurementReportDetail(@ApiParam(name = "id",value = "采购ID") @PathVariable String id) {
        List<ClinicProcurementReportDetailVO> list = erpProcurementService.clinicProcurementReportDetail(id);
        return R.ok(list);
    }

    /**
     * 采购单详情导出（仓库角色专用，支持多选）
     */
    @Log(title = "采购管理-采购单详情导出", businessType = BusinessType.EXPORT)
    @ApiOperation(value = "【20260130】采购单详情导出--仓库角色专用（支持多选）")
    @PostMapping("/exportProcurementReportDetail")
    public void exportProcurementReportDetail(@Valid @RequestBody ProcurementReportDetailQuery query) {
        List<ProcurementReportDetailExport> list = erpProcurementService.exportProcurementReportDetail(query.getProcurementIds());
        List<WarehouseProcurementReportDetailExport> warehouseProcurementReportDetailExports = BeanUtil.copyToList(list, WarehouseProcurementReportDetailExport.class);
        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), WarehouseProcurementReportDetailExport.class, warehouseProcurementReportDetailExports);
        HttpServletResponse response = WebUtils.response();
        assert response != null;
        response.setContentType("application/vnd.ms-excel");
        response.setCharacterEncoding("utf-8");
        ServletOutputStream outputStream = null;
        try {
            String fileName = URLEncoder.encode("采购单详情.xls", "utf-8");
            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
            response.setContentType("application/vnd.ms-excel;charset=UTF-8");
            response.setHeader("Pragma", "no-cache");
            response.setHeader("Cache-Control", "no-cache");
            outputStream = response.getOutputStream();
            workbook.write(outputStream);
        } catch (IOException e) {
            e.printStackTrace();
        } finally {
            try {
                outputStream.close();
            } catch (IOException e) {
                e.printStackTrace();
            }
        }
    }