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


@@ -3,16 +3,13 @@


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.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.ruoyi.account.mapper.AccountExpenseMapper;


import com.ruoyi.account.mapper.AccountIncomeMapper;


import com.ruoyi.account.pojo.AccountExpense;


import com.ruoyi.home.mapper.HomeMapper;


import com.ruoyi.account.mapper.AccountExpenseMapper;


import com.ruoyi.approve.mapper.ApproveProcessMapper;


import com.ruoyi.approve.pojo.ApproveProcess;


import com.ruoyi.basic.mapper.CustomerMapper;


import com.ruoyi.basic.mapper.ProductMapper;


import com.ruoyi.basic.mapper.ProductModelMapper;


import com.ruoyi.basic.mapper.SupplierManageMapper;


import com.ruoyi.basic.pojo.Customer;


import com.ruoyi.basic.pojo.Product;


@@ -27,20 +24,10 @@


import com.ruoyi.dto.MapDto;


import com.ruoyi.framework.security.LoginUser;


import com.ruoyi.home.dto.*;


import com.ruoyi.home.mapper.HomeMapper;


import com.ruoyi.home.service.HomeService;


import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;


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.mapper.ProductOrderMapper;


import com.ruoyi.production.mapper.ProductProcessMapper;


import com.ruoyi.production.mapper.ProductWorkOrderMapper;


import com.ruoyi.production.mapper.ProductionProductInputMapper;


import com.ruoyi.production.mapper.ProductionProductOutputMapper;


import com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper;


import com.ruoyi.production.pojo.ProductProcess;


import com.ruoyi.production.pojo.ProductWorkOrder;


import com.ruoyi.production.bean.dto.ProductionProductOutputDto;


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;


@@ -60,8 +47,8 @@


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;




@@ -81,76 +68,56 @@


 */


@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 ReceiptPaymentMapper receiptPaymentMapper;




    @Autowired


    private PaymentRegistrationMapper paymentRegistrationMapper;


    private final PaymentRegistrationMapper paymentRegistrationMapper;




    @Autowired


    private SysDeptMapper sysDeptMapper;


    private final SysDeptMapper sysDeptMapper;




    @Autowired


    private NoticeMapper noticeMapper;


    private final NoticeMapper noticeMapper;




    @Autowired


    private ProductOrderMapper productOrderMapper;


    private final ProductionOrderMapper productionOrderMapper;




    @Autowired


    private ProductWorkOrderMapper productWorkOrderMapper;


    private final ProductMapper productMapper;




    @Autowired


    private ProductMapper productMapper;


    private final StaffOnJobMapper staffOnJobMapper;




    @Autowired


    private StaffOnJobMapper staffOnJobMapper;


    private final CustomerMapper customerMapper;




    @Autowired


    private CustomerMapper customerMapper;


    private final SupplierManageMapper supplierManageMapper;




    @Autowired


    private SupplierManageMapper supplierManageMapper;


    private final HomeMapper homeMapper;




    @Autowired


    private HomeMapper homeMapper;


    private final ProductionProductOutputMapper productionProductOutputMapper;




    @Autowired


    private ProductionProductOutputMapper productionProductOutputMapper;


    private final QualityInspectMapper qualityInspectMapper;




    @Autowired


    private QualityInspectMapper qualityInspectMapper;


    private final QualityUnqualifiedMapper qualityUnqualifiedMapper;




    @Autowired


    private QualityUnqualifiedMapper qualityUnqualifiedMapper;


    private final ProductionOperationTaskMapper productionOperationTaskMapper;




    @Autowired


    private ProductProcessMapper productProcessMapper;


    


    @Autowired


    private AccountExpenseMapper accountExpenseMapper;


    private final AccountExpenseMapper accountExpenseMapper;




    @Autowired


    private AccountIncomeMapper accountIncomeMapper;


    private final AccountIncomeMapper accountIncomeMapper;




    private final ProductionAccountMapper productionAccountMapper;




    private final ProductionProductInputMapper productionProductInputMapper;




    @Override


    public HomeBusinessDto business() {


@@ -345,19 +312,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);




@@ -367,25 +350,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);




@@ -527,7 +507,7 @@


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


    }




    @Autowired




    private DeviceRepairMapper deviceRepairMapper;




    @Override


@@ -560,18 +540,15 @@


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


        List<ProductionProgressOrderDto> orderDetails = productionOrderMapper.selectProgressOrders(


                LocalDateTime.now().minusMonths(1), LocalDateTime.now());


        productionProgressDto.setCompletedOrderDetails(orderDetails);


        long totalCount = orderDetails.size();


        long count = orderDetails.stream().filter(


                        item -> defaultDecimal(item.getCompleteQuantity()).compareTo(defaultDecimal(item.getQuantity())) >= 0)


                .count();


        long count2 = productOrderDtos.stream()


                .filter(productOrderDto -> productOrderDto.getCompleteQuantity().compareTo(BigDecimal.ZERO) == 0)


        long count2 = orderDetails.stream()


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


                .count();


        productionProgressDto.setTotalOrderCount(totalCount);


        productionProgressDto.setCompletedOrderCount(count);


@@ -583,15 +560,11 @@


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


        List<ProductionTaskStatisticsDto> taskList = productionOperationTaskMapper


                .selectTaskStatisticsByDate(LocalDate.now().minusMonths(1), LocalDate.now());


        long sum = taskList.stream()


                .filter(task -> defaultDecimal(task.getPlanQuantity()).compareTo(defaultDecimal(task.getCompleteQuantity())) > 0)


                .map(ProductionTaskStatisticsDto::getPlanQuantity)


                .mapToLong(BigDecimal::longValue)


                .sum();


        if (sum == 0)


@@ -600,23 +573,21 @@


        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)


        long completeQuantity = taskList.stream()


                .filter(task -> defaultDecimal(task.getCompleteQuantity()).compareTo(defaultDecimal(task.getPlanQuantity())) >= 0)


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


        Map<String, List<ProductionTaskStatisticsDto>> map = taskList.stream()


                .filter(task -> defaultDecimal(task.getPlanQuantity()).compareTo(defaultDecimal(task.getCompleteQuantity())) > 0)


                .collect(Collectors.groupingBy(ProductionTaskStatisticsDto::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)


            long completeSum = entry.getValue().stream().map(ProductionTaskStatisticsDto::getCompleteQuantity)


                    .mapToLong(BigDecimal::longValue).sum();


            strings.add(key);


            processQuantityDetails.add(completeSum);


@@ -1511,9 +1482,6 @@


        return dto;


    }




    @Autowired


    private ProductionProductInputMapper productionProductInputMapper;




    @Override


    public List<InputOutputAnalysisDto> inputOutputAnalysis(Integer type) {


        LocalDate today = LocalDate.now();


@@ -1544,7 +1512,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<>();


@@ -1610,12 +1579,7 @@


                break;


        }




        ProductWorkOrderDto queryDto = new ProductWorkOrderDto();


        queryDto.setPlanStartTime(startDate);


        queryDto.setPlanEndTime(endDate);




        List<ProductWorkOrderDto> list = productWorkOrderMapper.pageProductWorkOrder(new Page<>(1, -1), queryDto)


                .getRecords();


        List<ProductionTaskStatisticsDto> list = productionOperationTaskMapper.selectTaskStatisticsByDate(startDate, endDate);




        if (CollectionUtils.isEmpty(list)) {


            return new ArrayList<>();


@@ -1624,9 +1588,9 @@


        Map<String, BigDecimal> processOutputMap = list.stream()


                .filter(item -> item.getProcessName() != null && item.getCompleteQuantity() != null)


                .collect(Collectors.groupingBy(


                        ProductWorkOrderDto::getProcessName,


                        ProductionTaskStatisticsDto::getProcessName,


                        Collectors.reducing(BigDecimal.ZERO,


                                ProductWorkOrderDto::getCompleteQuantity,


                                ProductionTaskStatisticsDto::getCompleteQuantity,


                                BigDecimal::add)));




        BigDecimal total = processOutputMap.values().stream()


@@ -1680,17 +1644,17 @@


        String startStr = startDate.atStartOfDay().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));


        String endStr = endDate.atTime(LocalTime.MAX).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));




        List<ProductWorkOrderDto> startList = productWorkOrderMapper.selectWorkOrderStartStats(startStr, endStr);


        List<ProductionTaskStatisticsDto> startList = productionOperationTaskMapper.selectTaskStartStats(startStr, endStr);




        List<com.ruoyi.production.dto.ProductionProductOutputDto> outputList = productionProductOutputMapper


        List<ProductionProductOutputDto> outputList = productionProductOutputMapper


                .selectOutputStats(startStr, endStr);




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




        if (!CollectionUtils.isEmpty(startList)) {


            for (ProductWorkOrderDto item : startList) {


                if (item.getPlanStartTime() != null) {


                    String date = item.getPlanStartTime().toString();


            for (ProductionTaskStatisticsDto item : startList) {


                if (item.getActualStartTime() != null) {


                    String date = item.getActualStartTime().toString();


                    WorkOrderEfficiencyDto dto = dateMap.getOrDefault(date, new WorkOrderEfficiencyDto());


                    dto.setDate(date);


                    BigDecimal qty = item.getPlanQuantity() != null ? item.getPlanQuantity() : BigDecimal.ZERO;


@@ -1702,7 +1666,7 @@




        // 完工数量和良品率


        if (!CollectionUtils.isEmpty(outputList)) {


            for (com.ruoyi.production.dto.ProductionProductOutputDto item : outputList) {


            for (ProductionProductOutputDto item : outputList) {


                if (item.getCreateTime() != null) {


                    String date = item.getCreateTime().toLocalDate().toString();


                    WorkOrderEfficiencyDto dto = dateMap.getOrDefault(date, new WorkOrderEfficiencyDto());


@@ -1775,8 +1739,6 @@


                .collect(Collectors.toList());


    }




    @Autowired


    private SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;




    @Override


    public List<ProductionAccountingDto> productionAccountingAnalysis(Integer type) {


@@ -1805,7 +1767,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)) {


@@ -1841,16 +1803,16 @@


        String lastEnd = lastMonthDate.withDayOfMonth(lastMonthDate.lengthOfMonth()).atTime(LocalTime.MAX)


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




        int currentCreated = productOrderMapper.countCreated(currentStart, currentEnd);


        int lastCreated = productOrderMapper.countCreated(lastStart, lastEnd);


        int currentCreated = productionOrderMapper.countCreated(currentStart, currentEnd);


        int lastCreated = productionOrderMapper.countCreated(lastStart, lastEnd);


        MapDto createdDto = createOrderCountDto("生产订单数", currentCreated, lastCreated);




        int currentCompleted = productOrderMapper.countCompleted(currentStart, currentEnd);


        int lastCompleted = productOrderMapper.countCompleted(lastStart, lastEnd);


        int currentCompleted = productionOrderMapper.countCompleted(currentStart, currentEnd);


        int lastCompleted = productionOrderMapper.countCompleted(lastStart, lastEnd);


        MapDto completedDto = createOrderCountDto("已完成订单数", currentCompleted, lastCompleted);




        int currentPending = productOrderMapper.countPending(currentStart, currentEnd);


        int lastPending = productOrderMapper.countPending(lastStart, lastEnd);


        int currentPending = productionOrderMapper.countPending(currentStart, currentEnd);


        int lastPending = productionOrderMapper.countPending(lastStart, lastEnd);


        MapDto pendingDto = createOrderCountDto("待生产订单数", currentPending, lastPending);




        return Arrays.asList(createdDto, completedDto, pendingDto);


@@ -1955,11 +1917,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);


@@ -2228,13 +2187,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));


        }




        // 计算合格率


@@ -2275,14 +2232,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) {


@@ -2411,13 +2366,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<>();




@@ -2460,8 +2419,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);


    }




@@ -2469,11 +2431,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;


@@ -2510,6 +2479,10 @@


        LocalDateTime startDateTime = startDate.atStartOfDay();


        LocalDateTime endDateTime = endDate.atTime(LocalTime.MAX);




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


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


    }




    private BigDecimal defaultDecimal(BigDecimal value) {


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


    }


}