客户问题优化调整9

czt

2026-02-11 f68f5bf6ae56c18561eb8ccba9fb9693f128551c

 fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java

@@ -42,11 +42,7 @@
    @Resource
    private SysDeptService sysDeptService;
    @Resource
    private ReportInDetailPR reportInDetailPR;
    @Resource
    private ReportOutDetailPR reportOutDetailPR;
    @Resource
    private SuperInventoryReportPR superInventoryReportPR;
    private ReportInoutPR reportInoutPR;
    @Resource
    private CompanyPR companyPR;
    @Resource
@@ -70,6 +66,17 @@
        param.setBizId(bizId);
        param.setEntityName(entityName);
        exportManager.renderWordDownload(param, response);
    }

    /**
     * 导出word并下载
     *
     * @param response
     */
    @RequestMapping("/download-inout-excel")
    public void downloadInoutExcel(HttpServletResponse response) {

        exportManager.downloadInoutExcel(response);
    }

    /**
@@ -127,10 +134,11 @@
        //组装实际导出数据
        if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
            sheetName = "入库报表数据";
            list = reportInDetailPR.listRecord(param);
            list = reportInoutPR.listRecord(param);
            List<InoutRecordInExport> exportList = new ArrayList<>();
            InoutRecordInExport export;
            for (InoutRecord record : list) {
                InoutRecordInExport export = new InoutRecordInExport();
                export = new InoutRecordInExport();
                export.setId(record.getId());
                export.setPlateNum(record.getPlateNum());
                // 将仓库ID映射为仓库名称
@@ -146,6 +154,7 @@
                export.setRecordWeight(record.getRecordWeight());
                export.setCompleteTime(record.getCompleteTime());
                export.setDeOther(record.getDeOther());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
            ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
@@ -154,10 +163,11 @@

        if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
            sheetName = "出库报表数据";
            list = reportOutDetailPR.listRecord(param);
            list = reportInoutPR.listRecord(param);
            List<InoutRecordOutExport> exportList = new ArrayList<>();
            InoutRecordOutExport export;
            for (InoutRecord record : list) {
                InoutRecordOutExport export = new InoutRecordOutExport();
                export = new InoutRecordOutExport();
                export.setId(record.getId());
                export.setPlateNum(record.getPlateNum());
                // 将仓库ID映射为仓库名称
@@ -173,6 +183,7 @@
                export.setRecordWeight(record.getRecordWeight());
                export.setCompleteTime(record.getCompleteTime());
                export.setDeOther(record.getDeOther());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
            ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
@@ -181,10 +192,11 @@

        if (StringUtils.isNotEmpty(param.getType()) && "IN_DETAIL".equals(param.getType())) {
            sheetName = "入库明细报表数据";
            list = reportInDetailPR.listRecord(param);
            list = reportInoutPR.listRecord(param);
            List<InoutRecordDetailInExport> exportList = new ArrayList<>();
            InoutRecordDetailInExport export;
            for (InoutRecord record : list) {
                InoutRecordDetailInExport export = new InoutRecordDetailInExport();
                export = new InoutRecordDetailInExport();
                //收储公司映射
                String companyNameValue = companyMap.get(record.getCompanyId());
                export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -202,6 +214,7 @@
                export.setSettleWeight(record.getSettleWeight());
                export.setRecordWeight(record.getRecordWeight());
                export.setCompleteTime(record.getCompleteTime());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
            ExcelUtil<InoutRecordDetailInExport> util = new ExcelUtil<InoutRecordDetailInExport>(InoutRecordDetailInExport.class);
@@ -210,10 +223,11 @@

        if (StringUtils.isNotEmpty(param.getType()) && "OUT_DETAIL".equals(param.getType())) {
            sheetName = "出库明细报表数据";
            list = reportOutDetailPR.listRecord(param);
            list = reportInoutPR.listRecord(param);
            List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
            InoutRecordDetailOutExport export;
            for (InoutRecord record : list) {
                InoutRecordDetailOutExport export = new InoutRecordDetailOutExport();
                export = new InoutRecordDetailOutExport();
                //收储公司映射
                String companyNameValue = companyMap.get(record.getCompanyId());
                export.setCompanyId(companyNameValue != null ? companyNameValue : "");
@@ -231,6 +245,7 @@
                export.setSettleWeight(record.getSettleWeight());
                export.setRecordWeight(record.getRecordWeight());
                export.setCompleteTime(record.getCompleteTime());
                export.setUpdateLog(record.getUpdateLog());
                exportList.add(export);
            }
            ExcelUtil<InoutRecordDetailOutExport> util = new ExcelUtil<InoutRecordDetailOutExport>(InoutRecordDetailOutExport.class);
@@ -249,7 +264,7 @@
        //设置标题
        String sheetName = "库存报表数据";
        //查询数据
        List<SuperInventoryReportData> list = superInventoryReportPR.getReportData(param);
        List<SuperInventoryReportData> list = reportInoutPR.getStoreData(param);
        //获取分库编码对应的分库名称
        String deptName = "";
        SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));