楚江erp: 1、要车计划、要成单生成逻辑调整；2、增加发货单编号生成逻辑

@@ -399,9 +399,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
             dataMap.put("totalActualQuantity", totalActualQuantity.doubleValue() > 0 ? totalActualQuantity.setScale(2, RoundingMode.HALF_UP) : null);
             dataMap.put("totalNum", totalNum.doubleValue() > 0 ? totalNum.setScale(2, RoundingMode.HALF_UP) : null);
             dataMap.put("totalPrice", totalPrice.doubleValue() > 0 ? totalPrice.setScale(2, RoundingMode.HALF_UP) : null);
-            // 流水号
-            String serialNumber = createSerialNumber(null, "SHIPMENT_ORDER_SERIAL_NUMBER");
-            dataMap.put("serialNumber", serialNumber);
+            dataMap.put("serialNumber", orderInfo.getCode());
             // 办事处
             String deptId = orderInfo.getDeptId();
             if (StringUtils.isNotBlank(deptId)) {
@@ -437,7 +435,7 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
             // 处理模板中的占位符
             ExcelUtil.processTemplate(workbook, dataMap);
             // 生成文件名
-            String fileName = String.format("发货单_%s.xlsx", serialNumber);
+            String fileName = String.format("发货单_%s.xlsx", orderInfo.getCode());
             File excelFile = new File(tempDir.toFile(), fileName);
             // 保存Excel文件
             try (FileOutputStream fos = new FileOutputStream(excelFile)) {
@@ -532,36 +530,4 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
             log.warn("清理临时文件失败", e);
         }
     }
-
-
-
-    /**
-     * 生成当天流水号
-     *
-     * @return String
-     */
-    public String createSerialNumber(String pre, String key) {
-        // 1. 获取当前年月日（格式：yyyyMMdd）
-        String datePart = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
-        // 2. Redis自增序列
-        Long id = redisTemplate.opsForValue().increment(key, 1);
-        if (id != null && id == 1) {
-            // 计算到次日零点的秒数
-            LocalDateTime now = LocalDateTime.now();
-            LocalDateTime midnight = now.toLocalDate().plusDays(1).atStartOfDay();
-            long secondsUntilMidnight = Duration.between(now, midnight).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;
-    }
 }

@@ -536,17 +536,10 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
             draftRequestCarTicketService.updateExamineUser(businessId, SecurityUtil.getCurrentUser().getId(), null, null);
             //如果是发货计划生成的草稿要车单-需要生成要车单和要车计划
             DraftRequestCarTicket draftRequestCarTicket = draftRequestCarTicketService.findById(businessId);
-            if (StringUtils.isNotEmpty(draftRequestCarTicket.getSource()) && "SHIPMENTSPLAN".equals(draftRequestCarTicket.getSource())) {
-                // 生成要车计划
-                CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo();
-                planCreateVo.setRequestCarDate(LocalDate.now());
-                planCreateVo.setWorkshopId(draftRequestCarTicket.getWorkshopId());
-                String requestCarPlanId = carRequestPlanService.create(planCreateVo);
-                // 生成要车单
-                CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(draftRequestCarTicket, requestCarPlanId, variable);
-                requestCarTicketService.create(ticketCreateVo);
+            if (draftRequestCarTicket != null && "SHIPMENTSPLAN".equals(draftRequestCarTicket.getSource())) {
                 // 处理发货单
-                List<String> orderIds = shipmentsPlanDetailService.getOrderIdByShipmentOrderId(ticketCreateVo.getShipmentsOrderId());
+                String shipmentOrderId = (String) redisHandler.get("GET_SHIPMENTS_ORDER_ID_" + draftRequestCarTicket.getId());
+                List<String> orderIds = shipmentsPlanDetailService.getOrderIdByShipmentOrderId(shipmentOrderId);
                 List<DraftRequestCarTicket> draftRequestCarTicketList = draftRequestCarTicketService.listByOrderId(orderIds);
                 if (CollectionUtils.isNotEmpty(draftRequestCarTicketList)) {
                     boolean flag = true;
@@ -561,7 +554,7 @@ public class BusinessDataHandlerServiceImpl implements BusinessDataHandlerServic
                     }
                     if (flag) {
                         // 更新订货单状态（草稿转为正常）
-                        shipmentsOrderInfoService.updateStatus(ticketCreateVo.getShipmentsOrderId(), "UN_SHIPMENTS");
+                        shipmentsOrderInfoService.updateStatus(shipmentOrderId, "UN_SHIPMENTS");
                     }
                 }
             }

@@ -37,11 +37,10 @@ import com.lframework.xingyun.sc.service.shipments.ShipmentsPlanService;
 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.RequestCarTicketService;
+import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
 import com.lframework.xingyun.sc.utils.CommonUtil;
 import com.lframework.xingyun.sc.vo.sample.tracking.CreateSampleResultTrackingVo;
-import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateDraftRequestCarTicketVo;
-import com.lframework.xingyun.sc.vo.shipments.car.CreateRequestCarTicketVo;
 import com.lframework.xingyun.sc.vo.shipments.order.*;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanDetailVo;
 import lombok.extern.slf4j.Slf4j;
@@ -59,7 +58,7 @@ import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
+import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -102,6 +101,8 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     private SampleResultTrackingService sampleResultTrackingService;
     @Resource
     private SampleResultFeedbackService sampleResultFeedbackService;
+    @Resource
+    private ShipmentDetailStatisticsService shipmentDetailStatisticsService;
 
 
     @Override
@@ -462,6 +463,11 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         if (BooleanUtils.isTrue(vo.getOnTimeShipment()) && !now.isBefore(shipmentsDate)) {
             // 生成应收款台账明细数据
             receiptLedgerInfoService.generateLedgerInfo(Collections.singletonList(orderInfo));
+            // 生成发货明细报表数据
+            shipmentDetailStatisticsService.generateStatisticsData(detailIds);
+            // 生成要车计划、要车单数据
+            ShipmentsOrderInfo shipmentsOrderInfo = findById(shipmentsOrderId);
+            carRequestPlanService.generate(orderInfoList, shipmentsOrderInfo);
         }
         //生成产品试样结果跟踪单
         if (CollectionUtils.isNotEmpty(orderIds)) {
@@ -782,6 +788,15 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
             // 封装发货单数据
             ShipmentsOrderInfo shipmentsOrderInfo = new ShipmentsOrderInfo();
             shipmentsOrderInfo.setId(id);
+            // 发货单编号处理
+            // 获取当月最后一天的23:59:59
+            LocalDateTime monthEnd = LocalDateTime.now()
+                    .with(TemporalAdjusters.lastDayOfMonth())
+                    .withHour(23)
+                    .withMinute(59)
+                    .withSecond(59);
+            String serialNumber = CommonUtil.generateSerialNumber(null, "", "yyMM", LocalDateTime.now(), monthEnd);
+            shipmentsOrderInfo.setCode(serialNumber);
             shipmentsOrderInfo.setPlanId(planId);
             shipmentsOrderInfo.setCustomerId(customerId);
             shipmentsOrderInfo.setWorkshopId(plan.getWorkshopId());
@@ -859,20 +874,6 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 mqProducerService.createSysSiteMessage(messageDto);
                 // 更新发货单状态为草稿
                 updateStatus(shipmentsOrderId, "DRAFT");
-                continue;
-            }
-            if ("PASS".equals(draftTicket.getStatus())) {
-                // 生成要车计划
-                CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo();
-                planCreateVo.setRequestCarDate(LocalDate.now());
-                planCreateVo.setWorkshopId(orderInfo.getWorkshopId());
-                String requestCarPlanId = carRequestPlanService.create(planCreateVo);
-                // 生成要车单
-                CreateRequestCarTicketVo ticketCreateVo = packRequestCarTicket(orderInfo, requestCarPlanId, draftTicket,
-                        plan.getTomoPreShipDate(), quantity, shipmentsOrderId);
-                requestCarTicketService.create(ticketCreateVo);
-            } else {
-                throw new DefaultClientException("请先补充草稿要车单数据！");
             }
         }
     }
@@ -901,51 +902,6 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
         return draftTicketVo;
     }
 
-    /**
-     * 封装要车单数据
-     *
-     * @param orderInfo 订货单数据
-     * @return CreateRequestCarTicketVo
-     */
-    private CreateRequestCarTicketVo packRequestCarTicket(PurchaseOrderInfo orderInfo, String planId, DraftRequestCarTicket draftTicket,
-                                                          LocalDate shipmentsDate, BigDecimal quantity, String shipmentsOrderId) {
-        QueryShipmentsPlanDetailVo vo = new QueryShipmentsPlanDetailVo();
-        vo.setShipmentsOrderId(shipmentsOrderId);
-        vo.setOrderId(orderInfo.getId());
-        List<ShipmentsPlanDetail> details = shipmentsPlanDetailService.query(vo);
-        LocalTime minTime = details.stream()
-                .map(ShipmentsPlanDetail::getShipmentsTime)
-                .min(LocalTime::compareTo)
-                .orElse(null);
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
-        String loadingTime = minTime.format(formatter);
-
-        CreateRequestCarTicketVo ticketVo = new CreateRequestCarTicketVo();
-        ticketVo.setDraftId(draftTicket.getId());
-        ticketVo.setPlanId(planId);
-        ticketVo.setPurchaseOrderId(orderInfo.getId());
-        ticketVo.setRequestCarDate(LocalDate.now());
-        ticketVo.setDeptId(orderInfo.getDeptId());
-        ticketVo.setDeliveryDate(shipmentsDate);
-        ticketVo.setWorkshopId(orderInfo.getWorkshopId());
-        ticketVo.setOrderNo(orderInfo.getOrderNo());
-        ticketVo.setOrderingUnit(orderInfo.getOrderingUnit());
-        ticketVo.setQuantity(quantity);
-        ticketVo.setShipmentsOrderId(shipmentsOrderId);
-        //外办审核人(草稿要车单审核人)
-        ticketVo.setExternalAuditor(draftTicket.getExternalAuditor());
-        //经营办审核人(发货计划提交人)
-        ticketVo.setBusinessOfficeAuditor(SecurityUtil.getCurrentUser().getId());
-        ticketVo.setDestination(draftTicket.getDestination());
-        ticketVo.setConsignee(draftTicket.getConsignee());
-        ticketVo.setPhone(draftTicket.getPhone());
-        ticketVo.setReturnPlanArrangement(draftTicket.getReturnPlanArrangement());
-        ticketVo.setOther(draftTicket.getOther());
-        ticketVo.setSpecialLoadingRequirement(draftTicket.getSpecialLoadingRequirement());
-        ticketVo.setLoadingTime(loadingTime);
-        return ticketVo;
-    }
-
 
     /**
      * 数据过滤

@@ -18,27 +18,31 @@ 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 com.lframework.xingyun.sc.entity.CarRequestPlan;
-import com.lframework.xingyun.sc.entity.RequestCarTicket;
+import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.mappers.CarRequestPlanMapper;
 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.RequestCarTicketService;
-import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
-import com.lframework.xingyun.sc.vo.shipments.car.QueryCarRequestPlanVo;
-import com.lframework.xingyun.sc.vo.shipments.car.QueryRequestCarTicketVo;
-import com.lframework.xingyun.sc.vo.shipments.car.UpdateCarRequestPlanVo;
+import com.lframework.xingyun.sc.vo.shipments.car.*;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.time.LocalDate;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
 public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanMapper, CarRequestPlan> implements CarRequestPlanService {
     @Resource
     private RequestCarTicketService requestCarTicketService;
+    @Resource
+    private DraftRequestCarTicketService draftRequestCarTicketService;
 
     @Override
     public PageResult<CarRequestPlan> query(Integer pageIndex, Integer pageSize, QueryCarRequestPlanVo vo) {
@@ -145,6 +149,68 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void generate(List<PurchaseOrderInfo> orderInfoList, ShipmentsOrderInfo shipmentsOrderInfo) {
+        if (CollectionUtils.isEmpty(orderInfoList) || shipmentsOrderInfo == null) {
+            return;
+        }
+        List<String> orderIds = orderInfoList.stream().map(PurchaseOrderInfo::getId).collect(Collectors.toList());
+        // 根据订货单获取草稿要车单
+        List<DraftRequestCarTicket> draftTickets = draftRequestCarTicketService.listByOrderId(orderIds);
+        Map<String, DraftRequestCarTicket> draftTicketMap = draftTickets.stream().collect(Collectors.toMap(DraftRequestCarTicket::getPurchaseOrderId, Function.identity()
+                , (v1, v2) -> v2));
+        for (PurchaseOrderInfo orderInfo : orderInfoList) {
+            // 生成要车计划
+            CreateCarRequestPlanVo planCreateVo = new CreateCarRequestPlanVo();
+            planCreateVo.setRequestCarDate(LocalDate.now());
+            planCreateVo.setWorkshopId(orderInfo.getWorkshopId());
+            String requestCarPlanId = create(planCreateVo);
+            // 生成要车单
+            DraftRequestCarTicket draftTicket = draftTicketMap.get(orderInfo.getId());
+            if (draftTicket == null) {
+                throw new DefaultClientException("请先补充草稿要车单数据！");
+            }
+            CreateRequestCarTicketVo ticketVo = new CreateRequestCarTicketVo();
+            ticketVo.setDraftId(draftTicket.getId());
+            ticketVo.setPlanId(requestCarPlanId);
+            ticketVo.setPurchaseOrderId(orderInfo.getId());
+            ticketVo.setRequestCarDate(LocalDate.now());
+            ticketVo.setDeptId(orderInfo.getDeptId());
+            if (BooleanUtils.isFalse(shipmentsOrderInfo.getOnTimeShipment())) {
+                ticketVo.setDeliveryDate(shipmentsOrderInfo.getNewShipmentDate());
+            } else {
+                ticketVo.setDeliveryDate(shipmentsOrderInfo.getShipmentsDate());
+            }
+            ticketVo.setWorkshopId(orderInfo.getWorkshopId());
+            ticketVo.setOrderNo(orderInfo.getOrderNo());
+            ticketVo.setOrderingUnit(orderInfo.getOrderingUnit());
+            ticketVo.setQuantity(orderInfo.getTotalQuantity());
+            ticketVo.setShipmentsOrderId(shipmentsOrderInfo.getId());
+            //外办审核人(草稿要车单审核人)
+            ticketVo.setExternalAuditor(draftTicket.getExternalAuditor());
+            //经营办审核人(发货计划提交人)
+            ticketVo.setBusinessOfficeAuditor(SecurityUtil.getCurrentUser().getId());
+            ticketVo.setDestination(draftTicket.getDestination());
+            ticketVo.setConsignee(draftTicket.getConsignee());
+            ticketVo.setPhone(draftTicket.getPhone());
+            ticketVo.setReturnPlanArrangement(draftTicket.getReturnPlanArrangement());
+            ticketVo.setOther(draftTicket.getOther());
+            ticketVo.setSpecialLoadingRequirement(draftTicket.getSpecialLoadingRequirement());
+            // 装货时间处理
+            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);
+                ticketVo.setLoadingTime(loadingTime);
+            }
+            requestCarTicketService.create(ticketVo);
+        }
+    }
+
+    @Override
     public void cleanCacheByKey(Serializable key) {
 
     }

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.service.shipments.car;
 import com.lframework.starter.web.core.service.BaseMpService;
 import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.xingyun.sc.entity.CarRequestPlan;
+import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
+import com.lframework.xingyun.sc.entity.ShipmentsOrderInfo;
 import com.lframework.xingyun.sc.vo.shipments.car.CreateCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryCarRequestPlanVo;
 import com.lframework.xingyun.sc.vo.shipments.car.UpdateCarRequestPlanVo;
@@ -52,4 +54,12 @@ public interface CarRequestPlanService extends BaseMpService<CarRequestPlan> {
      * @return
      */
     void deleteById(String id);
+
+    /**
+     * 生成要车计划、要车单数据
+     *
+     * @param orderInfoList         订货单数据
+     * @param shipmentsOrderInfo    发货单信息
+     */
+    void generate(List<PurchaseOrderInfo> orderInfoList, ShipmentsOrderInfo shipmentsOrderInfo);
 }

 package com.lframework.xingyun.sc.utils;
 
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.data.redis.core.RedisTemplate;
 
 import java.io.*;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.Year;
-import java.time.YearMonth;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 public class CommonUtil {
@@ -169,4 +170,38 @@ public class CommonUtil {
         }
         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;
+    }
 }

@@ -83,6 +83,7 @@
     <insert id="batchAdd">
         INSERT INTO shipments_order_info (
         id,
+        code,
         plan_id,
         customer_id,
         workshop_id,
@@ -99,6 +100,7 @@
         <foreach collection="list" item="item" separator=",">
             (
             #{item.id},
+            #{item.code},
             #{item.planId},
             #{item.customerId},
             #{item.workshopId},