sgj
2026-03-09 c3fc4153f75b6467126081191f4d5fa1152ea386
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
@@ -76,7 +76,6 @@
        if (StringUtils.isEmpty(param.getDeptId())) {
            param.setDeptId(param.getCustomerId());
        }
        //test提交
        //收储公司,所属库区查询均为空,则查询默认库区
        if (StringUtils.isEmpty(param.getCustomerId()) && StringUtils.isEmpty(param.getDeptId())) {
            param.setDeptId(deptId);
@@ -250,6 +249,16 @@
            result.add(data);
        }
        if(result.isEmpty()){
            //没有数据时将columsMap中的数据添加到result中作为默认数据
            columsMap.values().forEach(data -> {
                String deptId_Item = data.getDeptId();
                if(StringUtils.isNotBlank(param.getDeptId()) && deptId_Item.startsWith(param.getDeptId())){
                    result.add(data);
                }
            });
        }
        return result;
    }
@@ -277,6 +286,8 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            inoutRecordQueryWrapper.likeRight("dept_id", param.getDeptId());
        }
        inoutRecordQueryWrapper.likeRight("progress", Constant.PROGRESS_RECORD); //已完成的单据
        inoutRecordQueryWrapper.ne("record_status", Constant.RECORD_STATUS_DEL); //不是删除的单子,即正常的单子
        inoutRecordQueryWrapper.ge("create_time", param.getStart());
        inoutRecordQueryWrapper.le("create_time", param.getEnd());
        inoutRecordQueryWrapper.orderByAsc("create_time");