Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderWarehouseIn/OrderWarehouseInServiceImpl.java

@@ -6,7 +6,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.apollo.core.event.BoxCheckOrderSchedulingEvent;
-import cn.iocoder.yudao.framework.apollo.core.event.Order.CalculateOrderVValueEvent;
 import cn.iocoder.yudao.framework.apollo.core.event.QueryChannelInfoEvent;
 import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -1220,7 +1219,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                 orderItemDOList,
                 isNotRollbackIn, orderWarehouseInDOList,
                 zhongPaoBest,
-                channelPackagingOverWeightAdditionalBoList);
+                channelPackagingOverWeightAdditionalBoList, false);
 
         if (CollectionUtil.isNotEmpty(channelPackagingOverWeightAdditionalBoList)) {
             channelPackagingOverWeightAdditionalBoList =
@@ -1903,7 +1902,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
     private void processOrderItemException(Long orderId, OrderDO orderDO, List<OrderItemDO> orderItemDOList,
                                            boolean isNotRollbackIn, List<OrderWarehouseInDO> orderWarehouseInDOList, ZhongPaoBestVO zhongPaoBest,
-                                           List<ChannelPackagingOverWeightAdditionalBo> channelPackagingOverWeightAdditionalBoList) {
+                                           List<ChannelPackagingOverWeightAdditionalBo> channelPackagingOverWeightAdditionalBoList, boolean isFinishStocked) {
         // 处理异常
         for (OrderItemDO orderItemDO : orderItemDOList) {
 
@@ -1934,8 +1933,10 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                 // orderItem 设置warehouseInInfoVo
                 WarehouseInInfoVO warehouseInInfoVO = this.orderItemSetWarehouseInInfoVO(orderItemDO, orderWarehouseInDOListFilter);
 
-                // 处理空运订单 商品重量超限异常 和 商品路线重量超限异常
-                this.processAirOrderOverWeightException(orderId, orderDO, orderItemDO, warehouseInInfoVO, channelPackagingOverWeightAdditionalBoList);
+                // 处理空运订单 商品重量超限异常 和 商品路线重量超限异常 (完成入仓时才需要，备货完成时不需要处理）
+                if (!isFinishStocked) {
+                    this.processAirOrderOverWeightException(orderId, orderDO, orderItemDO, warehouseInInfoVO, channelPackagingOverWeightAdditionalBoList);
+                }
 
                 this.setOrderItemZhongPao(zhongPaoBest, orderItemDO, warehouseInInfoVO.getWeight(), warehouseInInfoVO.getVolume());
 
@@ -4727,7 +4728,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         ZhongPaoBestVO zhongPaoBest = getZhongPaoBest(orderDO);
 
         // 根据订单项产生异常，多箱，少箱，新增商品异常，入仓特性不符异常
-        processOrderItemException(orderId, orderDO, orderItemDOList, isNotRollbackIn, orderWarehouseInDOList, zhongPaoBest, channelPackagingOverWeightAdditionalBoList);
+        processOrderItemException(orderId, orderDO, orderItemDOList, isNotRollbackIn, orderWarehouseInDOList, zhongPaoBest, channelPackagingOverWeightAdditionalBoList, true);
 
         if (CollectionUtil.isNotEmpty(channelPackagingOverWeightAdditionalBoList)) {
             channelPackagingOverWeightAdditionalBoList = channelPackagingOverWeightAdditionalBoList.stream().filter(t -> !t.isMerged()).collect(Collectors.toList());