bug316 对存在路线重量超限异常的订单修改渠道后，无法审批通过

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/orderException/OrderExceptionServiceImpl.java

@@ -1449,6 +1449,8 @@ public class OrderExceptionServiceImpl extends AbstractService<OrderExceptionMap
 
             } else if (vo.getOrderExceptionHandlerResult().equals(OrderExceptionResult.LINE_WEIGHT_EXCEPTION_RESULT.NOT_ALLOW_OVER)) {
                 orderExceptionDO.setOrderExceptionStatus(1);
+            } else if(vo.getOrderExceptionHandlerResult().equals(OrderExceptionResult.LINE_WEIGHT_EXCEPTION_RESULT.CONFIRMED_SEND)){
+                orderExceptionDO.setOrderExceptionStatus(2);
             } else {
                 throw exception(ORDER_HANDLER_EXCEPTION_NOT_EXISTS);
             }

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

@@ -2254,7 +2254,7 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
     private boolean isNoSameOrderException(Long orderId, Long orderItemId, String descZh, String descEn, OrderExceptionEnum orderExceptionEnum) {
         boolean noSameException = true;
-        List<OrderExceptionDO> heavyExceptionList = orderExceptionService.getOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderId, orderItemId, orderExceptionEnum.getKey());
+        List<OrderExceptionDO> heavyExceptionList = orderExceptionService.getPendingOrderExceptionByOrderIdAndOrderItemIdAndExceptionKey(orderId, orderItemId, orderExceptionEnum.getKey());
         if (CollectionUtil.isNotEmpty(heavyExceptionList)) {
             OrderExceptionDO orderExceptionDO = heavyExceptionList.get(0);
             if (StringUtils.isNotEmpty(orderExceptionDO.getOrderExceptionRemark())) {