楚江erp：要车单计划吨位计算逻辑调整

@@ -29,6 +29,7 @@ import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatter;
@@ -181,11 +182,10 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
             ticketVo.setWorkshopId(orderInfo.getWorkshopId());
             ticketVo.setWorkshopId(orderInfo.getWorkshopId());
             ticketVo.setOrderNo(orderInfo.getOrderNo());
             ticketVo.setOrderNo(orderInfo.getOrderNo());
             ticketVo.setOrderingUnit(orderInfo.getOrderingUnit());
             ticketVo.setOrderingUnit(orderInfo.getOrderingUnit());
-            ticketVo.setQuantity(orderInfo.getTotalQuantity());
             ticketVo.setShipmentsOrderId(shipmentsOrderInfo.getId());
             ticketVo.setShipmentsOrderId(shipmentsOrderInfo.getId());
-            //外办审核人(草稿要车单审核人)
+            // 外办审核人(草稿要车单审核人)
             ticketVo.setExternalAuditor(draftTicket.getExternalAuditor());
             ticketVo.setExternalAuditor(draftTicket.getExternalAuditor());
-            //经营办审核人(发货计划提交人)
+            // 经营办审核人(发货计划提交人)
             ticketVo.setBusinessOfficeAuditor(SecurityUtil.getCurrentUser().getId());
             ticketVo.setBusinessOfficeAuditor(SecurityUtil.getCurrentUser().getId());
             ticketVo.setDestination(draftTicket.getDestination());
             ticketVo.setDestination(draftTicket.getDestination());
             ticketVo.setConsignee(draftTicket.getConsignee());
             ticketVo.setConsignee(draftTicket.getConsignee());
@@ -197,6 +197,16 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
             if (CollectionUtil.isEmpty(detailList)) {
             if (CollectionUtil.isEmpty(detailList)) {
                 continue;
                 continue;
             }
             }
+            // 计划吨位
+            BigDecimal totalQuantity = BigDecimal.ZERO;
+            for (ShipmentsPlanDetail detail : detailList) {
+                BigDecimal quantity = detail.getQuantity();
+                if (quantity == null || !orderInfo.getId().equals(detail.getOrderId())) {
+                    continue;
+                }
+                totalQuantity = totalQuantity.add(quantity);
+            }
+            ticketVo.setQuantity(totalQuantity);
             // 装货时间处理
             // 装货时间处理
             LocalTime minTime = shipmentsOrderInfo.getDetailList().stream()
             LocalTime minTime = shipmentsOrderInfo.getDetailList().stream()
                     .map(ShipmentsPlanDetail::getShipmentsTime)
                     .map(ShipmentsPlanDetail::getShipmentsTime)