产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
maven
2025-12-03 211aafe0cb765b1deb5f2ef54949d64e9b0de8c3 
 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java


@@ -8,8 +8,12 @@


import com.ruoyi.framework.security.LoginUser;


import com.ruoyi.home.dto.*;


import com.ruoyi.home.service.HomeService;


import com.ruoyi.lavorissue.mapper.LavorIssueMapper;


import com.ruoyi.lavorissue.pojo.LaborIssue;


import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;


import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;


import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;


import com.ruoyi.procurementrecord.pojo.CustomStorage;


import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;


import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;


import com.ruoyi.project.system.domain.SysDept;


@@ -29,9 +33,12 @@


import lombok.extern.slf4j.Slf4j;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


import org.springframework.util.CollectionUtils;




import java.math.BigDecimal;


import java.math.RoundingMode;


import java.text.ParseException;


import java.text.SimpleDateFormat;


import java.time.*;


import java.time.temporal.TemporalAdjusters;


import java.util.*;


@@ -62,6 +69,9 @@


    private ProcurementRecordMapper procurementRecordStorageMapper;




    @Autowired


    private CustomStorageMapper customStorageMapper;




    @Autowired


    private QualityInspectMapper qualityStatisticsMapper;




    @Autowired


@@ -74,10 +84,15 @@


    private PaymentRegistrationMapper paymentRegistrationMapper;




    @Autowired


    private LavorIssueMapper lavorIssueMapper;




    @Autowired


    private SysDeptMapper sysDeptMapper;




    @Override


    public HomeBusinessDto business() {


        // 构建结果


        HomeBusinessDto homeBusinessDto = new HomeBusinessDto();


        LocalDate now = LocalDate.now();


        YearMonth currentMonth = YearMonth.from(now);


        // 创建LambdaQueryWrapper


@@ -85,46 +100,56 @@


        salesLedgerLambdaQueryWrapper.ge(SalesLedger::getEntryDate, currentMonth.atDay(1).atStartOfDay())  // 大于等于本月第一天


                .lt(SalesLedger::getEntryDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()); // 小于下月第一天


        List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(salesLedgerLambdaQueryWrapper);


        // 合计合同金额


        BigDecimal contractAmount = salesLedgers.stream().map(SalesLedger::getContractAmount)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


        LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapper = new LambdaQueryWrapper<SalesLedgerProduct>();


        salesLedgerProductMapperLambdaQueryWrapper.eq(SalesLedgerProduct::getType, 1)


                .in(SalesLedgerProduct::getSalesLedgerId, salesLedgers.stream().map(SalesLedger::getId).collect(Collectors.toList()));


        List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductMapperLambdaQueryWrapper);


        // 未开票金额


        BigDecimal noInvoiceAmountTotal = salesLedgerProducts.stream().map(SalesLedgerProduct::getNoInvoiceAmount)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);




        if(!CollectionUtils.isEmpty(salesLedgers)){


            // 合计合同金额


            BigDecimal contractAmount = salesLedgers.stream().map(SalesLedger::getContractAmount)


                    .filter(Objects::nonNull)


                    .reduce(BigDecimal.ZERO, BigDecimal::add);


            LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapper = new LambdaQueryWrapper<SalesLedgerProduct>();


            salesLedgerProductMapperLambdaQueryWrapper.eq(SalesLedgerProduct::getType, 1)


                    .in(SalesLedgerProduct::getSalesLedgerId, salesLedgers.stream().map(SalesLedger::getId).collect(Collectors.toList()));


            List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(salesLedgerProductMapperLambdaQueryWrapper);


            // 未开票金额


            BigDecimal noInvoiceAmountTotal = salesLedgerProducts.stream().map(SalesLedgerProduct::getNoInvoiceAmount)


                    .filter(Objects::nonNull)


                    .reduce(BigDecimal.ZERO, BigDecimal::add);


            homeBusinessDto.setMonthSaleMoney(contractAmount.setScale(2, RoundingMode.HALF_UP).toString());


            homeBusinessDto.setMonthSaleHaveMoney(noInvoiceAmountTotal.setScale(2, RoundingMode.HALF_UP).toString());


        }


        // 创建LambdaQueryWrapper


        LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();


        queryWrapper.ge(PurchaseLedger::getEntryDate, currentMonth.atDay(1).atStartOfDay())  // 大于等于本月第一天


                .lt(PurchaseLedger::getEntryDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()); // 小于下月第一天




        // 执行查询并计算总和


        List<PurchaseLedger> purchaseLedgers = purchaseLedgerMapper.selectList(queryWrapper);




        LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapperCopy = new LambdaQueryWrapper<SalesLedgerProduct>();


        salesLedgerProductMapperLambdaQueryWrapper.eq(SalesLedgerProduct::getType, 2)


                .in(SalesLedgerProduct::getSalesLedgerId, purchaseLedgers.stream().map(PurchaseLedger::getId).collect(Collectors.toList()));


        List<SalesLedgerProduct> salesLedgerProductsCopy = salesLedgerProductMapper.selectList(salesLedgerProductMapperLambdaQueryWrapperCopy);


        // 合计合同金额


        BigDecimal receiveAmount = purchaseLedgers.stream()


                .map(PurchaseLedger::getContractAmount)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


        // 未开票金额


        BigDecimal unReceiptPaymentAmount = salesLedgerProductsCopy.stream()


                .map(SalesLedgerProduct::getNoInvoiceAmount)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);




        if(!CollectionUtils.isEmpty(purchaseLedgers)){


            LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapperCopy = new LambdaQueryWrapper<SalesLedgerProduct>();


            salesLedgerProductMapperLambdaQueryWrapperCopy.eq(SalesLedgerProduct::getType, 2)


                    .in(SalesLedgerProduct::getSalesLedgerId, purchaseLedgers.stream().map(PurchaseLedger::getId).collect(Collectors.toList()));


            List<SalesLedgerProduct> salesLedgerProductsCopy = salesLedgerProductMapper.selectList(salesLedgerProductMapperLambdaQueryWrapperCopy);


            // 合计合同金额


            BigDecimal receiveAmount = purchaseLedgers.stream()


                    .map(PurchaseLedger::getContractAmount)


                    .filter(Objects::nonNull)


                    .reduce(BigDecimal.ZERO, BigDecimal::add);


            // 未开票金额


            BigDecimal unReceiptPaymentAmount = salesLedgerProductsCopy.stream()


                    .map(SalesLedgerProduct::getNoInvoiceAmount)


                    .filter(Objects::nonNull)


                    .reduce(BigDecimal.ZERO, BigDecimal::add);


            homeBusinessDto.setMonthPurchaseMoney(receiveAmount.setScale(2, RoundingMode.HALF_UP).toString());


            homeBusinessDto.setMonthPurchaseHaveMoney(unReceiptPaymentAmount.setScale(2, RoundingMode.HALF_UP).toString());


        }


        // 统计库存


        List<ProcurementRecordStorage> procurementRecordStorages = procurementRecordStorageMapper.selectList(null);


        BigDecimal stockAmount = procurementRecordStorages.stream()


                .map(ProcurementRecordStorage::getInboundNum)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


        // 自定义库存


        List<CustomStorage> customStorages = customStorageMapper.selectList(null);


        BigDecimal customStockAmount = customStorages.stream()


                .map(CustomStorage::getInboundNum)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


        List<ProcurementRecordOut> procurementRecordOuts = procurementRecordOutMapper.selectList(null);


@@ -132,7 +157,7 @@


                .map(ProcurementRecordOut::getInboundNum)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


        BigDecimal stock = stockAmount.subtract(outboundAmount);


        BigDecimal stock = stockAmount.add(customStockAmount).subtract(outboundAmount);


        // 获取当天入库数量


        LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();


        procurementRecordStorageLambdaQueryWrapper.ge(ProcurementRecordStorage::getCreateTime, now)  // 大于等于当天


@@ -142,15 +167,8 @@


                .map(ProcurementRecordStorage::getInboundNum)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


        // 构建结果


        HomeBusinessDto homeBusinessDto = new HomeBusinessDto();


        homeBusinessDto.setMonthSaleMoney(contractAmount);


        homeBusinessDto.setMonthSaleHaveMoney(noInvoiceAmountTotal);


        homeBusinessDto.setMonthPurchaseMoney(receiveAmount);


        homeBusinessDto.setMonthPurchaseHaveMoney(unReceiptPaymentAmount);


        homeBusinessDto.setInventoryNum(stock);


        homeBusinessDto.setTodayInventoryNum(stockAmount1);




        homeBusinessDto.setInventoryNum(stock.setScale(2, RoundingMode.HALF_UP).toString());


        homeBusinessDto.setTodayInventoryNum(stockAmount1.setScale(2, RoundingMode.HALF_UP).toString());


        return homeBusinessDto;


    }




@@ -172,7 +190,7 @@


        LocalDate endOfWeek = today.with(DayOfWeek.SUNDAY);


        List<SalesLedger> salesLedgers1 = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()


                .ge(SalesLedger::getEntryDate, startOfWeek)  // 大于等于本周周一


                .gt(SalesLedger::getEntryDate, endOfWeek));


                .lt(SalesLedger::getEntryDate, endOfWeek.plusDays(1))); // 修改：使用 lt 并加上一天来包含周日


        BigDecimal weekContractAmount = salesLedgers1.stream().map(SalesLedger::getContractAmount)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


@@ -181,7 +199,7 @@


        LocalDate lastYearEndOfWeek = today.minusYears(1).with(DayOfWeek.SUNDAY);


        List<SalesLedger> salesLedgers2 = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()


                .ge(SalesLedger::getEntryDate, lastYearStartOfWeek)  // 大于等于去年本周周一


                .gt(SalesLedger::getEntryDate, lastYearEndOfWeek));


                .lt(SalesLedger::getEntryDate, lastYearEndOfWeek.plusDays(1))); // 修改：使用 lt 并加上一天来包含周日


        BigDecimal lastYearWeekContractAmount = salesLedgers2.stream().map(SalesLedger::getContractAmount)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


@@ -199,18 +217,18 @@


        LocalDate yesterday = today.minusDays(1);


        LocalDate plusDays = today.plusDays(1);


        List<SalesLedger> salesLedgers3 = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()


                .ge(SalesLedger::getEntryDate, today)  // 大于等于昨天


                .lt(SalesLedger::getEntryDate, plusDays));


        BigDecimal yesterdayContractAmount = salesLedgers3.stream().map(SalesLedger::getContractAmount)


                .ge(SalesLedger::getEntryDate, today)  // 大于等于今天


                .lt(SalesLedger::getEntryDate, plusDays)); // 修改：使用 lt 并加上一天来包含当天


        BigDecimal todayContractAmount = salesLedgers3.stream().map(SalesLedger::getContractAmount)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


        List<SalesLedger> salesLedgers4 = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()


                .ge(SalesLedger::getEntryDate, yesterday)  // 大于等于去年昨天


                .lt(SalesLedger::getEntryDate, today));


                .ge(SalesLedger::getEntryDate, yesterday)  // 大于等于昨天


                .lt(SalesLedger::getEntryDate, today)); // 修改：使用 lt 而不是 gt


        BigDecimal lastYearYesterdayContractAmount = salesLedgers4.stream().map(SalesLedger::getContractAmount)


                .filter(Objects::nonNull)


                .reduce(BigDecimal.ZERO, BigDecimal::add);


        BigDecimal subtract1 = yesterdayContractAmount.subtract(lastYearYesterdayContractAmount);


        BigDecimal subtract1 = todayContractAmount.subtract(lastYearYesterdayContractAmount); // 修改：使用 todayContractAmount 而不是 yesterdayContractAmount


        // 日环比


        String chain = "";


        if(subtract1.compareTo(BigDecimal.ZERO) == 0 || lastYearYesterdayContractAmount.compareTo(BigDecimal.ZERO) == 0){


@@ -221,7 +239,8 @@






        AnalysisCustomerContractAmountsDto analysisCustomerContractAmountsDto = new AnalysisCustomerContractAmountsDto();


        analysisCustomerContractAmountsDto.setSum(contractAmount);


        // 修改：将合同金额保留两位小数


        analysisCustomerContractAmountsDto.setSum(contractAmount.setScale(2, RoundingMode.HALF_UP).toString());


        analysisCustomerContractAmountsDto.setYny(weekYny);


        analysisCustomerContractAmountsDto.setChain(chain);




@@ -231,7 +250,8 @@


        collect.forEach((k,v)->{


            MapDto mapDto = new MapDto();


            mapDto.setName(k);


            mapDto.setValue(v);


            // 修改：将金额值保留两位小数


            mapDto.setValue(v.setScale(2, RoundingMode.HALF_UP).toString());


            if(contractAmount.compareTo(new BigDecimal(0)) == 0){


                mapDto.setRate("0");


            }else{


@@ -242,6 +262,7 @@


        analysisCustomerContractAmountsDto.setItem(mapDtos);


        return analysisCustomerContractAmountsDto;


    }






    @Override


    public QualityStatisticsDto qualityStatistics() {


@@ -293,14 +314,35 @@


    }




    @Override


    public List<ApproveProcess> todos() {


    public List<ApproveProcess> todos() throws ParseException {


        LoginUser loginUser = SecurityUtils.getLoginUser();


        LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();


        approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveDelete, 0)


                .eq(ApproveProcess::getApproveUserCurrentId, loginUser.getUserId())


                .ne(ApproveProcess::getApproveStatus, 2)


                .eq(ApproveProcess::getTenantId, loginUser.getTenantId());


        return approveProcessMapper.selectList(approveProcessLambdaQueryWrapper);


        List<ApproveProcess> approveProcesses = approveProcessMapper.selectList(approveProcessLambdaQueryWrapper);


        if(CollectionUtils.isEmpty(approveProcesses)){


            approveProcesses = new ArrayList<>();


        }


        // 查询未领用劳保记录


        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");




        LaborIssue laborIssue1 = new LaborIssue();


        laborIssue1.setAdoptedDate(new Date());


        laborIssue1.setIssueDate(sdf.parse(sdf.format(new Date())));


        List<LaborIssue> laborIssues = lavorIssueMapper.list(laborIssue1);


        if(!CollectionUtils.isEmpty(laborIssues)){


            for (LaborIssue laborIssue : laborIssues) {


                ApproveProcess approveProcess = new ApproveProcess();


                approveProcess.setApproveId(laborIssue.getOrderNo());


                approveProcess.setApproveDeptName(sysDeptMapper.selectDeptById(loginUser.getTenantId()).getDeptName());


                approveProcess.setApproveTime(laborIssue.getIssueDate());


                approveProcess.setApproveReason(laborIssue.getDictTypeName() + "-" + laborIssue.getDictName() + "超时未领取");


                approveProcesses.add(approveProcess);


            }


        }


        return approveProcesses;


    }




    /**


@@ -337,29 +379,31 @@


        }


        // 应收


        List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new LambdaQueryWrapper<SalesLedger>()


                .ge(SalesLedger::getEntryDate, startDate)


                .lt(SalesLedger::getEntryDate, endDate)


//                .ge(SalesLedger::getEntryDate, startDate)


//                .lt(SalesLedger::getEntryDate, endDate)


        );


        BigDecimal receivableMoney = salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add);


        // 应付


        List<PurchaseLedger> procurementRecords = purchaseLedgerMapper.selectList(new LambdaQueryWrapper<PurchaseLedger>()


                .ge(PurchaseLedger::getEntryDate, startDate)


                .lt(PurchaseLedger::getEntryDate, endDate)


//                .ge(PurchaseLedger::getEntryDate, startDate)


//                .lt(PurchaseLedger::getEntryDate, endDate)


        );


        BigDecimal payableMoney = procurementRecords.stream().map(PurchaseLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add);


        // 预收


        List<ReceiptPayment> receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()


                .ge(ReceiptPayment::getReceiptPaymentDate, startDate)


                .lt(ReceiptPayment::getReceiptPaymentDate, endDate));


//                .ge(ReceiptPayment::getReceiptPaymentDate, startDate)


//                .lt(ReceiptPayment::getReceiptPaymentDate, endDate)


        );


        BigDecimal advanceMoney = receiptPayments.stream().map(ReceiptPayment::getReceiptPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);


        // 预付


        List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper.selectList(new LambdaQueryWrapper<PaymentRegistration>()


                .ge(PaymentRegistration::getPaymentDate, startDate)


                .lt(PaymentRegistration::getPaymentDate, endDate));


//                .ge(PaymentRegistration::getPaymentDate, startDate)


//                .lt(PaymentRegistration::getPaymentDate, endDate)


        );


        BigDecimal prepayMoney = paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO, BigDecimal::add);


        StatisticsReceivablePayableDto statisticsReceivablePayableDto = new StatisticsReceivablePayableDto();


        statisticsReceivablePayableDto.setPayableMoney(payableMoney);


        statisticsReceivablePayableDto.setReceivableMoney(receivableMoney);


        statisticsReceivablePayableDto.setPayableMoney(payableMoney.subtract(prepayMoney));


        statisticsReceivablePayableDto.setReceivableMoney(receivableMoney.subtract(advanceMoney));


        statisticsReceivablePayableDto.setAdvanceMoney(advanceMoney);


        statisticsReceivablePayableDto.setPrepayMoney(prepayMoney);