订单入仓操作校验订单正在进行的审批业务逻辑调整

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

@@ -301,8 +301,12 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
 
     private void throwProcessingApproval(OrderDO orderDO) {
         // 费用申请中可以入仓和完成入仓。 详见字典order_approval_type
-        if (orderDO.getAuditType() != 0 && orderDO.getAuditType() > 5 && orderDO.getAuditType() != 12) {
-            throw exception(ORDER_HAS_PROCESSING_APPROVAL, orderDO.getOrderNo());
+        if (orderDO.getAuditType() != 0) {
+            OrderApprovalTypeCheckEvent approvalTypeCheckEvent =  new OrderApprovalTypeCheckEvent(orderDO.getOrderId(), null, null, Arrays.asList(6, 11, 13, 14, 22, 23, 28), false);
+            applicationContext.publishEvent(approvalTypeCheckEvent);
+            if (approvalTypeCheckEvent.getResult()) {
+                throw exception(ORDER_HAS_PROCESSING_APPROVAL, orderDO.getOrderNo());
+            }
         }
     }