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


@@ -3,9 +3,8 @@


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.purchase.AccountPurchasePaymentMapper;


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


import com.ruoyi.approve.mapper.ApproveProcessMapper;


import com.ruoyi.approve.pojo.ApproveProcess;


import com.ruoyi.basic.mapper.CustomerMapper;


@@ -30,25 +29,21 @@


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;


import com.ruoyi.staff.pojo.StaffOnJob;


import com.ruoyi.stock.mapper.StockInventoryMapper;


import lombok.RequiredArgsConstructor;


import lombok.extern.slf4j.Slf4j;


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


import org.springframework.stereotype.Service;


import org.springframework.util.CollectionUtils;




@@ -68,73 +63,51 @@


 */


@Service


@Slf4j


@RequiredArgsConstructor


public class HomeServiceImpl implements HomeService {




    @Autowired


    private SalesLedgerMapper salesLedgerMapper;


    private final SalesLedgerMapper salesLedgerMapper;




    @Autowired


    private PurchaseLedgerMapper purchaseLedgerMapper;


    private final PurchaseLedgerMapper purchaseLedgerMapper;




    @Autowired


    private SalesLedgerProductMapper salesLedgerProductMapper;


    private final SalesLedgerProductMapper salesLedgerProductMapper;




    @Autowired


    private StockInventoryMapper stockInventoryMapper;


    private final StockInventoryMapper stockInventoryMapper;




    @Autowired


    private QualityInspectMapper qualityStatisticsMapper;


    private final QualityInspectMapper qualityStatisticsMapper;




    @Autowired


    private ApproveProcessMapper approveProcessMapper;


    private final ApproveProcessMapper approveProcessMapper;




    @Autowired


    private ReceiptPaymentMapper receiptPaymentMapper;


    private final SysDeptMapper sysDeptMapper;




    @Autowired


    private PaymentRegistrationMapper paymentRegistrationMapper;


    private final NoticeMapper noticeMapper;




    @Autowired


    private SysDeptMapper sysDeptMapper;


    private final ProductionOrderMapper productionOrderMapper;




    @Autowired


    private NoticeMapper noticeMapper;


    private final ProductMapper productMapper;




    @Autowired


    private ProductionOrderMapper productionOrderMapper;


    private final StaffOnJobMapper staffOnJobMapper;




    @Autowired


    private ProductMapper productMapper;


    private final CustomerMapper customerMapper;




    @Autowired


    private StaffOnJobMapper staffOnJobMapper;


    private final SupplierManageMapper supplierManageMapper;




    @Autowired


    private CustomerMapper customerMapper;


    private final HomeMapper homeMapper;




    @Autowired


    private SupplierManageMapper supplierManageMapper;


    private final ProductionProductOutputMapper productionProductOutputMapper;




    @Autowired


    private HomeMapper homeMapper;


    private final QualityInspectMapper qualityInspectMapper;




    @Autowired


    private ProductionProductOutputMapper productionProductOutputMapper;


    private final QualityUnqualifiedMapper qualityUnqualifiedMapper;




    @Autowired


    private QualityInspectMapper qualityInspectMapper;


    private final ProductionOperationTaskMapper productionOperationTaskMapper;




    @Autowired


    private QualityUnqualifiedMapper qualityUnqualifiedMapper;


    private final AccountPurchasePaymentMapper accountPurchasePaymentMapper;


    private final AccountSalesCollectionMapper accountSalesCollectionMapper;




    @Autowired


    private ProductionOperationTaskMapper productionOperationTaskMapper;


    


    @Autowired


    private AccountExpenseMapper accountExpenseMapper;


    private final ProductionAccountMapper productionAccountMapper;




    @Autowired


    private AccountIncomeMapper accountIncomeMapper;


    private final ProductionProductInputMapper productionProductInputMapper;




    @Override


    public HomeBusinessDto business() {


@@ -431,6 +404,7 @@


     */


    @Override


    public StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type) {


        StatisticsReceivablePayableDto statisticsReceivablePayableDto = new StatisticsReceivablePayableDto();


        LocalDate today = LocalDate.now();


        LocalDate startDate = null;


        LocalDate endDate = null;


@@ -457,48 +431,14 @@


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








        return statisticsReceivablePayableDto;


    }


@@ -511,7 +451,7 @@


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


    }




    @Autowired




    private DeviceRepairMapper deviceRepairMapper;




    @Override


@@ -1181,13 +1121,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()


@@ -1196,11 +1132,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(


@@ -1214,18 +1146,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);


        }


@@ -1252,8 +1178,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));


@@ -1289,11 +1215,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;


@@ -1415,26 +1336,10 @@


        }




        // 其他费用


        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;


        BigDecimal monthlyExpenditure = BigDecimal.ZERO;


        dto.setMonthlyExpenditure(monthlyExpenditure);




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


@@ -1486,9 +1391,6 @@


        return dto;


    }




    @Autowired


    private ProductionProductInputMapper productionProductInputMapper;




    @Override


    public List<InputOutputAnalysisDto> inputOutputAnalysis(Integer type) {


        LocalDate today = LocalDate.now();


@@ -1519,7 +1421,8 @@


        String endStr = endDate.atStartOfDay()


                .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));




        List<Map<String, Object>> inputList = productionProductInputMapper.selectInputStats(startStr, endStr);


//        List<Map<String, Object>> inputList = productionProductInputMapper.selectInputStats(startStr, endStr);


        List<Map<String, Object>> inputList = null;


        List<Map<String, Object>> outputList = productionProductOutputMapper.selectDailyOutputStats(startStr, endStr);




        Map<String, InputOutputAnalysisDto> dateMap = new HashMap<>();


@@ -1745,8 +1648,6 @@


                .collect(Collectors.toList());


    }




    @Autowired


    private ProductionAccountMapper salesLedgerProductionAccountingMapper;




    @Override


    public List<ProductionAccountingDto> productionAccountingAnalysis(Integer type) {


@@ -1775,7 +1676,7 @@




        String endStr = endDate.plusDays(1).atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));




        List<Map<String, Object>> wagesList = salesLedgerProductionAccountingMapper.selectDailyWagesStats(startStr,


        List<Map<String, Object>> wagesList = productionAccountMapper.selectDailyWagesStats(startStr,


                endStr);




        if (CollectionUtils.isEmpty(wagesList)) {