Merge branch 'master_chujiang_0805' into master_quotation

房远帅
2 parents c8eca3c0 672b00fa
Showing 2 changed files with 29 additions and 16 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsOrderInfoServiceImpl.java
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/car/CarRequestPlanServiceImpl.java
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsOrderInfoServiceImpl.java
View file @351c6f6
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsOrderInfoServiceImpl.java
View file @351c6f6
@@ -960,6 +960,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                     .collect(Collectors.toList());
             List<PurchaseOrderInfo> batchOrderInfoList = purchaseOrderInfoService.queryByIds(batchOrderIds);
             List<String> detailIds = new ArrayList<>();
+            List<ShipmentsPlanDetail> shipmentsPlanDetails = new ArrayList<>();
             String id = IdUtil.getId();
             String customerId = details.get(0).getCustomerId();
             StringBuilder deliveryTypeBuilder = new StringBuilder();
@@ -974,6 +975,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 }
                 detail.setShipmentOrderId(id);
                 detailIds.add(detail.getId());
+                shipmentsPlanDetails.add(detail);
                 PurchaseOrderInfo orderInfo = orderInfoMap.get(detail.getOrderId());
                 if (orderInfo == null) {
@@ -1062,6 +1064,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             // 更新明细数据
             if (allApproved) {
                 shipmentsPlanDetailService.setShipmentsOrderId(detailIds, id);
+                shipmentsOrderInfo.setDetailList(shipmentsPlanDetails);
                 //生成要车单和要车计划
                 carRequestPlanService.generate(batchOrderInfoList, shipmentsOrderInfo);
             }
--- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/car/CarRequestPlanServiceImpl.java
View file @351c6f6
+++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/car/CarRequestPlanServiceImpl.java
View file @351c6f6
@@ -18,6 +18,7 @@ import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import lombok.extern.slf4j.Slf4j;
 import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.mappers.CarRequestPlanMapper;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
@@ -40,6 +41,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 @Service
+@Slf4j
 public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanMapper, CarRequestPlan> implements CarRequestPlanService {
     @Resource
     private RequestCarTicketService requestCarTicketService;
@@ -171,8 +173,10 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
     @Transactional(rollbackFor = Exception.class)
     public void generate(List<PurchaseOrderInfo> orderInfoList, ShipmentsOrderInfo shipmentsOrderInfo) {
         if (CollectionUtils.isEmpty(orderInfoList) || shipmentsOrderInfo == null) {
+            log.warn("[CarRequestPlan.generate] 跳过生成：orderInfoList={}, shipmentsOrderInfo={}", CollectionUtils.isEmpty(orderInfoList), shipmentsOrderInfo);
             return;
         }
+        log.info("[CarRequestPlan.generate] 开始生成，发货单ID={}，订单数={}", shipmentsOrderInfo.getId(), orderInfoList.size());
         List<String> orderIds = orderInfoList.stream().map(PurchaseOrderInfo::getId).collect(Collectors.toList());
         // 根据订货单获取草稿要车单
         List<DraftRequestCarTicket> draftTickets = draftRequestCarTicketService.listByOrderId(orderIds);
@@ -183,6 +187,10 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
         if (StringUtil.isNotBlank(shipmentsOrderInfo.getPlanId())) {
             shipmentsPlan = shipmentsPlanService.findById(shipmentsOrderInfo.getPlanId());
         }
+        List<ShipmentsPlanDetail> detailList = shipmentsOrderInfo.getDetailList();
+        if (CollectionUtils.isEmpty(detailList)) {
+            log.warn("[CarRequestPlan.generate] 发货单 {} 的detailList为空，无法计算吨位/装货时间，跳过生成要车单", shipmentsOrderInfo.getId());
+        }
         for (PurchaseOrderInfo orderInfo : orderInfoList) {
             // 生成要车计划
             LocalDate requestCarDate = shipmentsOrderInfo.getShipmentsDate();
@@ -193,9 +201,11 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
             planCreateVo.setRequestCarDate(requestCarDate);
             planCreateVo.setWorkshopId(orderInfo.getWorkshopId());
             String requestCarPlanId = create(planCreateVo);
+            log.info("[CarRequestPlan.generate] 已生成/复用要车计划ID={}，订单ID={}", requestCarPlanId, orderInfo.getId());
             // 生成要车单
             DraftRequestCarTicket draftTicket = draftTicketMap.get(orderInfo.getId());
             if (draftTicket == null) {
+                log.warn("[CarRequestPlan.generate] 订单ID={} 缺少草稿要车单，抛异常回滚", orderInfo.getId());
                 throw new DefaultClientException("请先补充草稿要车单数据！");
             }
             CreateRequestCarTicketVo ticketVo = new CreateRequestCarTicketVo();
@@ -219,31 +229,31 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
             ticketVo.setReturnPlanArrangement(draftTicket.getReturnPlanArrangement());
             ticketVo.setOther(draftTicket.getOther());
             ticketVo.setSpecialLoadingRequirement(draftTicket.getSpecialLoadingRequirement());
-            List<ShipmentsPlanDetail> detailList = shipmentsOrderInfo.getDetailList();
-            if (CollectionUtil.isEmpty(detailList)) {
-                continue;
-            }
             // 计划吨位
             BigDecimal totalQuantity = BigDecimal.ZERO;
-            for (ShipmentsPlanDetail detail : detailList) {
-                BigDecimal quantity = detail.getQuantity();
-                if (quantity == null || !orderInfo.getId().equals(detail.getOrderId())) {
-                    continue;
+            LocalTime minTime = null;
+            if (CollectionUtils.isNotEmpty(detailList)) {
+                for (ShipmentsPlanDetail detail : detailList) {
+                    BigDecimal quantity = detail.getQuantity();
+                    if (orderInfo.getId().equals(detail.getOrderId()) && quantity != null) {
+                        totalQuantity = totalQuantity.add(quantity);
+                    }
+                    if (detail.getShipmentsTime() != null) {
+                        if (minTime == null || detail.getShipmentsTime().isBefore(minTime)) {
+                            minTime = detail.getShipmentsTime();
+                        }
+                    }
                 }
-                totalQuantity = totalQuantity.add(quantity);
             }
             ticketVo.setQuantity(totalQuantity);
             // 装货时间处理
-            LocalTime minTime = shipmentsOrderInfo.getDetailList().stream()
-                    .map(ShipmentsPlanDetail::getShipmentsTime)
-                    .min(LocalTime::compareTo)
-                    .orElse(null);
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
             if (minTime != null) {
-                String loadingTime = minTime.format(formatter);
+                String loadingTime = minTime.format(DateTimeFormatter.ofPattern("HH:mm"));
                 ticketVo.setLoadingTime(loadingTime);
             }
-            requestCarTicketService.create(ticketVo);
+            log.info("=====开始创建要车单====" + ticketVo);
+            String ticketId = requestCarTicketService.create(ticketVo);
+            log.info("[CarRequestPlan.generate] 已生成要车单ID={}，订单ID={}，吨位={}", ticketId, orderInfo.getId(), totalQuantity);
         }
     }