出货阶段的入仓修改和订单修改状态节点权限修正，海运是装柜审批完成，空运是已出仓

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

@@ -1910,8 +1910,17 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
          * 订单修改审批流程跟现有的订单审批流程一致，订单信息修改后无需产生异常，不判断异常条件是否满足
          * 海运订单、拆单子单已装柜/空运已出货，订单信息修改，不需要更新价格
          */
-        // 海运订单预装未装柜/空运订单分拣未出货, 锁定订单信息无法修改
-        if (vo.getShipmentState() == 0 || vo.getShipmentState() == 305 || vo.getShipmentState() == 307 || vo.getShipmentState() == 407) {
+        // 海运订单预装未装柜/空运订单分拣未出货, 锁定订单信息无法修改 exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409])
+        if (vo.getShipmentState() == 0
+                || vo.getShipmentState() == 305
+                || vo.getShipmentState() == 307
+                || vo.getShipmentState() == 309
+                || vo.getShipmentState() == 310
+                || vo.getShipmentState() == 311
+                || vo.getShipmentState() == 313
+                || vo.getShipmentState() == 407
+                || vo.getShipmentState() == 409
+                || vo.getShipmentState() == 411) {
             if (vo.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) {
                 throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE);
             } else {

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

@@ -3698,6 +3698,23 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         if (orderDO == null) {
             throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_NOT_EXISTS);
         }
+        if (orderDO.getShipmentState() == 0
+                || orderDO.getShipmentState() == 305
+                || orderDO.getShipmentState() == 307
+                || orderDO.getShipmentState() == 309
+                || orderDO.getShipmentState() == 310
+                || orderDO.getShipmentState() == 311
+                || orderDO.getShipmentState() == 313
+                || orderDO.getShipmentState() == 407
+                || orderDO.getShipmentState() == 409
+                || orderDO.getShipmentState() == 411) {
+            if (orderDO.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) {
+                throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE);
+            } else {
+                // 当前不是海运就是空运
+                throw exception(ORDER_SORTING_NOT_SHIPMENT_NOT_UPDATE);
+            }
+        }
         if (OrderStatusEnum.DRAFT.getValue().equals(orderDO.getStatus())) {
             throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DRAFT_STATUS_NOT_ALLOWED_WAREHOUSE_IN);
         }
@@ -3817,6 +3834,23 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         if (orderDO == null) {
             throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_NOT_EXISTS);
         }
+        if (orderDO.getShipmentState() == 0
+                || orderDO.getShipmentState() == 305
+                || orderDO.getShipmentState() == 307
+                || orderDO.getShipmentState() == 309
+                || orderDO.getShipmentState() == 310
+                || orderDO.getShipmentState() == 311
+                || orderDO.getShipmentState() == 313
+                || orderDO.getShipmentState() == 407
+                || orderDO.getShipmentState() == 409
+                || orderDO.getShipmentState() == 411) {
+            if (orderDO.getTransportId() == TransportTypeShortEnum.SEA_CONTAINER.getValue()) {
+                throw exception(ORDER_PRE_INSTALLATION_UNPACKAGED_CONTAINER_NOT_UPDATE);
+            } else {
+                // 当前不是海运就是空运
+                throw exception(ORDER_SORTING_NOT_SHIPMENT_NOT_UPDATE);
+            }
+        }
         if (OrderStatusEnum.WAREHOUSE_ADJUSTMENT.getValue().equals(orderDO.getStatus())) {
             throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_WAREHOUSE_ADJUSTMENT_STATUS_NOT_ALLOWED_WAREHOUSE_IN);
         }