订单修改调用重置异常时处理

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

@@ -1358,11 +1358,12 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
         }
 
         // 更新订单状态
+        // 这里如果订单已经出货，那么执行这里保持订单相关状态不变
         Integer result = orderService.updateStatus(orderId,
                 orderDO.getOrderNo(),
-                OrderStatusEnum.IN_WAREHOUSE.getValue(),
+                orderDO.getStatus() >  5 ? orderDO.getStatus() : OrderStatusEnum.IN_WAREHOUSE.getValue(),
                 null,
-                OrderWarehouseInStatusEnum.warehouse_finished.getValue(),
+                orderDO.getStatus() >  5 ? orderDO.getInWarehouseState() : OrderWarehouseInStatusEnum.warehouse_finished.getValue(),
                 null,
                 null,
                 null,