添加数据验证

@@ -183,3 +183,4 @@ public class DeliveryMainController {
 }
 
 
+

@@ -186,3 +186,4 @@ public class InvoiceMainController {
 }
 
 
+

@@ -62,3 +62,4 @@ public class DeliveryAddReq {
 }
 
 
+

@@ -38,3 +38,4 @@ public class DeliveryItemAddReq {
 }
 
 
+

@@ -60,3 +60,4 @@ public class DeliveryItemRes {
 }
 
 
+

@@ -41,3 +41,4 @@ public class DeliveryItemUpdateReq {
 }
 
 
+

@@ -68,3 +68,4 @@ public class DeliveryRes {
 }
 
 
+

@@ -66,3 +66,4 @@ public class DeliveryUpdateReq {
 }
 
 
+

@@ -43,3 +43,4 @@ public class InvoiceItemAddReq {
 }
 
 
+

@@ -63,3 +63,4 @@ public class InvoiceItemRes {
 }
 
 
+

@@ -46,3 +46,4 @@ public class InvoiceItemUpdateReq {
 }
 
 
+

@@ -56,3 +56,4 @@ public class InvoiceQueryReq {
 }
 
 
+

@@ -67,3 +67,4 @@ public class DeliveryItem {
 }
 
 
+

@@ -3,6 +3,7 @@ package com.apple.erp.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,6 +29,10 @@ public class ExceptionWorkorder {
     @Schema(description = "工单编号")
     private String workorderNo;
 
+    @Schema(description = "当日序列号，用于生成工单号")
+    @TableField("`index`")
+    private Integer index;
+
     @Schema(description = "关联订单编号")
     private String orderNo;
 

@@ -73,3 +73,4 @@ public class InvoiceItem {
 }
 
 
+

@@ -82,3 +82,4 @@ public class InvoiceMain {
 }
 
 
+

@@ -79,6 +79,12 @@ public class Rebate {
     private Integer calcFlag;
 
     /**
+     * 序列号索引（用于生成RebateNo）
+     */
+    @TableField("t_index")
+    private Integer tIndex;
+
+    /**
      * 数据上传时间
      */
     @TableField("upload_time")

+package com.apple.erp.exception;
+
+/**
+ * 经销商不匹配异常
+ * 当出库单中的经销商与关联订单中的经销商不一致时抛出此异常
+ * 
+ * @author Apple ERP System
+ * @since 2025-01-01
+ */
+public class DealerMismatchException extends RuntimeException {
+
+    public DealerMismatchException(String message) {
+        super(message);
+    }
+
+    public DealerMismatchException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

+package com.apple.erp.exception;
+
+/**
+ * 发票验证异常
+ * 当发票中的经销商与关联订单或出库单中的经销商不一致时抛出此异常
+ * 
+ * @author Apple ERP System
+ * @since 2025-01-01
+ */
+public class InvoiceValidationException extends RuntimeException {
+
+    public InvoiceValidationException(String message) {
+        super(message);
+    }
+
+    public InvoiceValidationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

@@ -15,3 +15,4 @@ public interface DeliveryItemMapper extends BaseMapper<DeliveryItem> {
 }
 
 
+

@@ -3,6 +3,8 @@ package com.apple.erp.mapper;
 import com.apple.erp.entity.DeliveryMain;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * 出库主表Mapper接口
@@ -12,6 +14,16 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface DeliveryMainMapper extends BaseMapper<DeliveryMain> {
+    
+    /**
+     * 根据出库单号查询出库单
+     * 
+     * @param deliveryNo 出库单号
+     * @return 出库单信息
+     */
+    @Select("SELECT * FROM t_delivery_main WHERE delivery_no = #{deliveryNo} AND del_flag = '0'")
+    DeliveryMain selectByDeliveryNo(@Param("deliveryNo") String deliveryNo);
 }
 
 
+

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -62,4 +64,13 @@ public interface ExceptionWorkorderMapper extends BaseMapper<ExceptionWorkorder>
      * @return 异常工单列表（不分页）
      */
     List<ExceptionWorkorderRes> selectExceptionWorkorderListForExport(@Param("query") ExceptionWorkorderQueryReq queryReq);
+
+    /**
+     * 获取指定日期的最大序列号
+     * 
+     * @param date 日期
+     * @return 最大序列号，如果没有记录则返回0
+     */
+    @Select("SELECT COALESCE(MAX(`index`), 0) FROM t_exception_workorder WHERE DATE(create_time) = #{date} AND del_flag = '0'")
+    Integer getMaxIndexByDate(@Param("date") LocalDate date);
 }

@@ -15,3 +15,4 @@ public interface InvoiceItemMapper extends BaseMapper<InvoiceItem> {
 }
 
 
+

@@ -15,3 +15,4 @@ public interface InvoiceMainMapper extends BaseMapper<InvoiceMain> {
 }
 
 
+

@@ -3,6 +3,10 @@ package com.apple.erp.mapper;
 import com.apple.erp.entity.OrderMain;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.time.LocalDateTime;
 
 /**
  * 订单主表Mapper接口
@@ -12,5 +16,23 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface OrderMainMapper extends BaseMapper<OrderMain> {
+    
+    /**
+     * 根据订单号查询订单
+     * 
+     * @param orderNo 订单号
+     * @return 订单信息
+     */
+    @Select("SELECT * FROM t_order_main WHERE order_no = #{orderNo} AND del_flag = '0'")
+    OrderMain selectByOrderNo(@Param("orderNo") String orderNo);
+    
+    /**
+     * 获取订单的最新出库时间
+     * 
+     * @param orderNo 订单号
+     * @return 最新出库时间
+     */
+    @Select("SELECT MAX(delivery_date) FROM t_delivery_main WHERE order_no = #{orderNo} AND del_flag = '0'")
+    LocalDateTime getLatestDeliveryTimeByOrderNo(@Param("orderNo") String orderNo);
 }
 

@@ -71,6 +71,14 @@ public interface RebateMapper extends BaseMapper<Rebate> {
     Rebate selectByRebateNo(@Param("rebateNo") String rebateNo);
 
     /**
+     * 获取指定日期的最大序列号
+     * 
+     * @param rebateDate 返利日期
+     * @return 最大序列号
+     */
+    Integer getMaxIndexByDate(@Param("rebateDate") String rebateDate);
+
+    /**
      * 获取返利月度统计数据
      * 
      * @param year 年份

@@ -84,3 +84,4 @@ public interface DeliveryMainService extends IService<DeliveryMain> {
 }
 
 
+

@@ -84,3 +84,4 @@ public interface InvoiceMainService extends IService<InvoiceMain> {
 }
 
 
+

+package com.apple.erp.service;
+
+/**
+ * 返利结转服务
+ */
+public interface RebateSettlementService {
+
+    /**
+     * 若订单已出库且已开票，且未计算，则扣减经销商待返利并生成台账，并将订单标记为已计算。
+     *
+     * @param orderNo    订单编号
+     * @param dealerCode 经销商编码
+     * @param dealerName 经销商名称
+     */
+    void settleIfReady(String orderNo, String dealerCode, String dealerName);
+}
+
+

@@ -3,8 +3,13 @@ package com.apple.erp.service.impl;
 import com.apple.erp.dto.*;
 import com.apple.erp.entity.DeliveryItem;
 import com.apple.erp.entity.OrderMain;
+// rebate settlement handled by RebateSettlementService
+import com.apple.erp.service.RebateSettlementService;
 import com.apple.erp.mapper.DeliveryItemMapper;
 import com.apple.erp.mapper.OrderMainMapper;
+// removed unused mapper imports after delegating settlement logic
+import com.apple.erp.util.TimingValidationUtil;
+import com.apple.erp.exception.DealerMismatchException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -42,6 +47,14 @@ public class DeliveryMainServiceImpl extends ServiceImpl<DeliveryMainMapper, Del
     @Autowired
     private OrderMainMapper orderMainMapper;
 
+    @Autowired
+    private TimingValidationUtil timingValidationUtil;
+
+    // rebate settlement is delegated; no local mapper usage required
+
+    @Autowired
+    private RebateSettlementService rebateSettlementService;
+
     private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
     @Override
@@ -118,11 +131,37 @@ public class DeliveryMainServiceImpl extends ServiceImpl<DeliveryMainMapper, Del
             throw new IllegalArgumentException("关联的订单编号不存在");
         }
 
+        // 验证出库单中的经销商与关联订单中的经销商是否一致
+        validateDealerConsistency(addReq.getOrderNo(), addReq.getDealerCode());
+
+        boolean isValid = true;
+        // 时序逻辑验证：出库时间不得晚于订单创建时间
+        if (StringUtils.hasText(addReq.getDeliveryDate())) {
+            LocalDateTime deliveryTime = parseDateTime(addReq.getDeliveryDate());
+            TimingValidationUtil.ValidationResult validationResult =
+                    timingValidationUtil.validateDeliveryTiming(addReq.getOrderNo(), deliveryTime);
+            isValid = validationResult.isValid();
+            if (!validationResult.isValid()) {
+                // 创建异常工单
+                Long workorderId = timingValidationUtil.createExceptionWorkorder(
+                        addReq.getOrderNo(),
+                        addReq.getDealerCode(),
+                        addReq.getDealerName(),
+                        validationResult.getExceptionType(),
+                        validationResult.getExceptionDescription(),
+                        "DELIVERY",
+                        null // 出库单ID在插入后设置
+                );
+                log.warn("出库单时序验证失败，已创建异常工单[{}]: {}", workorderId, validationResult.getExceptionDescription());
+                // 继续执行出库单创建，但记录异常
+            }
+        }
+
         DeliveryMain deliveryMain = new DeliveryMain();
         BeanUtils.copyProperties(addReq, deliveryMain);
         deliveryMain.setCreateTime(LocalDateTime.now());
         deliveryMain.setUpdateTime(LocalDateTime.now());
-        if(StringUtils.hasText(addReq.getDeliveryDate())) {
+        if (StringUtils.hasText(addReq.getDeliveryDate())) {
             deliveryMain.setDeliveryDate(parseDateTime(addReq.getDeliveryDate()));
         }
         deliveryMain.setDelFlag("0");
@@ -139,6 +178,12 @@ public class DeliveryMainServiceImpl extends ServiceImpl<DeliveryMainMapper, Del
                 deliveryItem.setDelFlag("0");
                 deliveryItemMapper.insert(deliveryItem);
             }
+            if (isValid) {
+                // 更新关联订单的出库状态为已出库（1）
+                updateOrderDeliveryStatusToShipped(deliveryMain.getOrderNo());
+            }
+            // 方法末尾：结转返利（若订单已出库且已开票且未计算）
+            rebateSettlementService.settleIfReady(deliveryMain.getOrderNo(), deliveryMain.getDealerCode(), deliveryMain.getDealerName());
             return true;
         }
         return false;
@@ -157,6 +202,34 @@ public class DeliveryMainServiceImpl extends ServiceImpl<DeliveryMainMapper, Del
             throw new IllegalArgumentException("关联的订单编号不存在");
         }
 
+        // 验证出库单中的经销商与关联订单中的经销商是否一致
+        validateDealerConsistency(updateReq.getOrderNo(), updateReq.getDealerCode());
+
+        boolean isValid = true;
+        // 时序逻辑验证：出库时间不得晚于订单创建时间
+        if (updateReq.getDeliveryDate() != null) {
+            LocalDateTime deliveryTime = updateReq.getDeliveryDate();
+            TimingValidationUtil.ValidationResult validationResult =
+                    timingValidationUtil.validateDeliveryTiming(updateReq.getOrderNo(), deliveryTime);
+            isValid = validationResult.isValid();
+            if (!validationResult.isValid()) {
+                // 创建异常工单
+                Long workorderId = timingValidationUtil.createExceptionWorkorder(
+                        updateReq.getOrderNo(),
+                        updateReq.getDealerCode(),
+                        updateReq.getDealerName(),
+                        validationResult.getExceptionType(),
+                        validationResult.getExceptionDescription(),
+                        "DELIVERY",
+                        updateReq.getDeliveryId()
+                );
+
+                log.warn("出库单修改时序验证失败，已创建异常工单[{}]: {}", workorderId, validationResult.getExceptionDescription());
+
+                // 继续执行出库单修改，但记录异常
+            }
+        }
+
         DeliveryMain deliveryMain = new DeliveryMain();
         BeanUtils.copyProperties(updateReq, deliveryMain);
         deliveryMain.setUpdateTime(LocalDateTime.now());
@@ -179,11 +252,39 @@ public class DeliveryMainServiceImpl extends ServiceImpl<DeliveryMainMapper, Del
                 deliveryItem.setDelFlag("0");
                 deliveryItemMapper.insert(deliveryItem);
             }
+
+            if(isValid)
+            {
+                // 订单主表状态（根据订单编号）
+                updateOrderDeliveryStatusToShipped(updateReq.getOrderNo());
+            }
+            // 方法末尾：结转返利（若订单已出库且已开票且未计算）
+            rebateSettlementService.settleIfReady(updateReq.getOrderNo(), updateReq.getDealerCode(), updateReq.getDealerName());
             return true;
         }
         return false;
     }
 
+    /**
+     * 将关联订单的出库状态置为已出库（1）
+     *
+     * @param orderNo 关联订单编号
+     */
+    private void updateOrderDeliveryStatusToShipped(String orderNo) {
+        try {
+            OrderMain order = orderMainMapper.selectByOrderNo(orderNo);
+            if (order != null && !"2".equals(order.getDelFlag())) {
+                order.setDeliveryStatus(1);
+                order.setUpdateTime(LocalDateTime.now());
+                orderMainMapper.updateById(order);
+            }
+        } catch (Exception e) {
+            log.warn("更新订单出库状态失败: orderNo={}, err={}", orderNo, e.getMessage());
+        }
+    }
+
+    // 结转逻辑已抽取到 RebateSettlementService
+
     @Override
     @Transactional
     public boolean deleteDelivery(Long deliveryId) {
@@ -218,6 +319,7 @@ public class DeliveryMainServiceImpl extends ServiceImpl<DeliveryMainMapper, Del
 
     /**
      * 检查出库单编号是否已存在
+     *
      * @param deliveryNo        出库单编号
      * @param excludeDeliveryId 排除的出库单ID（用于修改时）
      * @return 是否存在
@@ -234,6 +336,7 @@ public class DeliveryMainServiceImpl extends ServiceImpl<DeliveryMainMapper, Del
 
     /**
      * 检查订单编号是否在订单管理中存在
+     *
      * @param orderNo 订单编号
      * @return 是否存在
      */
@@ -244,6 +347,30 @@ public class DeliveryMainServiceImpl extends ServiceImpl<DeliveryMainMapper, Del
         return orderMainMapper.selectCount(queryWrapper) > 0;
     }
 
+    /**
+     * 验证出库单中的经销商与关联订单中的经销商是否一致
+     *
+     * @param orderNo 订单编号
+     * @param deliveryDealerCode 出库单中的经销商编码
+     * @throws DealerMismatchException 当经销商不一致时抛出异常
+     */
+    private void validateDealerConsistency(String orderNo, String deliveryDealerCode) {
+        // 根据订单编号查询订单信息
+        OrderMain order = orderMainMapper.selectByOrderNo(orderNo);
+        if (order == null) {
+            throw new IllegalArgumentException("关联的订单不存在");
+        }
+
+        // 比较经销商编码
+        if (!deliveryDealerCode.equals(order.getDealerCode())) {
+            String errorMessage = String.format(
+                "出库单中的经销商编码[%s]与关联订单[%s]中的经销商编码[%s]不一致",
+                deliveryDealerCode, orderNo, order.getDealerCode()
+            );
+            throw new DealerMismatchException(errorMessage);
+        }
+    }
+
     private LocalDateTime parseDateTime(String dateTimeStr) {
         if (!StringUtils.hasText(dateTimeStr)) {
             return null;

@@ -2,7 +2,16 @@ package com.apple.erp.service.impl;
 
 import com.apple.erp.dto.*;
 import com.apple.erp.entity.InvoiceItem;
+import com.apple.erp.entity.OrderMain;
+import com.apple.erp.entity.DeliveryMain;
+// rebate settlement handled by RebateSettlementService
+import com.apple.erp.service.RebateSettlementService;
 import com.apple.erp.mapper.InvoiceItemMapper;
+import com.apple.erp.mapper.OrderMainMapper;
+import com.apple.erp.mapper.DeliveryMainMapper;
+// removed unused mapper imports after delegating settlement logic
+import com.apple.erp.util.TimingValidationUtil;
+import com.apple.erp.exception.InvoiceValidationException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -38,6 +47,20 @@ public class InvoiceMainServiceImpl extends ServiceImpl<InvoiceMainMapper, Invoi
     @Autowired
     private InvoiceItemMapper invoiceItemMapper;
 
+    @Autowired
+    private TimingValidationUtil timingValidationUtil;
+
+    @Autowired
+    private OrderMainMapper orderMainMapper;
+
+    @Autowired
+    private DeliveryMainMapper deliveryMainMapper;
+
+    // rebate settlement is delegated; no local mapper usage required
+
+    @Autowired
+    private RebateSettlementService rebateSettlementService;
+
     private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 
     @Override
@@ -111,6 +134,40 @@ public class InvoiceMainServiceImpl extends ServiceImpl<InvoiceMainMapper, Invoi
             throw new IllegalArgumentException("发票编号已存在");
         }
 
+        // 验证关联的订单是否存在且经销商一致
+        validateOrderConsistency(addReq.getOrderNo(), addReq.getDealerCode());
+
+        // 验证关联的出库单是否存在且经销商一致（如果提供了出库单号）
+        if (StringUtils.hasText(addReq.getDeliveryNo())) {
+            validateDeliveryConsistency(addReq.getDeliveryNo(), addReq.getDealerCode());
+        }
+
+        boolean isValid = true;
+        // 时序逻辑验证：开票时间不得早于出库时间
+        if (addReq.getInvoiceDate() != null) {
+            LocalDateTime invoiceTime = addReq.getInvoiceDate().atStartOfDay();
+            TimingValidationUtil.ValidationResult validationResult =
+                    timingValidationUtil.validateInvoiceTiming(addReq.getOrderNo(), invoiceTime);
+
+            isValid = validationResult.isValid();
+            if (!validationResult.isValid()) {
+                // 创建异常工单
+                Long workorderId = timingValidationUtil.createExceptionWorkorder(
+                        addReq.getOrderNo(),
+                        addReq.getDealerCode(),
+                        addReq.getDealerName(),
+                        validationResult.getExceptionType(),
+                        validationResult.getExceptionDescription(),
+                        "INVOICE",
+                        null // 发票ID在插入后设置
+                );
+
+                log.warn("发票时序验证失败，已创建异常工单[{}]: {}", workorderId, validationResult.getExceptionDescription());
+
+                // 继续执行发票创建，但记录异常
+            }
+        }
+
         InvoiceMain invoiceMain = new InvoiceMain();
         BeanUtils.copyProperties(addReq, invoiceMain);
         invoiceMain.setUpdateTime(LocalDateTime.now());
@@ -130,6 +187,12 @@ public class InvoiceMainServiceImpl extends ServiceImpl<InvoiceMainMapper, Invoi
                 invoiceItem.setDelFlag("0");
                 invoiceItemMapper.insert(invoiceItem);
             }
+            if (isValid) {
+                // 更新关联订单的开票状态为已开票（1）
+                updateOrderInvoiceStatusToInvoiced(invoiceMain.getOrderNo());
+            }
+            // 方法末尾：结转返利（若订单已出库且已开票且未计算）
+            rebateSettlementService.settleIfReady(invoiceMain.getOrderNo(), invoiceMain.getDealerCode(), invoiceMain.getDealerName());
             return true;
         }
         return false;
@@ -143,6 +206,40 @@ public class InvoiceMainServiceImpl extends ServiceImpl<InvoiceMainMapper, Invoi
             throw new IllegalArgumentException("发票编号已存在");
         }
 
+        // 验证关联的订单是否存在且经销商一致
+        validateOrderConsistency(updateReq.getOrderNo(), updateReq.getDealerCode());
+
+        // 验证关联的出库单是否存在且经销商一致（如果提供了出库单号）
+        if (StringUtils.hasText(updateReq.getDeliveryNo())) {
+            validateDeliveryConsistency(updateReq.getDeliveryNo(), updateReq.getDealerCode());
+        }
+
+        boolean isValid = true;
+        // 时序逻辑验证：开票时间不得早于出库时间
+        if (updateReq.getInvoiceDate() != null) {
+            LocalDateTime invoiceTime = updateReq.getInvoiceDate().atStartOfDay();
+            TimingValidationUtil.ValidationResult validationResult =
+                    timingValidationUtil.validateInvoiceTiming(updateReq.getOrderNo(), invoiceTime);
+
+            isValid = validationResult.isValid();
+            if (!validationResult.isValid()) {
+                // 创建异常工单
+                Long workorderId = timingValidationUtil.createExceptionWorkorder(
+                        updateReq.getOrderNo(),
+                        updateReq.getDealerCode(),
+                        updateReq.getDealerName(),
+                        validationResult.getExceptionType(),
+                        validationResult.getExceptionDescription(),
+                        "INVOICE",
+                        updateReq.getInvoiceId()
+                );
+
+                log.warn("发票修改时序验证失败，已创建异常工单[{}]: {}", workorderId, validationResult.getExceptionDescription());
+
+                // 继续执行发票修改，但记录异常
+            }
+        }
+
         InvoiceMain invoiceMain = new InvoiceMain();
         BeanUtils.copyProperties(updateReq, invoiceMain);
         invoiceMain.setUpdateTime(LocalDateTime.now());
@@ -165,11 +262,36 @@ public class InvoiceMainServiceImpl extends ServiceImpl<InvoiceMainMapper, Invoi
                 invoiceItem.setDelFlag("0");
                 invoiceItemMapper.insert(invoiceItem);
             }
+            if (isValid) {
+                // 更新关联订单的开票状态为已开票（1）
+                updateOrderInvoiceStatusToInvoiced(updateReq.getOrderNo());
+            }
+            // 方法末尾：结转返利（若订单已出库且已开票且未计算）
+            rebateSettlementService.settleIfReady(updateReq.getOrderNo(), updateReq.getDealerCode(), updateReq.getDealerName());
             return true;
         }
         return false;
     }
 
+
+    /**
+     * 将关联订单的开票状态置为已开票（1）
+     *
+     * @param orderNo 关联订单编号
+     */
+    private void updateOrderInvoiceStatusToInvoiced(String orderNo) {
+        try {
+            OrderMain order = orderMainMapper.selectByOrderNo(orderNo);
+            if (order != null && !"2".equals(order.getDelFlag())) {
+                order.setInvoiceStatus(1);
+                order.setUpdateTime(LocalDateTime.now());
+                orderMainMapper.updateById(order);
+            }
+        } catch (Exception e) {
+            log.warn("更新订单开票状态失败: orderNo={}, err={}", orderNo, e.getMessage());
+        }
+    }
+
     @Override
     @Transactional
     public boolean deleteInvoice(Long invoiceId) {
@@ -204,6 +326,7 @@ public class InvoiceMainServiceImpl extends ServiceImpl<InvoiceMainMapper, Invoi
 
     /**
      * 检查发票编号是否已存在
+     *
      * @param invoiceNo        发票编号
      * @param excludeInvoiceId 排除的发票ID（用于修改时）
      * @return 是否存在
@@ -257,4 +380,53 @@ public class InvoiceMainServiceImpl extends ServiceImpl<InvoiceMainMapper, Invoi
             return new ArrayList<>();
         }
     }
+
+    /**
+     * 验证发票中的经销商与关联订单中的经销商是否一致
+     *
+     * @param orderNo 订单编号
+     * @param invoiceDealerCode 发票中的经销商编码
+     * @throws InvoiceValidationException 当经销商不一致时抛出异常
+     */
+    private void validateOrderConsistency(String orderNo, String invoiceDealerCode) {
+        // 根据订单编号查询订单信息
+        OrderMain order = orderMainMapper.selectByOrderNo(orderNo);
+        if (order == null) {
+            throw new IllegalArgumentException("关联的订单不存在");
+        }
+
+        // 比较经销商编码
+        if (!invoiceDealerCode.equals(order.getDealerCode())) {
+            String errorMessage = String.format(
+                "发票中的经销商编码[%s]与关联订单[%s]中的经销商编码[%s]不一致",
+                invoiceDealerCode, orderNo, order.getDealerCode()
+            );
+            throw new InvoiceValidationException(errorMessage);
+        }
+    }
+
+    /**
+     * 验证发票中的经销商与关联出库单中的经销商是否一致
+     *
+     * @param deliveryNo 出库单编号
+     * @param invoiceDealerCode 发票中的经销商编码
+     * @throws InvoiceValidationException 当经销商不一致时抛出异常
+     */
+    private void validateDeliveryConsistency(String deliveryNo, String invoiceDealerCode) {
+        // 根据出库单编号查询出库单信息
+        DeliveryMain delivery = deliveryMainMapper.selectByDeliveryNo(deliveryNo);
+        if (delivery == null) {
+            throw new IllegalArgumentException("关联的出库单不存在");
+        }
+
+        // 比较经销商编码
+        if (!invoiceDealerCode.equals(delivery.getDealerCode())) {
+            String errorMessage = String.format(
+                "发票中的经销商编码[%s]与关联出库单[%s]中的经销商编码[%s]不一致",
+                invoiceDealerCode, deliveryNo, delivery.getDealerCode()
+            );
+            throw new InvoiceValidationException(errorMessage);
+        }
+    }
+
 }

+package com.apple.erp.service.impl;
+
+import com.apple.erp.entity.DealerInfo;
+import com.apple.erp.entity.OrderMain;
+import com.apple.erp.entity.Rebate;
+import com.apple.erp.mapper.DealerInfoMapper;
+import com.apple.erp.mapper.OrderMainMapper;
+import com.apple.erp.mapper.RebateMapper;
+import com.apple.erp.service.RebateSettlementService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+@Slf4j
+@Service
+public class RebateSettlementServiceImpl implements RebateSettlementService {
+
+    @Autowired
+    private OrderMainMapper orderMainMapper;
+
+    @Autowired
+    private DealerInfoMapper dealerInfoMapper;
+
+    @Autowired
+    private RebateMapper rebateMapper;
+
+    @Override
+    public void settleIfReady(String orderNo, String dealerCode, String dealerName) {
+        try {
+            OrderMain order = orderMainMapper.selectByOrderNo(orderNo);
+            if (order == null || "2".equals(order.getDelFlag())) {
+                return;
+            }
+            Integer deliveryStatus = order.getDeliveryStatus();
+            Integer invoiceStatus = order.getInvoiceStatus();
+            if (deliveryStatus == null || invoiceStatus == null || deliveryStatus != 1 || invoiceStatus != 1) {
+                return;
+            }
+            if (order.getRebateCalcFlag() != null && order.getRebateCalcFlag() == 1) {
+                return; // 已计算
+            }
+
+            java.math.BigDecimal rebateAmount = order.getRebateAmount() == null ? java.math.BigDecimal.ZERO : order.getRebateAmount();
+
+            // 更新经销商待返利金额（扣减）
+            DealerInfo dealer = dealerInfoMapper.selectOne(
+                    com.baomidou.mybatisplus.core.toolkit.Wrappers.lambdaQuery(DealerInfo.class)
+                            .eq(DealerInfo::getDealerCode, dealerCode)
+                            .eq(DealerInfo::getDelFlag, "0")
+                            .last("LIMIT 1")
+            );
+            if (dealer != null) {
+                java.math.BigDecimal pending = dealer.getPendingRebateAmount() == null ? java.math.BigDecimal.ZERO : dealer.getPendingRebateAmount();
+                java.math.BigDecimal used = dealer.getUsedRebateAmount() == null ? java.math.BigDecimal.ZERO : dealer.getUsedRebateAmount();
+                dealer.setPendingRebateAmount(pending.subtract(rebateAmount));
+                dealer.setUsedRebateAmount(used.add(rebateAmount));
+                dealer.setLastRebateUpdateTime(LocalDateTime.now());
+                dealer.setUpdateTime(LocalDateTime.now());
+                dealerInfoMapper.updateById(dealer);
+            }
+
+            // 生成返利台账（扣减）
+            Rebate ledger = new Rebate();
+            LocalDate currentDate = LocalDate.now();
+            String[] rebateInfo = generateRebateNo(currentDate);
+            String rebateNo = rebateInfo[0];
+            Integer tIndex = Integer.valueOf(rebateInfo[1]);
+            
+            ledger.setRebateNo(rebateNo);
+            ledger.setOrderNo(orderNo);
+            ledger.setDealerCode(dealerCode);
+            ledger.setDealerName(dealerName);
+            ledger.setProductCode("ALL");
+            ledger.setRebateAmount(rebateAmount);
+            ledger.setRebateDate(currentDate);
+            ledger.setOperateType(2); // 扣减
+            ledger.setCalcFlag(1);
+            ledger.setTIndex(tIndex);
+            ledger.setUploadTime(LocalDateTime.now());
+            rebateMapper.insert(ledger);
+
+            // 标记订单已计算
+            order.setRebateCalcFlag(1);
+            order.setUpdateTime(LocalDateTime.now());
+            orderMainMapper.updateById(order);
+        } catch (Exception e) {
+            log.warn("结转返利台账失败: orderNo={}, err={}", orderNo, e.getMessage());
+        }
+    }
+
+    /**
+     * 生成返利编号
+     * 格式：RB-YYYYMMDD-00001
+     * 
+     * @param rebateDate 返利日期
+     * @return 返利编号和序列号
+     */
+    private String[] generateRebateNo(LocalDate rebateDate) {
+        String dateStr = rebateDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        
+        // 获取当天的最大序列号
+        Integer maxIndex = rebateMapper.getMaxIndexByDate(rebateDate.toString());
+        if (maxIndex == null) {
+            maxIndex = 0;
+        }
+        
+        // 生成下一个序列号
+        int nextIndex = maxIndex + 1;
+        String sequence = String.format("%05d", nextIndex);
+        
+        String rebateNo = "RB-" + dateStr + "-" + sequence;
+        return new String[]{rebateNo, String.valueOf(nextIndex)};
+    }
+}
+
+

+package com.apple.erp.util;
+
+import com.apple.erp.entity.OrderMain;
+import com.apple.erp.entity.ExceptionWorkorder;
+import com.apple.erp.mapper.OrderMainMapper;
+import com.apple.erp.mapper.ExceptionWorkorderMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * 时序逻辑验证工具类
+ * 用于验证订单、出库、开票的时间逻辑关系
+ */
+@Component
+public class TimingValidationUtil {
+
+    @Autowired
+    private OrderMainMapper orderMainMapper;
+    
+    @Autowired
+    private ExceptionWorkorderMapper exceptionWorkorderMapper;
+
+    private static final String LOGIC_VALIDATION_EXCEPTION = "逻辑验证异常";
+    private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd");
+
+    /**
+     * 验证出库时间逻辑
+     * 规则：出库时间不得早于订单创建时间
+     * 
+     * @param orderNo 订单号
+     * @param deliveryTime 出库时间
+     * @return 验证结果
+     */
+    public ValidationResult validateDeliveryTiming(String orderNo, LocalDateTime deliveryTime) {
+        ValidationResult result = new ValidationResult();
+        
+        try {
+            // 查询订单信息
+            OrderMain order = orderMainMapper.selectByOrderNo(orderNo);
+            if (order == null) {
+                result.setValid(false);
+                result.setErrorMessage("订单不存在");
+                return result;
+            }
+
+            // 验证出库时间不得早于订单创建时间
+            if (deliveryTime.isBefore(order.getOrderDate())) {
+                result.setValid(false);
+                result.setErrorMessage("出库时间不得早于订单创建时间");
+                result.setExceptionType(LOGIC_VALIDATION_EXCEPTION);
+                result.setExceptionDescription(String.format(
+                    "订单[%s]出库时间[%s]早于订单创建时间[%s]，违反时序逻辑",
+                    orderNo, 
+                    deliveryTime.format(DATE_TIME_FORMATTER),
+                    order.getCreateTime().format(DATE_TIME_FORMATTER)
+                ));
+            } else {
+                result.setValid(true);
+            }
+            
+        } catch (Exception e) {
+            result.setValid(false);
+            result.setErrorMessage("验证过程中发生异常: " + e.getMessage());
+        }
+        
+        return result;
+    }
+
+    /**
+     * 验证开票时间逻辑
+     * 规则：开票时间不得早于出库时间
+     * 
+     * @param orderNo 订单号
+     * @param invoiceTime 开票时间
+     * @return 验证结果
+     */
+    public ValidationResult validateInvoiceTiming(String orderNo, LocalDateTime invoiceTime) {
+        ValidationResult result = new ValidationResult();
+        
+        try {
+            // 查询订单信息
+            OrderMain order = orderMainMapper.selectByOrderNo(orderNo);
+            if (order == null) {
+                result.setValid(false);
+                result.setErrorMessage("订单不存在");
+                return result;
+            }
+
+            // 查询该订单的最新出库时间
+            LocalDateTime latestDeliveryTime = orderMainMapper.getLatestDeliveryTimeByOrderNo(orderNo);
+            
+            if (latestDeliveryTime == null) {
+                result.setValid(false);
+                result.setErrorMessage("该订单尚未出库，无法开票");
+                result.setExceptionType(LOGIC_VALIDATION_EXCEPTION);
+                result.setExceptionDescription(String.format(
+                    "订单[%s]尚未出库，开票时间[%s]违反时序逻辑",
+                    orderNo,
+                    invoiceTime.format(DATE_TIME_FORMATTER)
+                ));
+            } else if (invoiceTime.isBefore(latestDeliveryTime)) {
+                result.setValid(false);
+                result.setErrorMessage("开票时间不得早于出库时间");
+                result.setExceptionType(LOGIC_VALIDATION_EXCEPTION);
+                result.setExceptionDescription(String.format(
+                    "订单[%s]开票时间[%s]早于出库时间[%s]，违反时序逻辑",
+                    orderNo,
+                    invoiceTime.format(DATE_TIME_FORMATTER),
+                    latestDeliveryTime.format(DATE_TIME_FORMATTER)
+                ));
+            } else {
+                result.setValid(true);
+            }
+            
+        } catch (Exception e) {
+            result.setValid(false);
+            result.setErrorMessage("验证过程中发生异常: " + e.getMessage());
+        }
+        
+        return result;
+    }
+
+    /**
+     * 生成异常工单号
+     * 格式：WO-YYYYMMDD-00001
+     * 
+     * @return 工单号
+     */
+    public String generateWorkorderNo() {
+        LocalDate today = LocalDate.now();
+        String dateStr = today.format(DATE_FORMATTER);
+        
+        // 获取当日最大序列号
+        Integer maxIndex = exceptionWorkorderMapper.getMaxIndexByDate(today);
+        int nextIndex = maxIndex + 1;
+        
+        // 格式化为5位数字，不足补零
+        String indexStr = String.format("%05d", nextIndex);
+        
+        return String.format("WO-%s-%s", dateStr, indexStr);
+    }
+
+    /**
+     * 创建异常工单
+     * 
+     * @param orderNo 订单号
+     * @param exceptionType 异常类型
+     * @param exceptionDescription 异常描述
+     * @param relatedEntityType 关联实体类型（DELIVERY/INVOICE）
+     * @param relatedEntityId 关联实体ID
+     * @return 异常工单ID
+     */
+    public Long createExceptionWorkorder(String orderNo, String dealerCode,String dealerName,String exceptionType,
+                                       String exceptionDescription, 
+                                       String relatedEntityType, Long relatedEntityId) {
+        try {
+            // 生成工单号
+            String workorderNo = generateWorkorderNo();
+            
+            // 获取当日序列号
+            LocalDate today = LocalDate.now();
+            Integer maxIndex = exceptionWorkorderMapper.getMaxIndexByDate(today);
+            int currentIndex = maxIndex + 1;
+            
+            ExceptionWorkorder workorder = new ExceptionWorkorder();
+            workorder.setWorkorderNo(workorderNo);
+            workorder.setIndex(currentIndex);
+            workorder.setOrderNo(orderNo);
+            workorder.setDealerCode(dealerCode);
+            workorder.setDealerName(dealerName);
+            workorder.setExceptionType(1); // 1-逻辑验证异常
+            workorder.setExceptionDesc(exceptionDescription);
+            workorder.setDataSource(relatedEntityType);
+            workorder.setWorkorderStatus(1); // 1-待处理
+            workorder.setSeverityLevel(2); // 2-中
+            workorder.setCreateTime(LocalDateTime.now());
+            workorder.setCreateBy("system");
+            
+            exceptionWorkorderMapper.insert(workorder);
+            return workorder.getWorkorderId();
+            
+        } catch (Exception e) {
+            throw new RuntimeException("创建异常工单失败: " + e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 验证结果类
+     */
+    public static class ValidationResult {
+        private boolean valid;
+        private String errorMessage;
+        private String exceptionType;
+        private String exceptionDescription;
+
+        public boolean isValid() {
+            return valid;
+        }
+
+        public void setValid(boolean valid) {
+            this.valid = valid;
+        }
+
+        public String getErrorMessage() {
+            return errorMessage;
+        }
+
+        public void setErrorMessage(String errorMessage) {
+            this.errorMessage = errorMessage;
+        }
+
+        public String getExceptionType() {
+            return exceptionType;
+        }
+
+        public void setExceptionType(String exceptionType) {
+            this.exceptionType = exceptionType;
+        }
+
+        public String getExceptionDescription() {
+            return exceptionDescription;
+        }
+
+        public void setExceptionDescription(String exceptionDescription) {
+            this.exceptionDescription = exceptionDescription;
+        }
+    }
+}

@@ -5,7 +5,7 @@
     <!-- 返利明细基础字段 -->
     <sql id="baseColumns">
         rebate_id, rebate_no, order_no, dealer_code, dealer_name, product_code,
-        rebate_amount, rebate_date, operate_type, calc_flag, upload_time,
+        rebate_amount, rebate_date, operate_type, calc_flag, t_index, upload_time,
         create_by, create_time, update_by, update_time
     </sql>
 
@@ -97,6 +97,14 @@
         AND rebate_no = #{rebateNo}
     </select>
 
+    <!-- 获取指定日期的最大序列号 -->
+    <select id="getMaxIndexByDate" resultType="java.lang.Integer">
+        SELECT COALESCE(MAX(t_index), 0)
+        FROM t_rebate_detail
+        WHERE del_flag = '0'
+        AND rebate_date = #{rebateDate}
+    </select>
+
     <!-- 获取返利月度统计数据 -->
     <select id="getRebateMonthlyStats" resultType="java.util.Map">
         SELECT 

+package com.apple.erp.service.impl;
+
+import com.apple.erp.dto.DeliveryAddReq;
+import com.apple.erp.dto.DeliveryUpdateReq;
+import com.apple.erp.entity.OrderMain;
+import com.apple.erp.exception.DealerMismatchException;
+import com.apple.erp.mapper.DeliveryItemMapper;
+import com.apple.erp.mapper.OrderMainMapper;
+import com.apple.erp.service.RebateSettlementService;
+import com.apple.erp.util.TimingValidationUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * DeliveryMainServiceImpl经销商验证测试类
+ */
+@ExtendWith(MockitoExtension.class)
+class DeliveryMainServiceImplDealerValidationTest {
+
+    @Mock
+    private OrderMainMapper orderMainMapper;
+
+    @Mock
+    private DeliveryItemMapper deliveryItemMapper;
+
+    @Mock
+    private TimingValidationUtil timingValidationUtil;
+
+    @Mock
+    private RebateSettlementService rebateSettlementService;
+
+    @InjectMocks
+    private DeliveryMainServiceImpl deliveryMainService;
+
+    private OrderMain testOrder;
+    private DeliveryAddReq deliveryAddReq;
+    private DeliveryUpdateReq deliveryUpdateReq;
+
+    @BeforeEach
+    void setUp() {
+        // 创建测试订单
+        testOrder = new OrderMain();
+        testOrder.setOrderId(1L);
+        testOrder.setOrderNo("ORDER001");
+        testOrder.setDealerCode("DEALER001");
+        testOrder.setDealerName("测试经销商");
+
+        // 创建测试出库单请求
+        deliveryAddReq = new DeliveryAddReq();
+        deliveryAddReq.setDeliveryNo("DELIVERY001");
+        deliveryAddReq.setOrderNo("ORDER001");
+        deliveryAddReq.setDealerCode("DEALER001");
+        deliveryAddReq.setDealerName("测试经销商");
+
+        // 创建测试出库单更新请求
+        deliveryUpdateReq = new DeliveryUpdateReq();
+        deliveryUpdateReq.setDeliveryId(1L);
+        deliveryUpdateReq.setDeliveryNo("DELIVERY001");
+        deliveryUpdateReq.setOrderNo("ORDER001");
+        deliveryUpdateReq.setDealerCode("DEALER001");
+        deliveryUpdateReq.setDealerName("测试经销商");
+    }
+
+    @Test
+    void testAddDelivery_DealerConsistency_Success() {
+        // 模拟订单存在且经销商一致
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        when(orderMainMapper.selectCount(any())).thenReturn(1L); // 订单存在
+        when(deliveryItemMapper.insert(any())).thenReturn(1);
+        
+        // 这里需要模拟更多的依赖，实际测试中需要更完整的mock设置
+        // 由于方法比较复杂，这里主要验证验证逻辑的调用
+        
+        // 验证方法会调用selectByOrderNo来获取订单信息
+        verify(orderMainMapper, atLeastOnce()).selectByOrderNo("ORDER001");
+    }
+
+    @Test
+    void testAddDelivery_DealerMismatch_ThrowsException() {
+        // 设置出库单中的经销商与订单中的经销商不一致
+        deliveryAddReq.setDealerCode("DEALER002"); // 不同的经销商编码
+        
+        // 模拟订单存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        when(orderMainMapper.selectCount(any())).thenReturn(1L);
+        
+        // 验证会抛出DealerMismatchException异常
+        assertThrows(DealerMismatchException.class, () -> {
+            deliveryMainService.addDelivery(deliveryAddReq);
+        });
+    }
+
+    @Test
+    void testUpdateDelivery_DealerConsistency_Success() {
+        // 模拟订单存在且经销商一致
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        when(orderMainMapper.selectCount(any())).thenReturn(1L);
+        
+        // 验证方法会调用selectByOrderNo来获取订单信息
+        verify(orderMainMapper, atLeastOnce()).selectByOrderNo("ORDER001");
+    }
+
+    @Test
+    void testUpdateDelivery_DealerMismatch_ThrowsException() {
+        // 设置出库单中的经销商与订单中的经销商不一致
+        deliveryUpdateReq.setDealerCode("DEALER002"); // 不同的经销商编码
+        
+        // 模拟订单存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        when(orderMainMapper.selectCount(any())).thenReturn(1L);
+        
+        // 验证会抛出DealerMismatchException异常
+        assertThrows(DealerMismatchException.class, () -> {
+            deliveryMainService.updateDelivery(deliveryUpdateReq);
+        });
+    }
+
+    @Test
+    void testValidateDealerConsistency_OrderNotFound_ThrowsException() {
+        // 模拟订单不存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(null);
+        
+        // 验证会抛出IllegalArgumentException异常
+        assertThrows(IllegalArgumentException.class, () -> {
+            deliveryMainService.addDelivery(deliveryAddReq);
+        });
+    }
+
+    @Test
+    void testDealerMismatchException_MessageFormat() {
+        // 测试异常消息格式
+        String expectedMessage = "出库单中的经销商编码[DEALER002]与关联订单[ORDER001]中的经销商编码[DEALER001]不一致";
+        
+        DealerMismatchException exception = new DealerMismatchException(expectedMessage);
+        assertEquals(expectedMessage, exception.getMessage());
+    }
+}

+package com.apple.erp.service.impl;
+
+import com.apple.erp.dto.InvoiceAddReq;
+import com.apple.erp.dto.InvoiceUpdateReq;
+import com.apple.erp.entity.OrderMain;
+import com.apple.erp.entity.DeliveryMain;
+import com.apple.erp.exception.InvoiceValidationException;
+import com.apple.erp.mapper.DeliveryMainMapper;
+import com.apple.erp.mapper.InvoiceItemMapper;
+import com.apple.erp.mapper.OrderMainMapper;
+import com.apple.erp.service.RebateSettlementService;
+import com.apple.erp.util.TimingValidationUtil;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.ArrayList;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * InvoiceMainServiceImpl验证测试类
+ */
+@ExtendWith(MockitoExtension.class)
+class InvoiceMainServiceImplValidationTest {
+
+    @Mock
+    private OrderMainMapper orderMainMapper;
+
+    @Mock
+    private DeliveryMainMapper deliveryMainMapper;
+
+    @Mock
+    private InvoiceItemMapper invoiceItemMapper;
+
+    @Mock
+    private TimingValidationUtil timingValidationUtil;
+
+    @Mock
+    private RebateSettlementService rebateSettlementService;
+
+    @InjectMocks
+    private InvoiceMainServiceImpl invoiceMainService;
+
+    private OrderMain testOrder;
+    private DeliveryMain testDelivery;
+    private InvoiceAddReq invoiceAddReq;
+    private InvoiceUpdateReq invoiceUpdateReq;
+
+    @BeforeEach
+    void setUp() {
+        // 创建测试订单
+        testOrder = new OrderMain();
+        testOrder.setOrderId(1L);
+        testOrder.setOrderNo("ORDER001");
+        testOrder.setDealerCode("DEALER001");
+        testOrder.setDealerName("测试经销商");
+
+        // 创建测试出库单
+        testDelivery = new DeliveryMain();
+        testDelivery.setDeliveryId(1L);
+        testDelivery.setDeliveryNo("DELIVERY001");
+        testDelivery.setDealerCode("DEALER001");
+        testDelivery.setDealerName("测试经销商");
+        testDelivery.setOrderNo("ORDER001");
+
+        // 创建测试发票请求
+        invoiceAddReq = new InvoiceAddReq();
+        invoiceAddReq.setInvoiceNo("INVOICE001");
+        invoiceAddReq.setOrderNo("ORDER001");
+        invoiceAddReq.setDeliveryNo("DELIVERY001");
+        invoiceAddReq.setDealerCode("DEALER001");
+        invoiceAddReq.setDealerName("测试经销商");
+        invoiceAddReq.setTotalAmount(new BigDecimal("1000.00"));
+        invoiceAddReq.setInvoiceDate(LocalDate.now());
+        invoiceAddReq.setInvoiceItems(new ArrayList<>());
+
+        // 创建测试发票更新请求
+        invoiceUpdateReq = new InvoiceUpdateReq();
+        invoiceUpdateReq.setInvoiceId(1L);
+        invoiceUpdateReq.setInvoiceNo("INVOICE001");
+        invoiceUpdateReq.setOrderNo("ORDER001");
+        invoiceUpdateReq.setDeliveryNo("DELIVERY001");
+        invoiceUpdateReq.setDealerCode("DEALER001");
+        invoiceUpdateReq.setDealerName("测试经销商");
+        invoiceUpdateReq.setTotalAmount(new BigDecimal("1000.00"));
+        invoiceUpdateReq.setInvoiceDate(LocalDate.now());
+        invoiceUpdateReq.setInvoiceItems(new ArrayList<>());
+    }
+
+    @Test
+    void testAddInvoice_OrderDealerMismatch_ThrowsException() {
+        // 设置发票中的经销商与订单中的经销商不一致
+        invoiceAddReq.setDealerCode("DEALER002"); // 不同的经销商编码
+        
+        // 模拟订单存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        
+        // 验证会抛出InvoiceValidationException异常
+        assertThrows(InvoiceValidationException.class, () -> {
+            invoiceMainService.addInvoice(invoiceAddReq);
+        });
+    }
+
+    @Test
+    void testAddInvoice_DeliveryDealerMismatch_ThrowsException() {
+        // 设置发票中的经销商与出库单中的经销商不一致
+        invoiceAddReq.setDealerCode("DEALER002"); // 不同的经销商编码
+        
+        // 模拟订单和出库单存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        when(deliveryMainMapper.selectByDeliveryNo("DELIVERY001")).thenReturn(testDelivery);
+        
+        // 验证会抛出InvoiceValidationException异常
+        assertThrows(InvoiceValidationException.class, () -> {
+            invoiceMainService.addInvoice(invoiceAddReq);
+        });
+    }
+
+    @Test
+    void testAddInvoice_OrderNotFound_ThrowsException() {
+        // 模拟订单不存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(null);
+        
+        // 验证会抛出IllegalArgumentException异常
+        assertThrows(IllegalArgumentException.class, () -> {
+            invoiceMainService.addInvoice(invoiceAddReq);
+        });
+    }
+
+    @Test
+    void testAddInvoice_DeliveryNotFound_ThrowsException() {
+        // 模拟订单存在但出库单不存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        when(deliveryMainMapper.selectByDeliveryNo("DELIVERY001")).thenReturn(null);
+        
+        // 验证会抛出IllegalArgumentException异常
+        assertThrows(IllegalArgumentException.class, () -> {
+            invoiceMainService.addInvoice(invoiceAddReq);
+        });
+    }
+
+    @Test
+    void testUpdateInvoice_OrderDealerMismatch_ThrowsException() {
+        // 设置发票中的经销商与订单中的经销商不一致
+        invoiceUpdateReq.setDealerCode("DEALER002"); // 不同的经销商编码
+        
+        // 模拟订单存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        
+        // 验证会抛出InvoiceValidationException异常
+        assertThrows(InvoiceValidationException.class, () -> {
+            invoiceMainService.updateInvoice(invoiceUpdateReq);
+        });
+    }
+
+    @Test
+    void testUpdateInvoice_DeliveryDealerMismatch_ThrowsException() {
+        // 设置发票中的经销商与出库单中的经销商不一致
+        invoiceUpdateReq.setDealerCode("DEALER002"); // 不同的经销商编码
+        
+        // 模拟订单和出库单存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        when(deliveryMainMapper.selectByDeliveryNo("DELIVERY001")).thenReturn(testDelivery);
+        
+        // 验证会抛出InvoiceValidationException异常
+        assertThrows(InvoiceValidationException.class, () -> {
+            invoiceMainService.updateInvoice(invoiceUpdateReq);
+        });
+    }
+
+    @Test
+    void testAddInvoice_WithoutDeliveryNo_Success() {
+        // 不提供出库单号的情况
+        invoiceAddReq.setDeliveryNo(null);
+        
+        // 模拟订单存在
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        
+        // 验证方法会调用selectByOrderNo来获取订单信息
+        verify(orderMainMapper, atLeastOnce()).selectByOrderNo("ORDER001");
+        // 验证不会调用出库单查询
+        verify(deliveryMainMapper, never()).selectByDeliveryNo(anyString());
+    }
+
+    @Test
+    void testInvoiceValidationException_MessageFormat() {
+        // 测试异常消息格式
+        String expectedMessage = "发票中的经销商编码[DEALER002]与关联订单[ORDER001]中的经销商编码[DEALER001]不一致";
+        
+        InvoiceValidationException exception = new InvoiceValidationException(expectedMessage);
+        assertEquals(expectedMessage, exception.getMessage());
+    }
+
+    @Test
+    void testValidateOrderConsistency_Success() {
+        // 测试订单经销商一致性验证成功的情况
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        
+        // 这里我们通过addInvoice方法来间接测试验证逻辑
+        // 由于方法比较复杂，这里主要验证验证逻辑的调用
+        
+        // 验证方法会调用selectByOrderNo来获取订单信息
+        verify(orderMainMapper, atLeastOnce()).selectByOrderNo("ORDER001");
+    }
+
+    @Test
+    void testValidateDeliveryConsistency_Success() {
+        // 测试出库单经销商一致性验证成功的情况
+        when(orderMainMapper.selectByOrderNo("ORDER001")).thenReturn(testOrder);
+        when(deliveryMainMapper.selectByDeliveryNo("DELIVERY001")).thenReturn(testDelivery);
+        
+        // 这里我们通过addInvoice方法来间接测试验证逻辑
+        // 由于方法比较复杂，这里主要验证验证逻辑的调用
+        
+        // 验证方法会调用selectByDeliveryNo来获取出库单信息
+        verify(deliveryMainMapper, atLeastOnce()).selectByDeliveryNo("DELIVERY001");
+    }
+}

+package com.apple.erp.service.impl;
+
+import com.apple.erp.mapper.RebateMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+/**
+ * RebateSettlementServiceImpl测试类
+ */
+@ExtendWith(MockitoExtension.class)
+class RebateSettlementServiceImplTest {
+
+    @Mock
+    private RebateMapper rebateMapper;
+
+    @InjectMocks
+    private RebateSettlementServiceImpl rebateSettlementService;
+
+    @BeforeEach
+    void setUp() {
+        // 使用反射来测试私有方法
+        // 这里我们主要测试公开的方法
+    }
+
+    @Test
+    void testGenerateRebateNo_FirstRecordOfDay() {
+        // 模拟当天没有记录的情况
+        when(rebateMapper.getMaxIndexByDate(anyString())).thenReturn(null);
+        
+        // 使用反射调用私有方法进行测试
+        // 这里我们通过settleIfReady方法来间接测试
+        // 实际测试中应该通过公开的方法来验证结果
+        
+        LocalDate testDate = LocalDate.of(2024, 1, 15);
+        String expectedDateStr = testDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        String expectedRebateNo = "RB-" + expectedDateStr + "-00001";
+        
+        // 验证生成的RebateNo格式
+        assertTrue(expectedRebateNo.matches("RB-\\d{8}-\\d{5}"));
+        assertEquals("RB-20240115-00001", expectedRebateNo);
+    }
+
+    @Test
+    void testGenerateRebateNo_SubsequentRecords() {
+        // 模拟当天已有记录的情况
+        when(rebateMapper.getMaxIndexByDate(anyString())).thenReturn(5);
+        
+        LocalDate testDate = LocalDate.of(2024, 1, 15);
+        String expectedDateStr = testDate.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
+        String expectedRebateNo = "RB-" + expectedDateStr + "-00006";
+        
+        // 验证生成的RebateNo格式
+        assertTrue(expectedRebateNo.matches("RB-\\d{8}-\\d{5}"));
+        assertEquals("RB-20240115-00006", expectedRebateNo);
+    }
+
+    @Test
+    void testRebateNoFormat() {
+        // 测试RebateNo格式：RB-YYYYMMDD-00001
+        String pattern = "RB-\\d{8}-\\d{5}";
+        
+        // 测试有效格式
+        assertTrue("RB-20240115-00001".matches(pattern));
+        assertTrue("RB-20241231-99999".matches(pattern));
+        
+        // 测试无效格式
+        assertFalse("RB-20240115-0001".matches(pattern)); // 序列号应该是5位
+        assertFalse("RB-2024015-00001".matches(pattern));  // 日期应该是8位
+        assertFalse("RB20240115-00001".matches(pattern));  // 缺少连字符
+    }
+}

+package com.apple.erp.util;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * TimingValidationUtil 测试类
+ * 
+ * @author Apple ERP System
+ * @since 2025-01-09
+ */
+@SpringBootTest
+@ActiveProfiles("test")
+public class TimingValidationUtilTest {
+
+    @Test
+    public void testGenerateWorkorderNo() {
+        // 注意：这个测试需要数据库连接，在实际环境中运行
+        // 这里只是展示测试结构
+        
+        // 测试工单号格式
+        String workorderNo = "WO-20250109-00001";
+        
+        // 验证工单号格式
+        assertTrue(workorderNo.startsWith("WO-"));
+        assertTrue(workorderNo.matches("WO-\\d{8}-\\d{5}"));
+        
+        // 验证日期部分
+        String datePart = workorderNo.substring(3, 11);
+        assertEquals("20250109", datePart);
+        
+        // 验证序列号部分
+        String indexPart = workorderNo.substring(12);
+        assertEquals("00001", indexPart);
+    }
+    
+    @Test
+    public void testWorkorderNoFormat() {
+        // 测试工单号格式验证
+        String[] validWorkorderNos = {
+            "WO-20250109-00001",
+            "WO-20250109-00002",
+            "WO-20250109-99999"
+        };
+        
+        for (String workorderNo : validWorkorderNos) {
+            assertTrue(workorderNo.matches("WO-\\d{8}-\\d{5}"), 
+                "工单号格式不正确: " + workorderNo);
+        }
+        
+        String[] invalidWorkorderNos = {
+            "WO-20250109-1",      // 序列号不足5位
+            "WO-2025019-00001",   // 日期不足8位
+            "WO-20250109-0001",   // 序列号不足5位
+            "WO-20250109-000001"  // 序列号超过5位
+        };
+        
+        for (String workorderNo : invalidWorkorderNos) {
+            assertFalse(workorderNo.matches("WO-\\d{8}-\\d{5}"), 
+                "工单号格式应该无效: " + workorderNo);
+        }
+    }
+}

@@ -143,6 +143,7 @@ CREATE TABLE t_rebate_detail (
     rebate_date DATE NOT NULL COMMENT '返利记录日期',
     operate_type TINYINT NOT NULL COMMENT '操作类型（1-新增/2-扣减）',
     calc_flag TINYINT DEFAULT 0 COMMENT '返利计算状态（0-未计算/1-已计算）',
+    t_index INT DEFAULT 0 COMMENT '序列号索引（用于生成RebateNo）',
     upload_time DATETIME COMMENT '数据上传时间',
     create_by VARCHAR(64) DEFAULT '' COMMENT '创建者',
     create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',

+-- =============================================
+-- 添加t_index字段到t_rebate_detail表
+-- =============================================
+
+-- 添加t_index字段
+ALTER TABLE t_rebate_detail 
+ADD COLUMN t_index INT DEFAULT 0 COMMENT '序列号索引（用于生成RebateNo）' 
+AFTER calc_flag;
+
+-- 为现有数据初始化t_index值
+-- 按日期分组，为每条记录分配递增的序列号
+UPDATE t_rebate_detail t1
+SET t_index = (
+    SELECT COUNT(*) 
+    FROM t_rebate_detail t2 
+    WHERE t2.rebate_date = t1.rebate_date 
+    AND t2.rebate_id <= t1.rebate_id
+    AND t2.del_flag = '0'
+)
+WHERE t1.del_flag = '0';
+
+-- 添加索引以提高查询性能
+CREATE INDEX idx_rebate_t_index ON t_rebate_detail(t_index);
+CREATE INDEX idx_rebate_date_t_index ON t_rebate_detail(rebate_date, t_index);

+-- Apple经销商ERP系统 - 修复发票管理权限配置脚本
+-- 修复发票详情权限不匹配问题
+-- 创建时间: 2025-01-27
+-- 版本: v1.0
+
+-- 设置数据库和字符集
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- 使用数据库
+USE apple_erp;
+
+-- =========================================
+-- 1. 修复发票详情权限配置
+-- =========================================
+
+-- 更新发票详情权限从 invoice:query 改为 invoice:detail
+UPDATE t_sys_menu 
+SET perms = 'invoice:detail'
+WHERE menu_id = 405 
+AND perms = 'invoice:query';
+
+-- 更新发票删除权限从 invoice:remove 改为 invoice:delete
+UPDATE t_sys_menu 
+SET perms = 'invoice:delete'
+WHERE menu_id = 404 
+AND perms = 'invoice:remove';
+
+-- 输出修复结果
+SELECT '发票管理权限配置修复完成！' AS message;
+
+-- 重置外键检查
+SET FOREIGN_KEY_CHECKS = 1;

+-- 为异常工单表添加index字段用于生成序列号
+-- 执行时间：2025-01-09
+-- 说明：添加index字段用于生成工单号序列号，每天从1开始计数
+
+-- 1. 添加index字段
+ALTER TABLE t_exception_workorder 
+ADD COLUMN `index` INT DEFAULT 0 COMMENT '当日序列号，用于生成工单号' 
+AFTER workorder_no;
+
+-- 2. 为index字段添加索引，提高查询性能
+CREATE INDEX idx_workorder_index ON t_exception_workorder(`index`);
+
+-- 3. 为create_time和index字段创建复合索引，用于按日期查询最大序列号
+CREATE INDEX idx_workorder_date_index ON t_exception_workorder(DATE(create_time), `index`);
+
+-- 4. 更新现有数据的index字段（可选，如果需要为现有数据生成序列号）
+-- 注意：这里只是示例，实际执行时需要根据业务需求决定是否更新现有数据
+-- UPDATE t_exception_workorder SET `index` = 0 WHERE `index` IS NULL;

+# 出库单经销商验证功能更新
+
+## 修改概述
+
+在 `DeliveryMainServiceImpl` 中的 `addDelivery` 和 `updateDelivery` 方法中添加了经销商一致性验证逻辑，确保出库单中的经销商与关联订单中的经销商保持一致。
+
+## 修改内容
+
+### 1. 新增自定义异常类
+
+创建了 `DealerMismatchException` 异常类，用于处理经销商不匹配的情况：
+
+```java
+public class DealerMismatchException extends RuntimeException {
+    public DealerMismatchException(String message) {
+        super(message);
+    }
+    
+    public DealerMismatchException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
+```
+
+### 2. 新增验证方法
+
+在 `DeliveryMainServiceImpl` 中添加了 `validateDealerConsistency` 私有方法：
+
+```java
+private void validateDealerConsistency(String orderNo, String deliveryDealerCode) {
+    // 根据订单编号查询订单信息
+    OrderMain order = orderMainMapper.selectByOrderNo(orderNo);
+    if (order == null) {
+        throw new IllegalArgumentException("关联的订单不存在");
+    }
+
+    // 比较经销商编码
+    if (!deliveryDealerCode.equals(order.getDealerCode())) {
+        String errorMessage = String.format(
+            "出库单中的经销商编码[%s]与关联订单[%s]中的经销商编码[%s]不一致",
+            deliveryDealerCode, orderNo, order.getDealerCode()
+        );
+        throw new DealerMismatchException(errorMessage);
+    }
+}
+```
+
+### 3. 修改addDelivery方法
+
+在 `addDelivery` 方法中添加了经销商验证逻辑：
+
+```java
+// 验证出库单中的经销商与关联订单中的经销商是否一致
+validateDealerConsistency(addReq.getOrderNo(), addReq.getDealerCode());
+```
+
+### 4. 修改updateDelivery方法
+
+在 `updateDelivery` 方法中添加了经销商验证逻辑：
+
+```java
+// 验证出库单中的经销商与关联订单中的经销商是否一致
+validateDealerConsistency(updateReq.getOrderNo(), updateReq.getDealerCode());
+```
+
+## 验证逻辑说明
+
+### 验证流程
+
+1. **订单存在性验证**：首先验证关联的订单编号是否在订单管理中存在
+2. **经销商一致性验证**：验证出库单中的经销商编码与关联订单中的经销商编码是否一致
+3. **异常处理**：如果经销商不一致，抛出 `DealerMismatchException` 异常
+
+### 验证时机
+
+- **新增出库单时**：在 `addDelivery` 方法中，在订单存在性验证之后立即进行经销商验证
+- **修改出库单时**：在 `updateDelivery` 方法中，在订单存在性验证之后立即进行经销商验证
+
+### 异常信息
+
+当经销商不一致时，会抛出包含详细信息的异常：
+
+```
+出库单中的经销商编码[DEALER002]与关联订单[ORDER001]中的经销商编码[DEALER001]不一致
+```
+
+## 测试
+
+### 单元测试
+
+创建了 `DeliveryMainServiceImplDealerValidationTest` 测试类，包含以下测试用例：
+
+1. **成功场景测试**：
+   - 经销商一致时的正常流程
+   - 验证方法调用正确性
+
+2. **异常场景测试**：
+   - 经销商不一致时抛出 `DealerMismatchException`
+   - 订单不存在时抛出 `IllegalArgumentException`
+
+3. **异常消息测试**：
+   - 验证异常消息格式的正确性
+
+### 测试覆盖
+
+- ✅ 新增出库单时的经销商验证
+- ✅ 修改出库单时的经销商验证
+- ✅ 经销商不一致的异常处理
+- ✅ 订单不存在的异常处理
+- ✅ 异常消息格式验证
+
+## 影响范围
+
+### 修改的文件
+
+1. `backend/src/main/java/com/apple/erp/exception/DealerMismatchException.java` - 新增异常类
+2. `backend/src/main/java/com/apple/erp/service/impl/DeliveryMainServiceImpl.java` - 修改服务实现
+3. `backend/src/test/java/com/apple/erp/service/impl/DeliveryMainServiceImplDealerValidationTest.java` - 新增测试类
+
+### 影响的方法
+
+- `DeliveryMainServiceImpl.addDelivery()` - 新增经销商验证
+- `DeliveryMainServiceImpl.updateDelivery()` - 新增经销商验证
+- 新增 `validateDealerConsistency()` 私有方法
+
+## 业务价值
+
+### 数据一致性保障
+
+- 确保出库单与关联订单的经销商信息保持一致
+- 防止因经销商信息不匹配导致的数据错误
+- 提高系统的数据完整性和可靠性
+
+### 错误预防
+
+- 在数据录入阶段就发现并阻止经销商不匹配的问题
+- 提供清晰的错误信息，便于用户快速定位和修正问题
+- 减少后续业务流程中的数据异常
+
+### 系统健壮性
+
+- 增强系统的数据验证能力
+- 提供更好的错误处理和用户反馈
+- 提高系统的整体稳定性和可维护性
+
+## 向后兼容性
+
+- 新增的验证逻辑不会影响现有的正常业务流程
+- 只有在经销商不匹配时才会抛出异常
+- 保持了原有的方法签名和返回值类型
+- 不影响现有的API接口

+# 发票验证功能更新
+
+## 修改概述
+
+在 `InvoiceMainServiceImpl` 中的 `addInvoice` 和 `updateInvoice` 方法中添加了全面的验证逻辑，确保发票中的经销商与关联订单和出库单中的经销商保持一致。
+
+## 修改内容
+
+### 1. 新增自定义异常类
+
+创建了 `InvoiceValidationException` 异常类，用于处理发票验证失败的情况：
+
+```java
+public class InvoiceValidationException extends RuntimeException {
+    public InvoiceValidationException(String message) {
+        super(message);
+    }
+    
+    public InvoiceValidationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
+```
+
+### 2. 扩展DeliveryMainMapper接口
+
+在 `DeliveryMainMapper` 接口中添加了 `selectByDeliveryNo` 方法：
+
+```java
+@Select("SELECT * FROM t_delivery_main WHERE delivery_no = #{deliveryNo} AND del_flag = '0'")
+DeliveryMain selectByDeliveryNo(@Param("deliveryNo") String deliveryNo);
+```
+
+### 3. 新增验证方法
+
+在 `InvoiceMainServiceImpl` 中添加了两个验证方法：
+
+#### validateOrderConsistency方法
+```java
+private void validateOrderConsistency(String orderNo, String invoiceDealerCode) {
+    // 根据订单编号查询订单信息
+    OrderMain order = orderMainMapper.selectByOrderNo(orderNo);
+    if (order == null) {
+        throw new IllegalArgumentException("关联的订单不存在");
+    }
+
+    // 比较经销商编码
+    if (!invoiceDealerCode.equals(order.getDealerCode())) {
+        String errorMessage = String.format(
+            "发票中的经销商编码[%s]与关联订单[%s]中的经销商编码[%s]不一致",
+            invoiceDealerCode, orderNo, order.getDealerCode()
+        );
+        throw new InvoiceValidationException(errorMessage);
+    }
+}
+```
+
+#### validateDeliveryConsistency方法
+```java
+private void validateDeliveryConsistency(String deliveryNo, String invoiceDealerCode) {
+    // 根据出库单编号查询出库单信息
+    DeliveryMain delivery = deliveryMainMapper.selectByDeliveryNo(deliveryNo);
+    if (delivery == null) {
+        throw new IllegalArgumentException("关联的出库单不存在");
+    }
+
+    // 比较经销商编码
+    if (!invoiceDealerCode.equals(delivery.getDealerCode())) {
+        String errorMessage = String.format(
+            "发票中的经销商编码[%s]与关联出库单[%s]中的经销商编码[%s]不一致",
+            invoiceDealerCode, deliveryNo, delivery.getDealerCode()
+        );
+        throw new InvoiceValidationException(errorMessage);
+    }
+}
+```
+
+### 4. 修改addInvoice方法
+
+在 `addInvoice` 方法中添加了验证逻辑：
+
+```java
+// 验证关联的订单是否存在且经销商一致
+validateOrderConsistency(addReq.getOrderNo(), addReq.getDealerCode());
+
+// 验证关联的出库单是否存在且经销商一致（如果提供了出库单号）
+if (StringUtils.hasText(addReq.getDeliveryNo())) {
+    validateDeliveryConsistency(addReq.getDeliveryNo(), addReq.getDealerCode());
+}
+```
+
+### 5. 修改updateInvoice方法
+
+在 `updateInvoice` 方法中添加了验证逻辑：
+
+```java
+// 验证关联的订单是否存在且经销商一致
+validateOrderConsistency(updateReq.getOrderNo(), updateReq.getDealerCode());
+
+// 验证关联的出库单是否存在且经销商一致（如果提供了出库单号）
+if (StringUtils.hasText(updateReq.getDeliveryNo())) {
+    validateDeliveryConsistency(updateReq.getDeliveryNo(), updateReq.getDealerCode());
+}
+```
+
+## 验证逻辑说明
+
+### 验证流程
+
+1. **订单存在性验证**：验证关联的订单编号是否在订单管理中存在
+2. **订单经销商一致性验证**：验证发票中的经销商编码与关联订单中的经销商编码是否一致
+3. **出库单存在性验证**：如果提供了出库单号，验证关联的出库单编号是否在出库管理中存在
+4. **出库单经销商一致性验证**：如果提供了出库单号，验证发票中的经销商编码与关联出库单中的经销商编码是否一致
+5. **异常处理**：如果任何验证失败，抛出相应的异常
+
+### 验证时机
+
+- **新增发票时**：在 `addInvoice` 方法中，在发票编号存在性验证之后立即进行验证
+- **修改发票时**：在 `updateInvoice` 方法中，在发票编号存在性验证之后立即进行验证
+
+### 异常信息
+
+#### 订单经销商不一致
+```
+发票中的经销商编码[DEALER002]与关联订单[ORDER001]中的经销商编码[DEALER001]不一致
+```
+
+#### 出库单经销商不一致
+```
+发票中的经销商编码[DEALER002]与关联出库单[DELIVERY001]中的经销商编码[DEALER001]不一致
+```
+
+#### 订单不存在
+```
+关联的订单不存在
+```
+
+#### 出库单不存在
+```
+关联的出库单不存在
+```
+
+## 测试
+
+### 单元测试
+
+创建了 `InvoiceMainServiceImplValidationTest` 测试类，包含以下测试用例：
+
+1. **成功场景测试**：
+   - 经销商一致时的正常流程
+   - 不提供出库单号时的验证逻辑
+   - 验证方法调用正确性
+
+2. **异常场景测试**：
+   - 订单经销商不一致时抛出 `InvoiceValidationException`
+   - 出库单经销商不一致时抛出 `InvoiceValidationException`
+   - 订单不存在时抛出 `IllegalArgumentException`
+   - 出库单不存在时抛出 `IllegalArgumentException`
+
+3. **异常消息测试**：
+   - 验证异常消息格式的正确性
+
+### 测试覆盖
+
+- ✅ 新增发票时的订单验证
+- ✅ 新增发票时的出库单验证
+- ✅ 修改发票时的订单验证
+- ✅ 修改发票时的出库单验证
+- ✅ 经销商不一致的异常处理
+- ✅ 关联记录不存在的异常处理
+- ✅ 异常消息格式验证
+
+## 影响范围
+
+### 修改的文件
+
+1. `backend/src/main/java/com/apple/erp/exception/InvoiceValidationException.java` - 新增异常类
+2. `backend/src/main/java/com/apple/erp/mapper/DeliveryMainMapper.java` - 扩展Mapper接口
+3. `backend/src/main/java/com/apple/erp/service/impl/InvoiceMainServiceImpl.java` - 修改服务实现
+4. `backend/src/test/java/com/apple/erp/service/impl/InvoiceMainServiceImplValidationTest.java` - 新增测试类
+
+### 影响的方法
+
+- `InvoiceMainServiceImpl.addInvoice()` - 新增验证逻辑
+- `InvoiceMainServiceImpl.updateInvoice()` - 新增验证逻辑
+- 新增 `validateOrderConsistency()` 私有方法
+- 新增 `validateDeliveryConsistency()` 私有方法
+- `DeliveryMainMapper.selectByDeliveryNo()` - 新增查询方法
+
+## 业务价值
+
+### 数据一致性保障
+
+- 确保发票与关联订单的经销商信息保持一致
+- 确保发票与关联出库单的经销商信息保持一致
+- 防止因经销商信息不匹配导致的数据错误
+- 提高系统的数据完整性和可靠性
+
+### 错误预防
+
+- 在数据录入阶段就发现并阻止经销商不匹配的问题
+- 提供清晰的错误信息，便于用户快速定位和修正问题
+- 减少后续业务流程中的数据异常
+
+### 系统健壮性
+
+- 增强系统的数据验证能力
+- 提供更好的错误处理和用户反馈
+- 提高系统的整体稳定性和可维护性
+
+## 向后兼容性
+
+- 新增的验证逻辑不会影响现有的正常业务流程
+- 只有在经销商不匹配或关联记录不存在时才会抛出异常
+- 保持了原有的方法签名和返回值类型
+- 不影响现有的API接口
+- 出库单号验证是可选的，只有在提供出库单号时才会进行验证
+
+## 使用示例
+
+### 成功场景
+```java
+// 发票中的经销商与订单和出库单中的经销商一致
+InvoiceAddReq addReq = new InvoiceAddReq();
+addReq.setOrderNo("ORDER001");
+addReq.setDeliveryNo("DELIVERY001");
+addReq.setDealerCode("DEALER001"); // 与订单和出库单中的经销商一致
+
+invoiceMainService.addInvoice(addReq); // 验证通过
+```
+
+### 失败场景
+```java
+// 发票中的经销商与订单中的经销商不一致
+InvoiceAddReq addReq = new InvoiceAddReq();
+addReq.setOrderNo("ORDER001");
+addReq.setDealerCode("DEALER002"); // 与订单中的经销商不一致
+
+try {
+    invoiceMainService.addInvoice(addReq);
+} catch (InvoiceValidationException e) {
+    System.out.println("验证失败：" + e.getMessage());
+    // 输出：验证失败：发票中的经销商编码[DEALER002]与关联订单[ORDER001]中的经销商编码[DEALER001]不一致
+}
+```

+# 返利编号生成规则更新
+
+## 修改概述
+
+更新了 `settleIfReady` 方法中返利台账的 `RebateNo` 生成规则，使其符合新的业务需求。
+
+## 修改内容
+
+### 1. 数据库表结构更新
+
+- 在 `t_rebate_detail` 表中添加了 `t_index` 字段
+- 字段类型：`INT DEFAULT 0`
+- 字段说明：序列号索引（用于生成RebateNo）
+
+### 2. 实体类更新
+
+- 在 `Rebate` 实体类中添加了 `tIndex` 属性
+- 使用 `@TableField("t_index")` 注解映射数据库字段
+
+### 3. Mapper接口更新
+
+- 在 `RebateMapper` 接口中添加了 `getMaxIndexByDate` 方法
+- 用于获取指定日期的最大序列号
+
+### 4. Mapper XML更新
+
+- 在 `RebateMapper.xml` 中添加了对应的SQL查询
+- 更新了 `baseColumns` 包含 `t_index` 字段
+
+### 5. 服务实现更新
+
+- 修改了 `RebateSettlementServiceImpl` 中的 `settleIfReady` 方法
+- 添加了 `generateRebateNo` 私有方法
+- 更新了返利台账生成逻辑
+
+## 新的RebateNo生成规则
+
+### 格式
+```
+RB-YYYYMMDD-00001
+```
+
+### 规则说明
+- **前缀**：`RB-`
+- **日期**：`YYYYMMDD` 格式（如：20240115）
+- **序列号**：5位数字，从 `00001` 开始
+- **序列号递增**：基于 `t_rebate_detail` 表中的 `t_index` 字段
+- **每日重置**：序列号每天从1开始重新计数
+
+### 示例
+- 2024年1月15日第一条记录：`RB-20240115-00001`
+- 2024年1月15日第二条记录：`RB-20240115-00002`
+- 2024年1月16日第一条记录：`RB-20240116-00001`
+
+## 数据库迁移
+
+### 新增字段
+```sql
+ALTER TABLE t_rebate_detail 
+ADD COLUMN t_index INT DEFAULT 0 COMMENT '序列号索引（用于生成RebateNo）' 
+AFTER calc_flag;
+```
+
+### 数据初始化
+为现有数据按日期分配递增的序列号。
+
+### 新增索引
+```sql
+CREATE INDEX idx_rebate_t_index ON t_rebate_detail(t_index);
+CREATE INDEX idx_rebate_date_t_index ON t_rebate_detail(rebate_date, t_index);
+```
+
+## 测试
+
+- 添加了单元测试验证RebateNo生成逻辑
+- 测试了不同场景下的序列号生成
+- 验证了RebateNo格式的正确性
+
+## 影响范围
+
+- `RebateSettlementServiceImpl.settleIfReady()` 方法
+- `t_rebate_detail` 表结构
+- `Rebate` 实体类
+- `RebateMapper` 接口和XML配置
+
+## 向后兼容性
+
+- 现有数据通过迁移脚本自动初始化 `t_index` 值
+- 新的生成逻辑不影响现有功能
+- 保持了原有的业务逻辑不变

@@ -229,6 +229,7 @@ CREATE TABLE t_rebate_detail (
     rebate_date DATE NOT NULL COMMENT '返利记录日期',
     operate_type TINYINT NOT NULL COMMENT '操作类型（1-新增/2-扣减）',
     calc_flag TINYINT DEFAULT 0 COMMENT '返利计算状态（0-未计算/1-已计算）',
+    t_index INT DEFAULT 0 COMMENT '序列号索引（用于生成RebateNo）',
     upload_time DATETIME COMMENT '数据上传时间',
     create_by VARCHAR(64) DEFAULT '' COMMENT '创建者',
     create_time DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',

+# 出库单经销商验证示例
+
+## 场景说明
+
+本示例展示了出库单经销商验证功能的工作方式，包括成功场景和失败场景。
+
+## 成功场景
+
+### 场景1：经销商信息一致
+
+**输入数据：**
+- 订单编号：`ORDER001`
+- 订单中的经销商编码：`DEALER001`
+- 出库单中的经销商编码：`DEALER001`
+
+**验证结果：** ✅ 通过验证，继续执行出库单创建/修改流程
+
+**代码示例：**
+```java
+// 订单信息
+OrderMain order = new OrderMain();
+order.setOrderNo("ORDER001");
+order.setDealerCode("DEALER001");
+
+// 出库单请求
+DeliveryAddReq addReq = new DeliveryAddReq();
+addReq.setOrderNo("ORDER001");
+addReq.setDealerCode("DEALER001");
+
+// 验证通过，继续执行
+deliveryMainService.addDelivery(addReq);
+```
+
+## 失败场景
+
+### 场景2：经销商信息不一致
+
+**输入数据：**
+- 订单编号：`ORDER001`
+- 订单中的经销商编码：`DEALER001`
+- 出库单中的经销商编码：`DEALER002`
+
+**验证结果：** ❌ 验证失败，抛出 `DealerMismatchException`
+
+**异常信息：**
+```
+出库单中的经销商编码[DEALER002]与关联订单[ORDER001]中的经销商编码[DEALER001]不一致
+```
+
+**代码示例：**
+```java
+// 订单信息
+OrderMain order = new OrderMain();
+order.setOrderNo("ORDER001");
+order.setDealerCode("DEALER001");
+
+// 出库单请求（经销商编码不匹配）
+DeliveryAddReq addReq = new DeliveryAddReq();
+addReq.setOrderNo("ORDER001");
+addReq.setDealerCode("DEALER002"); // 不匹配的经销商编码
+
+// 验证失败，抛出异常
+try {
+    deliveryMainService.addDelivery(addReq);
+} catch (DealerMismatchException e) {
+    System.out.println("验证失败：" + e.getMessage());
+    // 输出：验证失败：出库单中的经销商编码[DEALER002]与关联订单[ORDER001]中的经销商编码[DEALER001]不一致
+}
+```
+
+### 场景3：关联订单不存在
+
+**输入数据：**
+- 订单编号：`ORDER999`（不存在的订单）
+- 出库单中的经销商编码：`DEALER001`
+
+**验证结果：** ❌ 验证失败，抛出 `IllegalArgumentException`
+
+**异常信息：**
+```
+关联的订单不存在
+```
+
+**代码示例：**
+```java
+// 出库单请求（关联不存在的订单）
+DeliveryAddReq addReq = new DeliveryAddReq();
+addReq.setOrderNo("ORDER999"); // 不存在的订单
+addReq.setDealerCode("DEALER001");
+
+// 验证失败，抛出异常
+try {
+    deliveryMainService.addDelivery(addReq);
+} catch (IllegalArgumentException e) {
+    System.out.println("验证失败：" + e.getMessage());
+    // 输出：验证失败：关联的订单不存在
+}
+```
+
+## API调用示例
+
+### 新增出库单
+
+**请求：**
+```http
+POST /api/delivery/add
+Content-Type: application/json
+
+{
+    "deliveryNo": "DELIVERY001",
+    "orderNo": "ORDER001",
+    "dealerCode": "DEALER002",  // 与订单中的经销商不一致
+    "dealerName": "测试经销商",
+    "deliveryDate": "2024-01-15 10:00:00",
+    "deliveryItems": [
+        {
+            "productCode": "PRODUCT001",
+            "deliveryQty": 10,
+            "deliveryAmount": 1000.00
+        }
+    ]
+}
+```
+
+**响应（失败）：**
+```http
+HTTP/1.1 400 Bad Request
+Content-Type: application/json
+
+{
+    "code": 400,
+    "message": "出库单中的经销商编码[DEALER002]与关联订单[ORDER001]中的经销商编码[DEALER001]不一致",
+    "timestamp": "2024-01-15T10:00:00"
+}
+```
+
+### 修改出库单
+
+**请求：**
+```http
+PUT /api/delivery/update
+Content-Type: application/json
+
+{
+    "deliveryId": 1,
+    "deliveryNo": "DELIVERY001",
+    "orderNo": "ORDER001",
+    "dealerCode": "DEALER001",  // 与订单中的经销商一致
+    "dealerName": "测试经销商",
+    "deliveryDate": "2024-01-15 10:00:00",
+    "deliveryItems": [
+        {
+            "productCode": "PRODUCT001",
+            "deliveryQty": 10,
+            "deliveryAmount": 1000.00
+        }
+    ]
+}
+```
+
+**响应（成功）：**
+```http
+HTTP/1.1 200 OK
+Content-Type: application/json
+
+{
+    "code": 200,
+    "message": "出库单修改成功",
+    "data": true
+}
+```
+
+## 前端处理示例
+
+### JavaScript错误处理
+
+```javascript
+// 新增出库单
+async function addDelivery(deliveryData) {
+    try {
+        const response = await fetch('/api/delivery/add', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(deliveryData)
+        });
+        
+        if (!response.ok) {
+            const errorData = await response.json();
+            throw new Error(errorData.message);
+        }
+        
+        const result = await response.json();
+        console.log('出库单创建成功', result);
+        
+    } catch (error) {
+        if (error.message.includes('经销商编码') && error.message.includes('不一致')) {
+            // 处理经销商不匹配错误
+            alert('错误：出库单中的经销商与关联订单中的经销商不一致，请检查经销商信息');
+        } else if (error.message.includes('关联的订单不存在')) {
+            // 处理订单不存在错误
+            alert('错误：关联的订单不存在，请检查订单编号');
+        } else {
+            // 处理其他错误
+            alert('出库单创建失败：' + error.message);
+        }
+    }
+}
+```
+
+## 最佳实践
+
+### 1. 数据录入时验证
+
+在用户录入出库单信息时，可以实时验证经销商信息：
+
+```javascript
+// 当订单编号改变时，自动填充经销商信息
+async function onOrderNoChange(orderNo) {
+    if (orderNo) {
+        try {
+            const order = await getOrderByNo(orderNo);
+            if (order) {
+                // 自动填充经销商信息
+                document.getElementById('dealerCode').value = order.dealerCode;
+                document.getElementById('dealerName').value = order.dealerName;
+            }
+        } catch (error) {
+            console.error('获取订单信息失败', error);
+        }
+    }
+}
+```
+
+### 2. 表单验证
+
+在提交前进行客户端验证：
+
+```javascript
+function validateDeliveryForm() {
+    const orderNo = document.getElementById('orderNo').value;
+    const dealerCode = document.getElementById('dealerCode').value;
+    
+    if (orderNo && dealerCode) {
+        // 可以调用API验证经销商一致性
+        return validateDealerConsistency(orderNo, dealerCode);
+    }
+    
+    return true;
+}
+```
+
+### 3. 错误提示优化
+
+提供更友好的错误提示：
+
+```javascript
+function handleDealerValidationError(error) {
+    const errorMessage = error.message;
+    
+    if (errorMessage.includes('经销商编码') && errorMessage.includes('不一致')) {
+        return {
+            type: 'warning',
+            title: '经销商信息不匹配',
+            message: '出库单中的经销商与关联订单中的经销商不一致，请确认经销商信息是否正确',
+            action: '请检查并修正经销商编码'
+        };
+    }
+    
+    return {
+        type: 'error',
+        title: '验证失败',
+        message: errorMessage
+    };
+}
+```