Merge branch 'master-fix' into release

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

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

@@ -1356,19 +1356,14 @@ public class OrderWarehouseInServiceImpl extends AbstractService<OrderWarehouseI
                 }
             }
         }
-        //订单修改时不更新订单状态
-        Integer status=0;
-        if (finishReqVO.getIsOnlyResetException() && orderDO.getStatus()>5){
-            status = orderDO.getStatus();
-        }else{
-            status = OrderStatusEnum.IN_WAREHOUSE.getValue();
-        }
+
         // 更新订单状态
+        // 这里如果订单已经出货，那么执行这里保持订单相关状态不变
         Integer result = orderService.updateStatus(orderId,
                 orderDO.getOrderNo(),
-                status,
+                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,