订单产生了重量超限异常时，不再产生未报价运费异常，且产生重量超限异常时自动处理未报价运费异常

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java

@@ -2844,6 +2844,12 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
                         null,
                         orderItemDO.getProdId(),
                         OrderExceptionEnum.ORDER_NO_QUOTE_EXCEPTION.getKey());
+        // TODO 查询是否有重量超限异常和渠道包装重量超限异常，如果有则不生成清关费异常
+        List<OrderExceptionDO> goodsOverweightExceptionDOList =
+                orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndProdIdAndExceptionKeys(orderDO.getOrderId(),
+                        null,
+                        orderItemDO.getProdId(),
+                        CollectionUtil.newArrayList(OrderExceptionEnum.GOODS_OVERWEIGHT_EXCEPTION.getKey(), OrderExceptionEnum.LINE_WEIGHT_EXCEPTION.getKey()));
 
         if (orderItemDO.getNeedOrderInquiry() != null) {
             // 添加的逻辑点 海运和空运只要是单询价都按同一套逻辑来处理
@@ -2865,23 +2871,25 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
 
         //
         if (orderItemDO.getItemStatus() == -1 && !orderItemDO.getIsProd()) {
-            if (CollectionUtil.isEmpty(orderNoQuoteExceptionDOList)) {
-                OrderExceptionCreateReqVO orderExceptionCreateReqVO =
-                        this.genOrderException(orderDO.getOrderId(),
-                                orderDO,
-                                orderItemDO,
-                                null,
-                                OrderExceptionEnum.ORDER_NO_QUOTE_EXCEPTION,
-                                String.format("订单【%s】中的商品【%s】未报价",
-                                        orderDO.getOrderNo(),
-                                        orderItemDO.getProdTitleZh()),
-                                String.format("The goods 【%s】 in the order 【%s】 are not quoted",
-                                        orderItemDO.getProdTitleEn(),
-                                        orderDO.getOrderNo()));
-                // TODO 同一个订单相同品名有相同未报价异常时,不重复产生
-                orderExceptionService.createOrderException(orderExceptionCreateReqVO);
+            if (CollectionUtil.isEmpty(goodsOverweightExceptionDOList)) {
+                if (CollectionUtil.isEmpty(orderNoQuoteExceptionDOList)) {
+                    OrderExceptionCreateReqVO orderExceptionCreateReqVO =
+                            this.genOrderException(orderDO.getOrderId(),
+                                    orderDO,
+                                    orderItemDO,
+                                    null,
+                                    OrderExceptionEnum.ORDER_NO_QUOTE_EXCEPTION,
+                                    String.format("订单【%s】中的商品【%s】未报价",
+                                            orderDO.getOrderNo(),
+                                            orderItemDO.getProdTitleZh()),
+                                    String.format("The goods 【%s】 in the order 【%s】 are not quoted",
+                                            orderItemDO.getProdTitleEn(),
+                                            orderDO.getOrderNo()));
+                    // TODO 同一个订单相同品名有相同未报价异常时,不重复产生
+                    orderExceptionService.createOrderException(orderExceptionCreateReqVO);
+                }
+                noQuoteOrAutomaticNoQuote = 1;
             }
-            noQuoteOrAutomaticNoQuote = 1;
         } else {
             if (CollectionUtil.isNotEmpty(orderNoQuoteExceptionDOList)) {
                 // TODO 当其他业务补充了品名价格后，如果还有待处理的未报价异常，需要同步处理掉

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

@@ -2061,6 +2061,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
                             // 自动处理清关费未报价异常
                             orderExceptionService.autoProcessException(orderId, orderItemId, OrderExceptionEnum.CUSTOMS_FEE_NOT_QUOTE_EXCEPTION, "因处理商品路线重量超限异常，自动取消。", OrderExceptionResult.CUSTOMS_FEE_NOT_QUOTE_EXCEPTION_RESULT.PROCESSED);
+                            orderExceptionService.autoProcessException(orderId, orderItemId, OrderExceptionEnum.ORDER_NO_QUOTE_EXCEPTION, "因处理商品路线重量超限异常，自动取消。", OrderExceptionResult.CUSTOMS_FEE_NOT_QUOTE_EXCEPTION_RESULT.PROCESSED);
                         }
                     }
                 }