Merge remote-tracking branch 'origin/master_sample_order' into master_sample_order

@@ -33,6 +33,7 @@ import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanDetailService;
+import com.lframework.xingyun.sc.service.shipments.car.CarRequestPlanService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.shipments.car.DraftRequestCarTicketService;
 import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.utils.CommonUtil;
@@ -91,6 +92,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
     private FundOrderingUnitDetailService fundOrderingUnitDetailService;
     private FundOrderingUnitDetailService fundOrderingUnitDetailService;
     @Resource
     @Resource
     private ShipmentDetailStatisticsService shipmentDetailStatisticsService;
     private ShipmentDetailStatisticsService shipmentDetailStatisticsService;
+    @Resource
+    private CarRequestPlanService carRequestPlanService;
 
 
 
 
     // 定义状态优先级顺序（从高到低）
     // 定义状态优先级顺序（从高到低）
@@ -793,6 +796,8 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         generateLedgerInfo(shipmentsOrderInfos);
         generateLedgerInfo(shipmentsOrderInfos);
         // 生成发货明细报表数据
         // 生成发货明细报表数据
         shipmentDetailStatisticsService.generateStatisticsData(detailIds);
         shipmentDetailStatisticsService.generateStatisticsData(detailIds);
+        // 生成要车计划、要车单
+        generateCarPlanAndTicket(shipmentsOrderInfos);
     }
     }
 
 
     @Override
     @Override
@@ -1308,4 +1313,25 @@ public class ReceiptLedgerInfoServiceImpl extends BaseMpServiceImpl<ReceiptLedge
         }
         }
         dataList.add(data);
         dataList.add(data);
     }
     }
+
+
+    /**
+     * 生成要车计划、要车单
+     *
+     * @param shipmentsOrderInfoList    发货单数据
+     */
+    private void generateCarPlanAndTicket(List<ShipmentsOrderInfo> shipmentsOrderInfoList) {
+        if (CollectionUtils.isEmpty(shipmentsOrderInfoList)) {
+            return;
+        }
+        for (ShipmentsOrderInfo shipmentsOrderInfo : shipmentsOrderInfoList) {
+            List<ShipmentsPlanDetail> detailList = shipmentsOrderInfo.getDetailList();
+            if (CollectionUtils.isEmpty(detailList)) {
+                continue;
+            }
+            List<String> orderIds = detailList.stream().map(ShipmentsPlanDetail::getOrderId).distinct().collect(Collectors.toList());
+            List<PurchaseOrderInfo> orderInfoList = purchaseOrderInfoService.listByIds(orderIds);
+            carRequestPlanService.generate(orderInfoList, shipmentsOrderInfo);
+        }
+    }
 }
 }

@@ -48,6 +48,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
 import com.lframework.xingyun.sc.mappers.ShipmentsOrderInfoMapper;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
 import com.lframework.xingyun.sc.service.shipments.ShipmentsOrderInfoService;
@@ -55,11 +56,14 @@ import org.springframework.stereotype.Service;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -103,6 +107,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     private SampleResultFeedbackService sampleResultFeedbackService;
     private SampleResultFeedbackService sampleResultFeedbackService;
     @Resource
     @Resource
     private ShipmentDetailStatisticsService shipmentDetailStatisticsService;
     private ShipmentDetailStatisticsService shipmentDetailStatisticsService;
+    @Resource
+    private RedisTemplate redisTemplate;
 
 
 
 
     @Override
     @Override
@@ -681,6 +687,29 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         return shipmentsOrderInfos;
         return shipmentsOrderInfos;
     }
     }
 
 
+    @Override
+    public String generateSerialNumber(String pre, String key, String format, LocalDateTime startTime, LocalDateTime endTime) {
+        // 获取当前时间，并做格式化处理
+        String datePart = LocalDate.now().format(DateTimeFormatter.ofPattern(format));
+        // Redis自增序列
+        Long id = redisTemplate.opsForValue().increment(key, 1);
+        if (id != null && id == 1) {
+            // 计算时间差（秒）
+            long secondsUntilMidnight = Duration.between(startTime, endTime).getSeconds();
+            redisTemplate.expire(key, secondsUntilMidnight, TimeUnit.SECONDS);
+        }
+        // 补零到4位
+        String incrPart = String.format("%04d", id);
+        // 拼接最终结果
+        String result = "";
+        if (StringUtils.isBlank(pre)) {
+            result = datePart + incrPart;
+        } else {
+            result = pre + datePart + incrPart;
+        }
+        return result;
+    }
+
 
 
     /**
     /**
      * 处理批次数据
      * 处理批次数据
@@ -795,7 +824,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                     .withHour(23)
                     .withHour(23)
                     .withMinute(59)
                     .withMinute(59)
                     .withSecond(59);
                     .withSecond(59);
-            String serialNumber = CommonUtil.generateSerialNumber(null, "", "yyMM", LocalDateTime.now(), monthEnd);
+            String serialNumber = generateSerialNumber(null, "", "yyMM", LocalDateTime.now(), monthEnd);
             shipmentsOrderInfo.setCode(serialNumber);
             shipmentsOrderInfo.setCode(serialNumber);
             shipmentsOrderInfo.setPlanId(planId);
             shipmentsOrderInfo.setPlanId(planId);
             shipmentsOrderInfo.setCustomerId(customerId);
             shipmentsOrderInfo.setCustomerId(customerId);

@@ -196,6 +196,10 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
             ticketVo.setReturnPlanArrangement(draftTicket.getReturnPlanArrangement());
             ticketVo.setReturnPlanArrangement(draftTicket.getReturnPlanArrangement());
             ticketVo.setOther(draftTicket.getOther());
             ticketVo.setOther(draftTicket.getOther());
             ticketVo.setSpecialLoadingRequirement(draftTicket.getSpecialLoadingRequirement());
             ticketVo.setSpecialLoadingRequirement(draftTicket.getSpecialLoadingRequirement());
+            List<ShipmentsPlanDetail> detailList = shipmentsOrderInfo.getDetailList();
+            if (CollectionUtil.isEmpty(detailList)) {
+                continue;
+            }
             // 装货时间处理
             // 装货时间处理
             LocalTime minTime = shipmentsOrderInfo.getDetailList().stream()
             LocalTime minTime = shipmentsOrderInfo.getDetailList().stream()
                     .map(ShipmentsPlanDetail::getShipmentsTime)
                     .map(ShipmentsPlanDetail::getShipmentsTime)

@@ -6,6 +6,7 @@ import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.components.resp.PageResult;
 
 
 import java.time.LocalDate;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -126,4 +127,16 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
      * @return              List<ShipmentsOrderInfo>
      * @return              List<ShipmentsOrderInfo>
      */
      */
     List<ShipmentsOrderInfo> queryByShipmentDate(LocalDate shipmentDate);
     List<ShipmentsOrderInfo> queryByShipmentDate(LocalDate shipmentDate);
+
+    /**
+     * 生成流水号
+     *
+     * @param pre           流水号前缀
+     * @param key           缓存key
+     * @param format        时间格式
+     * @param startTime     缓存开始时间
+     * @param endTime       缓存到期时间
+     * @return              String
+     */
+    String generateSerialNumber(String pre, String key, String format, LocalDateTime startTime, LocalDateTime endTime);
 }
 }

 package com.lframework.xingyun.sc.utils;
 package com.lframework.xingyun.sc.utils;
 
 
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-import com.lframework.starter.web.core.utils.ApplicationUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
 
 
 import java.io.*;
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
@@ -15,7 +12,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 
 @Slf4j
 @Slf4j
 public class CommonUtil {
 public class CommonUtil {
@@ -170,38 +166,4 @@ public class CommonUtil {
         }
         }
         return String.valueOf(num);
         return String.valueOf(num);
     }
     }
-
-
-    /**
-     * 生成流水号
-     *
-     * @param pre           流水号前缀
-     * @param key           缓存key
-     * @param format        时间格式
-     * @param startTime     缓存开始时间
-     * @param endTime       缓存到期时间
-     * @return              String
-     */
-    public static String generateSerialNumber(String pre, String key, String format, LocalDateTime startTime, LocalDateTime endTime) {
-        // 1. 获取当前时间，并做格式化处理
-        String datePart = LocalDate.now().format(DateTimeFormatter.ofPattern(format));
-        // 2. Redis自增序列
-        RedisTemplate redisTemplate = ApplicationUtil.getBean(RedisTemplate.class);
-        Long id = redisTemplate.opsForValue().increment(key, 1);
-        if (id != null && id == 1) {
-            // 计算时间差（秒）
-            long secondsUntilMidnight = Duration.between(startTime, endTime).getSeconds();
-            redisTemplate.expire(key, secondsUntilMidnight, TimeUnit.SECONDS);
-        }
-        // 3. 补零到4位
-        String incrPart = String.format("%04d", id);
-        // 4. 拼接最终结果
-        String result = "";
-        if (StringUtils.isBlank(pre)) {
-            result = datePart + incrPart;
-        } else {
-            result = pre + datePart + incrPart;
-        }
-        return result;
-    }
 }
 }