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


@@ -1,8 +1,13 @@


package com.ruoyi.home.service.impl;




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


import com.baomidou.mybatisplus.core.metadata.IPage;


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


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.ruoyi.approve.mapper.ApproveProcessMapper;


import com.ruoyi.approve.pojo.ApproveProcess;


import com.ruoyi.basic.mapper.ProductModelMapper;


import com.ruoyi.basic.pojo.ProductModel;


import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;


import com.ruoyi.collaborativeApproval.pojo.Notice;


import com.ruoyi.common.utils.SecurityUtils;


@@ -22,6 +27,17 @@


import com.ruoyi.procurementrecord.pojo.CustomStorage;


import com.ruoyi.procurementrecord.pojo.ProcurementRecordOut;


import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;


import com.ruoyi.procurementrecord.utils.StockUtils;


import com.ruoyi.production.dto.ProductOrderDto;


import com.ruoyi.production.dto.ProductWorkOrderDto;


import com.ruoyi.production.dto.ProductionProductMainDto;


import com.ruoyi.production.mapper.ProductOrderMapper;


import com.ruoyi.production.mapper.ProductProcessMapper;


import com.ruoyi.production.mapper.ProductWorkOrderMapper;


import com.ruoyi.production.mapper.ProductionProductMainMapper;


import com.ruoyi.production.pojo.ProductOrder;


import com.ruoyi.production.pojo.ProductProcess;


import com.ruoyi.production.pojo.ProductWorkOrder;


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


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


import com.ruoyi.purchase.mapper.PaymentRegistrationMapper;


@@ -47,6 +63,7 @@


import java.text.SimpleDateFormat;


import java.time.*;


import java.time.format.DateTimeFormatter;


import java.time.temporal.ChronoUnit;


import java.time.temporal.TemporalAdjusters;


import java.util.*;


import java.util.concurrent.atomic.AtomicInteger;


@@ -98,7 +115,16 @@




    @Autowired


    private NoticeMapper noticeMapper;




    @Autowired


    private ProductOrderMapper productOrderMapper;


    @Autowired


    private ProductProcessMapper productProcessMapper;


    @Autowired


    private ProductWorkOrderMapper productWorkOrderMapper;


    @Autowired


    private ProductModelMapper productModelMapper;


    @Autowired


    private StockUtils stockUtils;


    @Override


    public HomeBusinessDto business() {


        // 构建结果


@@ -151,23 +177,35 @@


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


        BigDecimal outboundAmount = procurementRecordOuts.stream()


                .map(ProcurementRecordOut::getInboundNum)


                .filter(Objects::nonNull)


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


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


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


//        BigDecimal outboundAmount = procurementRecordOuts.stream()


//                .map(ProcurementRecordOut::getInboundNum)


//                .filter(Objects::nonNull)


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


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


        IPage<ProductModel> productModelIPage = productModelMapper.listPageProductModel(new Page<>(1, -1), new ProductModel());


        if(!CollectionUtils.isEmpty(productModelIPage.getRecords())){


            //获取规格id


            List<Long> modelIds = productModelIPage.getRecords().stream().map(ProductModel::getId).collect(Collectors.toList());


            BigDecimal stockQuantityTotal = modelIds.stream()


                    .map(stockUtils::getStockQuantity)


                    .map(map -> map.get("stockQuantity"))


                    .filter(Objects::nonNull)


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


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


        }




        // 获取当天入库数量


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


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


@@ -177,7 +215,7 @@


                .map(ProcurementRecordStorage::getInboundNum)


                .filter(Objects::nonNull)


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


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


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


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


        return homeBusinessDto;


    }


@@ -362,29 +400,29 @@


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


        approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveDelete, 0)


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


                .ne(ApproveProcess::getApproveStatus, 2)


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


                .ne(ApproveProcess::getApproveStatus, 2);


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


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


            }


        }


//        // 查询未领用劳保记录


//        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);  //staff_join_leave_record表被删除


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


    }




@@ -425,25 +463,29 @@


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


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


        );


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


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


@@ -452,7 +494,13 @@




        return statisticsReceivablePayableDto;


    }




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


        return list.stream()


                // 提取金额时，将null替换为BigDecimal.ZERO


                .map(item -> Optional.ofNullable(amountExtractor.apply(item)).orElse(BigDecimal.ZERO))


                // 累加，初始值为0，避免空流问题


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


    }


    @Autowired


    private DeviceRepairMapper deviceRepairMapper;




@@ -480,4 +528,59 @@


                .eq(Notice::getStatus, 1) // 1表示发布状态


                .ge(Notice::getExpirationDate, new Date())); // 过期时间大于等于当前日期


    }




    @Override


    public ProductionProgressDto productionProgress() {


        ProductionProgressDto productionProgressDto = new ProductionProgressDto();


        ProductOrderDto orderDto = new ProductOrderDto();


        orderDto.setStartTime(LocalDateTime.now().minusMonths(1));


        orderDto.setEndTime(LocalDateTime.now());


        List<ProductOrderDto> productOrderDtos = productOrderMapper.pageProductOrder(new Page<>(1, -1), orderDto).getRecords();


        productionProgressDto.setCompletedOrderDetails(productOrderDtos);


        long totalCount = productOrderDtos.size();


        long count = productOrderDtos.stream().filter(productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(productOrderDto.getQuantity()) >= 0).count();


        long count2 = productOrderDtos.stream().filter(productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(BigDecimal.ZERO) == 0).count();


        productionProgressDto.setTotalOrderCount(totalCount);


        productionProgressDto.setCompletedOrderCount(count);


        productionProgressDto.setUncompletedOrderCount(count2);


        productionProgressDto.setPartialCompletedOrderCount(totalCount-count-count2);


        return productionProgressDto;


    }


    @Override


    public ProductionTurnoverDto workInProcessTurnover() {


        ProductionTurnoverDto productionTurnoverDto = new ProductionTurnoverDto();


        ProductWorkOrderDto workOrder = new ProductWorkOrderDto();


        workOrder.setPlanStartTime(LocalDate.now().minusMonths(1));


        workOrder.setPlanEndTime(LocalDate.now());


        List<ProductWorkOrderDto> productWorkOrders = productWorkOrderMapper.pageProductWorkOrder(new Page<>(1, -1), workOrder).getRecords();


        long sum = productWorkOrders.stream()


                .filter(productWorkOrder -> productWorkOrder.getPlanQuantity().compareTo(productWorkOrder.getCompleteQuantity()) > 0)


                .map(ProductWorkOrder::getPlanQuantity)


                .mapToLong(BigDecimal::longValue)


                .sum();


        if (sum == 0)return null;


        productionTurnoverDto.setTotalOrderCount(sum);//总在制品数量


        productionTurnoverDto.setAverageTurnoverDays(BigDecimal.valueOf(sum).divide(BigDecimal.valueOf(ChronoUnit.DAYS.between(LocalDateTime.now().minusMonths(1), LocalDateTime.now())),2,RoundingMode.HALF_UP));


        long completeQuantity = productWorkOrders.stream()


                .filter(productWorkOrder -> productWorkOrder.getCompleteQuantity().compareTo(productWorkOrder.getPlanQuantity()) >= 0)


                .map(ProductWorkOrder::getCompleteQuantity)


                .mapToLong(BigDecimal::longValue)


                .sum();


        productionTurnoverDto.setTurnoverEfficiency(BigDecimal.valueOf(completeQuantity).divide(BigDecimal.valueOf(sum),2,RoundingMode.HALF_UP));


        Map<String, List<ProductWorkOrderDto>> map = productWorkOrders.stream()


                .filter(productWorkOrder -> productWorkOrder.getPlanQuantity().compareTo(productWorkOrder.getCompleteQuantity()) > 0)


                .collect(Collectors.groupingBy(ProductWorkOrderDto::getProcessName));


        List<String> strings = new ArrayList<>();


        List<Long> processQuantityDetails = new ArrayList<>();


        map.entrySet().stream().forEach(entry -> {


            String key = entry.getKey();


            long completeSum = entry.getValue().stream().map(ProductWorkOrderDto::getCompleteQuantity).mapToLong(BigDecimal::longValue).sum();


            strings.add(key);


            processQuantityDetails.add(completeSum);


        });


        productionTurnoverDto.setProcessDetails(strings);


        productionTurnoverDto.setProcessQuantityDetails(processQuantityDetails);


        return productionTurnoverDto;




    }


}