产品供销存-后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
gongchunyi
5 天以前 a0a719b71047b8b8a4bd715fcabb72b35aa4d4b5 
 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java


@@ -3,9 +3,12 @@


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;


import com.ruoyi.account.mapper.AccountExpenseMapper;


import com.ruoyi.account.mapper.AccountIncomeMapper;


import com.ruoyi.account.pojo.AccountExpense;


import com.ruoyi.account.mapper.AccountStatementMapper;


import com.ruoyi.account.mapper.purchase.AccountPurchasePaymentMapper;


import com.ruoyi.account.mapper.sales.AccountSalesCollectionMapper;


import com.ruoyi.account.pojo.AccountStatement;


import com.ruoyi.account.pojo.purchase.AccountPurchasePayment;


import com.ruoyi.account.pojo.sales.AccountSalesCollection;


import com.ruoyi.approve.mapper.ApproveProcessMapper;


import com.ruoyi.approve.pojo.ApproveProcess;


import com.ruoyi.basic.mapper.CustomerMapper;


@@ -30,18 +33,14 @@


import com.ruoyi.production.mapper.*;


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


import com.ruoyi.project.system.mapper.SysDeptMapper;


import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;


import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;


import com.ruoyi.purchase.pojo.PaymentRegistration;


import com.ruoyi.purchase.pojo.PurchaseLedger;


import com.ruoyi.quality.mapper.QualityInspectMapper;


import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;


import com.ruoyi.quality.pojo.QualityInspect;


import com.ruoyi.quality.pojo.QualityUnqualified;


import com.ruoyi.sales.mapper.ReceiptPaymentMapper;


import com.ruoyi.sales.mapper.SalesLedgerMapper;


import com.ruoyi.sales.mapper.SalesLedgerProductMapper;


import com.ruoyi.sales.pojo.ReceiptPayment;


import com.ruoyi.sales.pojo.SalesLedger;


import com.ruoyi.sales.pojo.SalesLedgerProduct;


import com.ruoyi.staff.mapper.StaffOnJobMapper;


@@ -83,10 +82,6 @@




    private final ApproveProcessMapper approveProcessMapper;




    private final ReceiptPaymentMapper receiptPaymentMapper;




    private final PaymentRegistrationMapper paymentRegistrationMapper;




    private final SysDeptMapper sysDeptMapper;




    private final NoticeMapper noticeMapper;


@@ -111,9 +106,9 @@




    private final ProductionOperationTaskMapper productionOperationTaskMapper;




    private final AccountExpenseMapper accountExpenseMapper;




    private final AccountIncomeMapper accountIncomeMapper;


    private final AccountPurchasePaymentMapper accountPurchasePaymentMapper;


    private final AccountSalesCollectionMapper accountSalesCollectionMapper;


    private final AccountStatementMapper accountStatementMapper;




    private final ProductionAccountMapper productionAccountMapper;




@@ -141,12 +136,8 @@


                            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());


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


        }


        // 创建LambdaQueryWrapper


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


@@ -169,14 +160,8 @@


                    .filter(Objects::nonNull)


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




            //  待付款总金额


            BigDecimal unReceiptPaymentAmount = salesLedgerProductsCopy.stream()


                    .map(SalesLedgerProduct::getPendingTicketsTotal)


                    .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());


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


        }


        // 统计库存


        BigDecimal stockQuantityTotal = stockInventoryMapper.selectTotal();


@@ -312,19 +297,35 @@


            queryWrapper.ge(QualityInspect::getCheckTime, monthStart.toString())


                    .le(QualityInspect::getCheckTime, monthEnd.toString());


            List<QualityInspect> monthInspects = qualityStatisticsMapper.selectList(queryWrapper);




            // 统计总数量（合格数量 + 不合格数量）


            BigDecimal reduce = monthInspects.stream()


                    .filter(inspect -> inspect.getInspectType().equals(0))


                    .map(QualityInspect::getQuantity)


                    .map(inspect -> {


                        BigDecimal qualified = inspect.getQualifiedQuantity() != null ? inspect.getQualifiedQuantity() : BigDecimal.ZERO;


                        BigDecimal unqualified = inspect.getUnqualifiedQuantity() != null ? inspect.getUnqualifiedQuantity() : BigDecimal.ZERO;


                        return qualified.add(unqualified);


                    })


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


            supplierNum = supplierNum.add(reduce);




            BigDecimal reduce1 = monthInspects.stream()


                    .filter(inspect -> inspect.getInspectType().equals(1))


                    .map(QualityInspect::getQuantity)


                    .map(inspect -> {


                        BigDecimal qualified = inspect.getQualifiedQuantity() != null ? inspect.getQualifiedQuantity() : BigDecimal.ZERO;


                        BigDecimal unqualified = inspect.getUnqualifiedQuantity() != null ? inspect.getUnqualifiedQuantity() : BigDecimal.ZERO;


                        return qualified.add(unqualified);


                    })


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


            processNum = processNum.add(reduce1);




            BigDecimal reduce2 = monthInspects.stream()


                    .filter(inspect -> inspect.getInspectType().equals(2))


                    .map(QualityInspect::getQuantity)


                    .map(inspect -> {


                        BigDecimal qualified = inspect.getQualifiedQuantity() != null ? inspect.getQualifiedQuantity() : BigDecimal.ZERO;


                        BigDecimal unqualified = inspect.getUnqualifiedQuantity() != null ? inspect.getUnqualifiedQuantity() : BigDecimal.ZERO;


                        return qualified.add(unqualified);


                    })


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


            factoryNum = factoryNum.add(reduce2);




@@ -334,25 +335,22 @@




            // 1. 供应商检验（类型0）- 合格数量


            BigDecimal supplierQualified = monthInspects.stream()


                    .filter(inspect -> inspect.getInspectType().equals(0)


                            && "合格".equals(inspect.getCheckResult()))


                    .map(QualityInspect::getQuantity)


                    .filter(inspect -> inspect.getInspectType().equals(0))


                    .map(inspect -> inspect.getQualifiedQuantity() != null ? inspect.getQualifiedQuantity() : BigDecimal.ZERO)


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


            item.setSupplierNum(supplierQualified);




            // 2. 工序检验（类型1）- 合格数量


            BigDecimal processQualified = monthInspects.stream()


                    .filter(inspect -> inspect.getInspectType().equals(1)


                            && "合格".equals(inspect.getCheckResult()))


                    .map(QualityInspect::getQuantity)


                    .filter(inspect -> inspect.getInspectType().equals(1))


                    .map(inspect -> inspect.getQualifiedQuantity() != null ? inspect.getQualifiedQuantity() : BigDecimal.ZERO)


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


            item.setProcessNum(processQualified);




            // 3. 工厂检验（类型2）- 合格数量


            BigDecimal factoryQualified = monthInspects.stream()


                    .filter(inspect -> inspect.getInspectType().equals(2)


                            && "合格".equals(inspect.getCheckResult()))


                    .map(QualityInspect::getQuantity)


                    .filter(inspect -> inspect.getInspectType().equals(2))


                    .map(inspect -> inspect.getQualifiedQuantity() != null ? inspect.getQualifiedQuantity() : BigDecimal.ZERO)


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


            item.setFactoryNum(factoryQualified);




@@ -414,76 +412,21 @@


     */


    @Override


    public StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type) {


        LocalDate today = LocalDate.now();


        LocalDate startDate = null;


        LocalDate endDate = null;


        switch (type) {


            case 1:


                // 获取本周周一


                startDate = today.with(DayOfWeek.MONDAY);


                // 获取本周周日


                endDate = today.with(DayOfWeek.SUNDAY);


                break;


            case 2:


                startDate = today.with(TemporalAdjusters.firstDayOfMonth());


                endDate = today.with(TemporalAdjusters.lastDayOfMonth());


                break;


            case 3:


                Month currentMonth = today.getMonth();


                Month firstMonthOfQuarter = currentMonth.firstMonthOfQuarter();


                Month lastMonthOfQuarter = Month.of(firstMonthOfQuarter.getValue() + 2);


        StatisticsReceivablePayableDto dto = new StatisticsReceivablePayableDto();


        LocalDate[] range = resolveFinanceRange(type);


        LocalDate startDate = range[0];


        LocalDate endDate = range[1];




                startDate = today.withMonth(firstMonthOfQuarter.getValue())


                        .with(TemporalAdjusters.firstDayOfMonth());


                endDate = today.withMonth(lastMonthOfQuarter.getValue())


                        .with(TemporalAdjusters.lastDayOfMonth());


                break;


        }


        // 应收


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


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


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


        );


        // BigDecimal receivableMoney =


        // salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO,


        // BigDecimal::add);


        BigDecimal receivableMoney = sumAmount(salesLedgers, SalesLedger::getContractAmount);


        // 应付


        List<PurchaseLedger> procurementRecords = purchaseLedgerMapper


                .selectList(new LambdaQueryWrapper<PurchaseLedger>()


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


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


                );


        // BigDecimal payableMoney =


        // procurementRecords.stream().map(PurchaseLedger::getContractAmount).reduce(BigDecimal.ZERO,


        // BigDecimal::add);


        BigDecimal payableMoney = sumAmount(procurementRecords, PurchaseLedger::getContractAmount);


        // 预收


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


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


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


        );


        // BigDecimal advanceMoney =


        // receiptPayments.stream().map(ReceiptPayment::getReceiptPaymentAmount).reduce(BigDecimal.ZERO,


        // BigDecimal::add);


        BigDecimal advanceMoney = sumAmount(receiptPayments, ReceiptPayment::getReceiptPaymentAmount);


        // 预付


        List<PaymentRegistration> paymentRegistrations = paymentRegistrationMapper


                .selectList(new LambdaQueryWrapper<PaymentRegistration>()


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


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


                );


        // BigDecimal prepayMoney =


        // paymentRegistrations.stream().map(PaymentRegistration::getCurrentPaymentAmount).reduce(BigDecimal.ZERO,


        // BigDecimal::add);


        BigDecimal prepayMoney = sumAmount(paymentRegistrations, PaymentRegistration::getCurrentPaymentAmount);


        StatisticsReceivablePayableDto statisticsReceivablePayableDto = new StatisticsReceivablePayableDto();


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


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


        statisticsReceivablePayableDto.setAdvanceMoney(advanceMoney);


        statisticsReceivablePayableDto.setPrepayMoney(prepayMoney);


        BigDecimal receivableBase = sumSalesContractAmount(startDate, endDate);


        BigDecimal payableBase = sumPurchaseContractAmount(startDate, endDate);


        BigDecimal advanceMoney = sumCollectionAmount(startDate, endDate);


        BigDecimal prepayMoney = sumPaymentAmount(startDate, endDate);




        return statisticsReceivablePayableDto;


        dto.setReceivableMoney(scaleMoney(maxZero(receivableBase.subtract(advanceMoney))));


        dto.setPayableMoney(scaleMoney(maxZero(payableBase.subtract(prepayMoney))));


        dto.setAdvanceMoney(scaleMoney(advanceMoney));


        dto.setPrepayMoney(scaleMoney(prepayMoney));


        return dto;


    }




    public static <T> BigDecimal sumAmount(List<T> list, java.util.function.Function<T, BigDecimal> amountExtractor) {


@@ -1164,13 +1107,9 @@


        String endStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));




        // 2. 查询数据


        List<IncomeExpenseAnalysisDto> incomeList = accountIncomeMapper.selectIncomeStats(startStr, endStr, dateFormat);


        List<IncomeExpenseAnalysisDto> incomeList = accountSalesCollectionMapper.selectIncomeStats(startStr, endStr, dateFormat);


        List<IncomeExpenseAnalysisDto> expenseList = accountPurchasePaymentMapper.selectPayment(startStr, endStr, dateFormat);




        // List<IncomeExpenseAnalysisDto> purchaseList =


        // purchaseLedgerMapper.selectPurchaseStats(startStr, endStr, dateFormat);




        List<IncomeExpenseAnalysisDto> expenseList = accountExpenseMapper.selectAccountExpenseStats(startStr, endStr,


                dateFormat);




        // 3. 转 Map（自动合并）


        Map<String, BigDecimal> incomeMap = incomeList.stream()


@@ -1179,11 +1118,7 @@


                        IncomeExpenseAnalysisDto::getAmount,


                        BigDecimal::add));




        // Map<String, BigDecimal> purchaseMap = purchaseList.stream()


        // .collect(Collectors.toMap(


        // IncomeExpenseAnalysisDto::getDateStr,


        // IncomeExpenseAnalysisDto::getAmount,


        // BigDecimal::add));






        Map<String, BigDecimal> expenseMap = expenseList.stream()


                .collect(Collectors.toMap(


@@ -1197,18 +1132,12 @@


        for (String dateStr : xAxis) {


            Map<String, Object> item = new HashMap<>();


            item.put("date", dateStr);




            // 收入


            BigDecimal income = incomeMap.getOrDefault(dateStr, BigDecimal.ZERO);


            item.put("income", income.setScale(2, RoundingMode.HALF_UP));




            // 支出 = 采购 + 财务支出


            // BigDecimal purchase = purchaseMap.getOrDefault(dateStr, BigDecimal.ZERO);


            // 支出


            BigDecimal expense = expenseMap.getOrDefault(dateStr, BigDecimal.ZERO);


            // BigDecimal totalExpense = purchase.add(expense);


            BigDecimal totalExpense = expense;




            item.put("expense", totalExpense.setScale(2, RoundingMode.HALF_UP));


            item.put("expense", expense.setScale(2, RoundingMode.HALF_UP));




            result.add(item);


        }


@@ -1235,8 +1164,8 @@


        String startStr = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));


        String endStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));




        List<IncomeExpenseAnalysisDto> incomeList = accountIncomeMapper.selectIncomeStats(startStr, endStr, dateFormat);


        List<IncomeExpenseAnalysisDto> expenseList = accountExpenseMapper.selectAccountExpenseStats(startStr, endStr, dateFormat);


        List<IncomeExpenseAnalysisDto> incomeList = accountSalesCollectionMapper.selectIncomeStats(startStr, endStr, dateFormat);


        List<IncomeExpenseAnalysisDto> expenseList = accountPurchasePaymentMapper.selectPayment(startStr, endStr, dateFormat);




        Map<String, BigDecimal> incomeMap = incomeList.stream().collect(Collectors


                .toMap(IncomeExpenseAnalysisDto::getDateStr, IncomeExpenseAnalysisDto::getAmount, BigDecimal::add));


@@ -1272,11 +1201,6 @@


            rawMaterialDto.setName("原材料");


            rawMaterialDto.setValue(rawMaterialAmount != null ? rawMaterialAmount.toString() : "0");


            result.add(rawMaterialDto);




            List<MapDto> expenseList = accountExpenseMapper.selectExpenseComposition(null, null);


            if (expenseList != null) {


                result.addAll(expenseList);


            }


        }




        BigDecimal total = BigDecimal.ZERO;


@@ -1311,161 +1235,58 @@


    @Override


    public MonthlyIncomeDto monthlyIncome() {


        MonthlyIncomeDto dto = new MonthlyIncomeDto();


        LocalDate now = LocalDate.now();


        YearMonth currentMonth = YearMonth.from(now);


        LocalDateTime startOfMonth = currentMonth.atDay(1).atStartOfDay();


        LocalDateTime endOfMonth = currentMonth.atEndOfMonth().atTime(23, 59, 59);


        LocalDate today = LocalDate.now();


        YearMonth currentMonth = YearMonth.from(today);


        LocalDate startDate = currentMonth.atDay(1);


        LocalDate endDate = currentMonth.atEndOfMonth();




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


        wrapper.eq(SalesLedgerProduct::getType, 1);


        wrapper.ge(SalesLedgerProduct::getRegisterDate, startOfMonth);


        wrapper.le(SalesLedgerProduct::getRegisterDate, endOfMonth);


        BigDecimal monthlyIncome = sumCollectionAmount(startDate, endDate);


        BigDecimal receivableBase = sumSalesContractAmount(startDate, endDate);


        String collectionRate = toRateString(monthlyIncome, receivableBase);




        List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(wrapper);


        String currentMonthText = currentMonth.toString();


        List<AccountStatement> receivableStatements = defaultList(accountStatementMapper.selectList(


                new LambdaQueryWrapper<AccountStatement>()


                        .eq(AccountStatement::getAccountType, 1)


                        .le(AccountStatement::getStatementMonth, currentMonthText)));




        if (CollectionUtils.isEmpty(products)) {


            return dto;


        }


        long overdueNum = receivableStatements.stream()


                .filter(item -> item.getStatementMonth() != null && item.getStatementMonth().compareTo(currentMonthText) < 0)


                .filter(item -> defaultDecimal(item.getClosingBalance()).compareTo(BigDecimal.ZERO) > 0)


                .count();




        BigDecimal collected = products.stream()


                .map(SalesLedgerProduct::getInvoiceTotal)


                .filter(Objects::nonNull)


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


        dto.setMonthlyIncome(collected);


        long totalReceivableCount = receivableStatements.size();


        String overdueRate = totalReceivableCount == 0


                ? "0.00"


                : BigDecimal.valueOf(overdueNum)


                .multiply(BigDecimal.valueOf(100))


                .divide(BigDecimal.valueOf(totalReceivableCount), 2, RoundingMode.HALF_UP)


                .toString();




        BigDecimal overdue = products.stream()


                .map(SalesLedgerProduct::getPendingInvoiceTotal)


                .filter(Objects::nonNull)


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


        dto.setOverdueNum(overdue);




        BigDecimal total = collected.add(overdue);




        if (total.compareTo(BigDecimal.ZERO) > 0) {


            String collectionRate = collected.divide(total, 4, RoundingMode.HALF_UP)


                    .multiply(new BigDecimal("100"))


                    .setScale(2, RoundingMode.HALF_UP)


                    .toString();


            dto.setCollectionRate(collectionRate);




            String overdueRate = overdue.divide(total, 4, RoundingMode.HALF_UP)


                    .multiply(new BigDecimal("100"))


                    .setScale(2, RoundingMode.HALF_UP)


                    .toString();


            dto.setOverdueRate(overdueRate);


        }




        dto.setMonthlyIncome(scaleMoney(monthlyIncome));


        dto.setCollectionRate(collectionRate);


        dto.setOverdueNum(BigDecimal.valueOf(overdueNum));


        dto.setOverdueRate(overdueRate);


        return dto;


    }




    @Override


    public MonthlyExpenditureDto monthlyExpenditure() {




        MonthlyExpenditureDto dto = new MonthlyExpenditureDto();


        LocalDate today = LocalDate.now();


        YearMonth currentMonth = YearMonth.from(today);


        LocalDate startDate = currentMonth.atDay(1);


        LocalDate endDate = currentMonth.atEndOfMonth();




        // 当月时间范围


        LocalDate now = LocalDate.now();


        YearMonth currentMonth = YearMonth.from(now);


        LocalDateTime startOfMonth = currentMonth.atDay(1).atStartOfDay();


        LocalDateTime endOfMonth = currentMonth.atEndOfMonth().atTime(23, 59, 59);


        BigDecimal monthlyExpenditure = sumPaymentAmount(startDate, endDate);


        BigDecimal payableBase = sumPurchaseContractAmount(startDate, endDate);


        BigDecimal monthlyIncome = sumCollectionAmount(startDate, endDate);


        BigDecimal grossProfit = monthlyIncome.subtract(monthlyExpenditure);




        // 采购台账（type = 2）


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


        purchaseWrapper.eq(SalesLedgerProduct::getType, 2);


        purchaseWrapper.ge(SalesLedgerProduct::getRegisterDate, startOfMonth);


        purchaseWrapper.le(SalesLedgerProduct::getRegisterDate, endOfMonth);




        List<SalesLedgerProduct> purchaseProducts = salesLedgerProductMapper.selectList(purchaseWrapper);




        BigDecimal rawMaterialCost = BigDecimal.ZERO; // 原材料成本


        BigDecimal paidAmount = BigDecimal.ZERO; // 已付款金额


        BigDecimal pendingAmount = BigDecimal.ZERO; // 待付款金额




        if (!CollectionUtils.isEmpty(purchaseProducts)) {


            for (SalesLedgerProduct p : purchaseProducts) {




                if (p.getTaxInclusiveTotalPrice() != null) {


                    rawMaterialCost = rawMaterialCost.add(p.getTaxInclusiveTotalPrice());


                }




                if (p.getTicketsTotal() != null) {


                    paidAmount = paidAmount.add(p.getTicketsTotal());


                }




                if (p.getPendingTicketsTotal() != null) {


                    pendingAmount = pendingAmount.add(p.getPendingTicketsTotal());


                }


            }


        }




        // 其他费用


        LambdaQueryWrapper<AccountExpense> expenseWrapper = new LambdaQueryWrapper<>();


        expenseWrapper.ge(AccountExpense::getExpenseDate,


                java.sql.Date.valueOf(currentMonth.atDay(1)));


        expenseWrapper.le(AccountExpense::getExpenseDate,


                java.sql.Date.valueOf(currentMonth.atEndOfMonth()));




        List<AccountExpense> expenses = accountExpenseMapper.selectList(expenseWrapper);




        BigDecimal otherExpense = BigDecimal.ZERO;


        if (!CollectionUtils.isEmpty(expenses)) {


            for (AccountExpense e : expenses) {


                if (e.getExpenseMoney() != null) {


                    otherExpense = otherExpense.add(e.getExpenseMoney());


                }


            }


        }




        // 月度总支出


        // BigDecimal monthlyExpenditure = rawMaterialCost.add(otherExpense);


        BigDecimal monthlyExpenditure = otherExpense;


        dto.setMonthlyExpenditure(monthlyExpenditure);




        // 已付款 ÷（已付款 + 待付款）


        BigDecimal totalPayable = paidAmount.add(pendingAmount);


        if (totalPayable.compareTo(BigDecimal.ZERO) > 0) {


            String paymentRate = paidAmount


                    .divide(totalPayable, 4, RoundingMode.HALF_UP)


                    .multiply(BigDecimal.valueOf(100))


                    .setScale(2, RoundingMode.HALF_UP)


                    .toString();


            dto.setPaymentRate(paymentRate);


        }




        // 售台账（type = 1）


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


        salesWrapper.eq(SalesLedgerProduct::getType, 1);


        salesWrapper.ge(SalesLedgerProduct::getRegisterDate, startOfMonth);


        salesWrapper.le(SalesLedgerProduct::getRegisterDate, endOfMonth);




        List<SalesLedgerProduct> salesProducts = salesLedgerProductMapper.selectList(salesWrapper);




        BigDecimal revenue = BigDecimal.ZERO;


        if (!CollectionUtils.isEmpty(salesProducts)) {


            for (SalesLedgerProduct s : salesProducts) {


                if (s.getInvoiceAmount() != null) {


                    revenue = revenue.add(s.getInvoiceAmount());


                }


            }


        }




        // 毛利润 & 利润率


        if (revenue.compareTo(BigDecimal.ZERO) > 0) {




            // 毛利润 = 销售收入 - 原材料成本


            BigDecimal grossProfit = revenue.subtract(rawMaterialCost);


            dto.setGrossProfit(grossProfit);




            // 利润率 = (销售收入 - 月度总支出) / 销售收入


            BigDecimal profit = revenue.subtract(monthlyExpenditure);


            String profitMarginRate = profit


                    .divide(revenue, 4, RoundingMode.HALF_UP)


                    .multiply(BigDecimal.valueOf(100))


                    .setScale(2, RoundingMode.HALF_UP)


                    .toString();




            dto.setProfitMarginRate(profitMarginRate);


        }




        dto.setMonthlyExpenditure(scaleMoney(monthlyExpenditure));


        dto.setPaymentRate(toRateString(monthlyExpenditure, payableBase));


        dto.setGrossProfit(scaleMoney(grossProfit));


        dto.setProfitMarginRate(toRateString(grossProfit, monthlyIncome));


        return dto;


    }




@@ -1904,11 +1725,8 @@


        BigDecimal unqualifiedCount = BigDecimal.ZERO;




        for (QualityInspect item : list) {


            if ("合格".equals(item.getCheckResult())) {


                qualifiedCount = qualifiedCount.add(item.getQuantity());


            } else {


                unqualifiedCount = unqualifiedCount.add(item.getQuantity());


            }


            qualifiedCount = qualifiedCount.add(item.getQualifiedQuantity() != null ? item.getQualifiedQuantity() : BigDecimal.ZERO);


            unqualifiedCount = unqualifiedCount.add(item.getUnqualifiedQuantity() != null ? item.getUnqualifiedQuantity() : BigDecimal.ZERO);


        }




        BigDecimal totalCount = qualifiedCount.add(unqualifiedCount);


@@ -2177,13 +1995,11 @@


                continue;


            }




            BigDecimal quantity = item.getQuantity();


            BigDecimal qualifiedQty = item.getQualifiedQuantity() != null ? item.getQualifiedQuantity() : BigDecimal.ZERO;


            BigDecimal unqualifiedQty = item.getUnqualifiedQuantity() != null ? item.getUnqualifiedQuantity() : BigDecimal.ZERO;




            if ("合格".equals(item.getCheckResult())) {


                dto.setQualifiedCount(dto.getQualifiedCount().add(quantity));


            } else {


                dto.setUnqualifiedCount(dto.getUnqualifiedCount().add(quantity));


            }


            dto.setQualifiedCount(dto.getQualifiedCount().add(qualifiedQty));


            dto.setUnqualifiedCount(dto.getUnqualifiedCount().add(unqualifiedQty));


        }




        // 计算合格率


@@ -2224,14 +2040,12 @@


            BigDecimal unqualifiedCount = BigDecimal.ZERO;




            for (QualityInspect item : items) {


                BigDecimal qty = item.getQuantity();


                totalCount = totalCount.add(qty);


                BigDecimal qualifiedQty = item.getQualifiedQuantity() != null ? item.getQualifiedQuantity() : BigDecimal.ZERO;


                BigDecimal unqualifiedQty = item.getUnqualifiedQuantity() != null ? item.getUnqualifiedQuantity() : BigDecimal.ZERO;




                if ("合格".equals(item.getCheckResult())) {


                    qualifiedCount = qualifiedCount.add(qty);


                } else {


                    unqualifiedCount = unqualifiedCount.add(qty);


                }


                totalCount = totalCount.add(qualifiedQty.add(unqualifiedQty));


                qualifiedCount = qualifiedCount.add(qualifiedQty);


                unqualifiedCount = unqualifiedCount.add(unqualifiedQty);


            }




            if (totalCount.compareTo(BigDecimal.ZERO) == 0) {


@@ -2360,13 +2174,17 @@


        dto.setProcessNum(sumQuantity(qualityInspectList, 1)); // 过程


        dto.setFactoryNum(sumQuantity(qualityInspectList, 2)); // 出厂




        // 假设 qualityInspectList 是一个 List<QualityInspect> 类型的集合


        Map<String, List<QualityInspect>> groupedByCheckResult = qualityInspectList.stream()


                .collect(Collectors.groupingBy(QualityInspect::getCheckResult));


        List<QualityInspect> qualityInspects = groupedByCheckResult.get("不合格");


        if (ObjectUtils.isNull(qualityInspects) || qualityInspects.size() == 0) {


            return null;


        // 根据 unqualifiedQuantity > 0 筛选不合格记录


        List<QualityInspect> qualityInspects = qualityInspectList.stream()


                .filter(i -> i.getUnqualifiedQuantity() != null && i.getUnqualifiedQuantity().compareTo(BigDecimal.ZERO) > 0)


                .collect(Collectors.toList());




        if (ObjectUtils.isEmpty(qualityInspects)) {


            // 即使没有不合格记录，也应该返回统计数据，只是图表项为空


            dto.setItem(new ArrayList<>());


            return dto;


        }




        // 4. 处理图表项 (Item)


        List<QualityStatisticsItem> itemList = new ArrayList<>();




@@ -2409,8 +2227,11 @@


    private BigDecimal sumQuantity(List<QualityInspect> list, Integer type) {


        return list.stream()


                .filter(i -> i.getInspectType().equals(type))


                .map(QualityInspect::getQuantity)


                .filter(Objects::nonNull)


                .map(i -> {


                    BigDecimal qualified = i.getQualifiedQuantity() != null ? i.getQualifiedQuantity() : BigDecimal.ZERO;


                    BigDecimal unqualified = i.getUnqualifiedQuantity() != null ? i.getUnqualifiedQuantity() : BigDecimal.ZERO;


                    return qualified.add(unqualified);


                })


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


    }




@@ -2418,11 +2239,18 @@


        QualityStatisticsItem item = new QualityStatisticsItem();


        item.setDate(dateLabel);




        item.setSupplierNum(list.stream().filter(i -> i.getInspectType() == 0).map(QualityInspect::getQuantity)


        // 统计每种检验类型的不合格数量


        item.setSupplierNum(list.stream()


                .filter(i -> i.getInspectType() == 0)


                .map(i -> i.getUnqualifiedQuantity() != null ? i.getUnqualifiedQuantity() : BigDecimal.ZERO)


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


        item.setProcessNum(list.stream().filter(i -> i.getInspectType() == 1).map(QualityInspect::getQuantity)


        item.setProcessNum(list.stream()


                .filter(i -> i.getInspectType() == 1)


                .map(i -> i.getUnqualifiedQuantity() != null ? i.getUnqualifiedQuantity() : BigDecimal.ZERO)


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


        item.setFactoryNum(list.stream().filter(i -> i.getInspectType() == 2).map(QualityInspect::getQuantity)


        item.setFactoryNum(list.stream()


                .filter(i -> i.getInspectType() == 2)


                .map(i -> i.getUnqualifiedQuantity() != null ? i.getUnqualifiedQuantity() : BigDecimal.ZERO)


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




        return item;


@@ -2462,6 +2290,97 @@


        return productionOperationTaskMapper.calculateProductionStatistics(startDateTime, endDateTime, userId, processIds);


    }




    private LocalDate[] resolveFinanceRange(Integer type) {


        LocalDate today = LocalDate.now();


        int safeType = type == null ? 1 : type;


        LocalDate startDate;


        LocalDate endDate;


        switch (safeType) {


            case 1:


                startDate = today.with(DayOfWeek.MONDAY);


                endDate = today.with(DayOfWeek.SUNDAY);


                break;


            case 2:


                startDate = today.with(TemporalAdjusters.firstDayOfMonth());


                endDate = today.with(TemporalAdjusters.lastDayOfMonth());


                break;


            case 3:


                Month firstMonthOfQuarter = today.getMonth().firstMonthOfQuarter();


                startDate = LocalDate.of(today.getYear(), firstMonthOfQuarter, 1);


                endDate = startDate.plusMonths(2).with(TemporalAdjusters.lastDayOfMonth());


                break;


            default:


                startDate = today.with(DayOfWeek.MONDAY);


                endDate = today.with(DayOfWeek.SUNDAY);


                break;


        }


        return new LocalDate[]{startDate, endDate};


    }




    private BigDecimal sumSalesContractAmount(LocalDate startDate, LocalDate endDate) {


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


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


                .lt(SalesLedger::getEntryDate, toExclusiveEndDate(endDate))));


        return sumAmount(salesLedgers, SalesLedger::getContractAmount);


    }




    private BigDecimal sumPurchaseContractAmount(LocalDate startDate, LocalDate endDate) {


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


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


                .lt(PurchaseLedger::getEntryDate, toExclusiveEndDate(endDate))));


        return sumAmount(purchaseLedgers, PurchaseLedger::getContractAmount);


    }




    private BigDecimal sumCollectionAmount(LocalDate startDate, LocalDate endDate) {


        List<AccountSalesCollection> collections = defaultList(accountSalesCollectionMapper.selectList(


                new LambdaQueryWrapper<AccountSalesCollection>()


                        .ge(AccountSalesCollection::getCollectionDate, startDate)


                        .le(AccountSalesCollection::getCollectionDate, endDate)));


        return sumAmount(collections, AccountSalesCollection::getCollectionAmount);


    }




    private BigDecimal sumPaymentAmount(LocalDate startDate, LocalDate endDate) {


        List<AccountPurchasePayment> payments = defaultList(accountPurchasePaymentMapper.selectList(


                new LambdaQueryWrapper<AccountPurchasePayment>()


                        .ge(AccountPurchasePayment::getPaymentDate, startDate)


                        .le(AccountPurchasePayment::getPaymentDate, endDate)));


        return sumAmount(payments, AccountPurchasePayment::getPaymentAmount);


    }




    private Date toDate(LocalDate localDate) {


        return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());


    }




    private Date toExclusiveEndDate(LocalDate localDate) {


        return Date.from(localDate.plusDays(1).atStartOfDay(ZoneId.systemDefault()).toInstant());


    }




    private String toRateString(BigDecimal numerator, BigDecimal denominator) {


        if (denominator == null || denominator.compareTo(BigDecimal.ZERO) <= 0) {


            return "0.00";


        }


        return defaultDecimal(numerator)


                .divide(denominator, 4, RoundingMode.HALF_UP)


                .multiply(BigDecimal.valueOf(100))


                .setScale(2, RoundingMode.HALF_UP)


                .toString();


    }




    private BigDecimal maxZero(BigDecimal value) {


        if (value == null) {


            return BigDecimal.ZERO;


        }


        return value.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : value;


    }




    private BigDecimal scaleMoney(BigDecimal value) {


        return defaultDecimal(value).setScale(2, RoundingMode.HALF_UP);


    }




    private <T> List<T> defaultList(List<T> list) {


        return list == null ? List.of() : list;


    }




    private BigDecimal defaultDecimal(BigDecimal value) {


        return value == null ? BigDecimal.ZERO : value;


    }