添加地磅抓拍记录页面

sgj

2026-02-25 23ba8d87f56be44209687ee03c8bda3e351412d1

 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;
    }

@@ -262,7 +271,8 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            depotStoreQueryWrapper.likeRight("dept_id", param.getDeptId());
        }
        depotStoreQueryWrapper.between("create_time", param.getStart(), param.getEnd());
        depotStoreQueryWrapper.ge("create_time", param.getStart());
        depotStoreQueryWrapper.le("create_time", param.getEnd());
        depotStoreQueryWrapper.orderByAsc("create_time");
        return depotStoreMapper.selectList(depotStoreQueryWrapper);
    }
@@ -276,7 +286,10 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            inoutRecordQueryWrapper.likeRight("dept_id", param.getDeptId());
        }
        inoutRecordQueryWrapper.between("create_time", param.getStart(), param.getEnd());
        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");
        return inoutRecordMapper.selectList(inoutRecordQueryWrapper);
    }
@@ -290,7 +303,8 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            inoutStockChangeQueryWrapper.likeRight("dept_id", param.getDeptId());
        }
        inoutStockChangeQueryWrapper.between("create_time", param.getStart(), param.getEnd());
        inoutStockChangeQueryWrapper.ge("create_time", param.getStart());
        inoutStockChangeQueryWrapper.le("create_time", param.getEnd());
        inoutStockChangeQueryWrapper.orderByAsc("create_time");
        return inoutStockChangeMapper.selectList(inoutStockChangeQueryWrapper);
    }
@@ -304,7 +318,8 @@
        if (StringUtils.isNotBlank(param.getDeptId())) {
            inoutLossOverQueryWrapper.likeRight("dept_id", param.getDeptId());
        }
        inoutLossOverQueryWrapper.between("create_time", param.getStart(), param.getEnd());
        inoutLossOverQueryWrapper.ge("create_time", param.getStart());
        inoutLossOverQueryWrapper.le("create_time", param.getEnd());
        inoutLossOverQueryWrapper.orderByAsc("create_time");
        return inoutLossOverMapper.selectList(inoutLossOverQueryWrapper);
    }