diff --git a/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java
index fb37a8d..89278c2 100644
--- a/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java
+++ b/admin/src/main/java/com/hcy/admin/service/order/impl/RepairOrderShippingServiceImpl.java
@@ -490,9 +490,7 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi
                                 .eq(ParentRepairOrder::getId, item.getParentRepairOrderId()));
                         //查询同型号和规格的模块数量
                         Integer count = repairOrderMapper.selectCount(new LambdaQueryWrapper<RepairOrder>()
-                                .eq(RepairOrder::getParentRepairOrderId,parentRepairOrder.getId())
-                                .eq(RepairOrder::getModuleNumber, item.getModuleNumber())
-                                .eq(RepairOrder::getModulePower, item.getModulePower()));
+                                .eq(RepairOrder::getParentRepairOrderId,parentRepairOrder.getId()));
                         //订单数量
                         releaseRecordListExcel.setOrderAmount(count);
                         //单次送货批次有多少同型号和同规格的数量
@@ -543,8 +541,15 @@ public class RepairOrderShippingServiceImpl implements IRepairOrderShippingServi
                         releaseRecordListExcelMap.put(key,releaseRecordListExcel);
                         index++; // 序号累计
                     }else{
-                        releaseRecordListExcel.setOrderAmount(releaseRecordListExcel.getOrderAmount() + 1);
-                        releaseRecordListExcel.setTheQuantityShipped(releaseRecordListExcel.getTheQuantityShipped() + 1);
+                        //累计交货数量
+                        Integer accumulativeQuantity = cdqMap.get(key);
+                        if(accumulativeQuantity != null){
+                            int num = accumulativeQuantity + 1;
+                            releaseRecordListExcel.setAccumulativeQuantityShipped(num);
+                            cdqMap.put(key,num);
+                            //未交数量
+                            releaseRecordListExcel.setUndeliveredQuantity(releaseRecordListExcel.getOrderAmount() - num);
+                        }
                         if(item.getMaintenanceResult() != null){
                             String result;
                             if(item.getMaintenanceResult() == 0){