merge

2026-07-27 14:29:46 +08:00
parent 51c3fc1994 beb6563060
commit bc3e9c5172
110 changed files with 13942 additions and 2044 deletions
@@ -70,8 +70,11 @@ public sealed class WmsTransportPlanner
            .Where(x => x.LocationType == ContainerLocationTypes.Storage).ToListAsync();
        var materials = await _db.Materials.AsNoTracking().Where(x => x.Enabled).ToListAsync();
        var containerMaterials = await _db.ContainerMaterials.AsNoTracking().ToListAsync();
+        var now = DateTimeOffset.UtcNow;
        var activeReservations = await _db.WmsTransportReservations.AsNoTracking()
-            .Where(x => x.Status == WmsReservationStatuses.Active).ToListAsync();
+            .Where(x => x.Status == WmsReservationStatuses.Active
+                        && (x.ExpiresAt == null || x.ExpiresAt > now))
+            .ToListAsync();
        var activeTasks = await _db.WmsTransportTasks.AsNoTracking()
            .Where(x => WmsTransportTaskStatuses.Active.Contains(x.Status)).ToListAsync();