新增分段管理

2026-06-23 17:22:40 +08:00
parent a6086f1f8b
commit 88c688c0df
19 changed files with 1882 additions and 1 deletions
@@ -1,6 +1,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using MiGu.Server.Wms;
+using MiGu.Server.SimpleFields;

 namespace MiGu.Server.Persistence;

@@ -16,6 +17,7 @@ public sealed class PlatformDbContext : DbContext
    public DbSet<ContainerMaterial> ContainerMaterials => Set<ContainerMaterial>();
    public DbSet<ContainerLocationHistory> ContainerLocationHistories => Set<ContainerLocationHistory>();
    public DbSet<ContainerMaterialHistory> ContainerMaterialHistories => Set<ContainerMaterialHistory>();
+    public DbSet<SimpleField> SimpleFields => Set<SimpleField>();

    protected override void OnModelCreating(ModelBuilder modelBuilder)
    {
@@ -55,6 +57,31 @@ public sealed class PlatformDbContext : DbContext

        modelBuilder.Entity<ContainerMaterial>().Property(x => x.Quantity).HasPrecision(18, 4);
        modelBuilder.Entity<ContainerMaterialHistory>().Property(x => x.QuantityDelta).HasPrecision(18, 4);
+
+        ConfigureSimpleField(modelBuilder);
+    }
+
+    private static void ConfigureSimpleField(ModelBuilder modelBuilder)
+    {
+        var e = modelBuilder.Entity<SimpleField>();
+        e.ToTable("simple_fields");
+        e.HasKey(x => x.Id);
+        e.Property(x => x.Id).HasColumnName("id");
+        e.Property(x => x.CarType).HasColumnName("car_type").HasMaxLength(64);
+        e.Property(x => x.FieldType).HasColumnName("field_type").HasMaxLength(64);
+        e.Property(x => x.Key).HasColumnName("key").HasMaxLength(128);
+        e.Property(x => x.Value).HasColumnName("value");
+        e.Property(x => x.DataType).HasColumnName("data_type").HasMaxLength(128);
+        e.Property(x => x.Chinese).HasColumnName("chinese").HasMaxLength(256).IsRequired(false);
+        e.Property(x => x.English).HasColumnName("english").HasMaxLength(256).IsRequired(false);
+        e.Property(x => x.Other).HasColumnName("other").HasMaxLength(512);
+        e.Property(x => x.IsDefault).HasColumnName("is_default");
+        var dateTime = new ValueConverter<DateTimeOffset, string>(
+            v => SimpleFieldDateTime.ToStorage(v),
+            v => SimpleFieldDateTime.FromStorage(v));
+        e.Property(x => x.CreateTime).HasColumnName("create_time").HasConversion(dateTime).HasMaxLength(19);
+        e.Property(x => x.UpdateTime).HasColumnName("update_time").HasConversion(dateTime).HasMaxLength(19);
+        e.HasIndex(x => new { x.CarType, x.FieldType, x.Key }).IsUnique();
    }

    public override int SaveChanges(bool acceptAllChangesOnSuccess)
@@ -1,6 +1,8 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.Data.Sqlite;
 using MiGu.Server.Wms;
+using MiGu.Server.SimpleFields;

 namespace MiGu.Server.Persistence;

@@ -38,6 +40,7 @@ public static class PlatformPersistence

        services.AddScoped<WmsReferenceValidator>();
        services.AddScoped<WmsService>();
+        services.AddScoped<SimpleFieldService>();
        return services;
    }

@@ -46,6 +49,97 @@ public static class PlatformPersistence
        using var scope = services.CreateScope();
        var db = scope.ServiceProvider.GetRequiredService<PlatformDbContext>();
        await db.Database.EnsureCreatedAsync();
+        // EnsureCreated 只在「库文件不存在」时建表；已有 platform.db 时新增实体不会自动补表。
+        await EnsureSimpleFieldsTableAsync(db);
+    }
+
+    /// <summary>为已存在的数据库补建 simple_fields 表（幂等）。</summary>
+    private static async Task EnsureSimpleFieldsTableAsync(PlatformDbContext db)
+    {
+        if (db.Database.IsSqlite())
+        {
+            await db.Database.ExecuteSqlRawAsync("""
+                CREATE TABLE IF NOT EXISTS simple_fields (
+                    id TEXT NOT NULL CONSTRAINT PK_simple_fields PRIMARY KEY,
+                    car_type TEXT NOT NULL DEFAULT '',
+                    field_type TEXT NOT NULL,
+                    "key" TEXT NOT NULL,
+                    value TEXT NOT NULL DEFAULT '',
+                    data_type TEXT NOT NULL DEFAULT '',
+                    chinese TEXT,
+                    english TEXT,
+                    other TEXT NOT NULL DEFAULT '',
+                    is_default INTEGER NOT NULL,
+                    create_time TEXT NOT NULL,
+                    update_time TEXT NOT NULL
+                );
+                """);
+            // 须先删旧索引 (field_type, other, key)：把 other 清空为「其他语言」后会与旧唯一约束冲突。
+            await db.Database.ExecuteSqlRawAsync("DROP INDEX IF EXISTS IX_simple_fields_field_type_other_key;");
+            await db.Database.ExecuteSqlRawAsync("""
+                UPDATE simple_fields SET car_type = other
+                WHERE (car_type IS NULL OR car_type = '') AND other <> '';
+                """);
+            await db.Database.ExecuteSqlRawAsync("""
+                UPDATE simple_fields SET other = ''
+                WHERE other <> '' AND other = car_type;
+                """);
+            await db.Database.ExecuteSqlRawAsync("""
+                CREATE UNIQUE INDEX IF NOT EXISTS IX_simple_fields_car_type_field_type_key
+                ON simple_fields (car_type, field_type, "key");
+                """);
+            return;
+        }
+
+        // 非 SQLite：表不存在时尝试按当前模型创建（已有库不会走 EnsureCreated）。
+        if (!await TableExistsAsync(db, "simple_fields"))
+        {
+            var creator = db.GetService<Microsoft.EntityFrameworkCore.Storage.IRelationalDatabaseCreator>();
+            await creator.CreateTablesAsync();
+        }
+    }
+
+    /// <summary>
+    /// 检查表是否存在
+    /// </summary>
+    /// <param name="db">数据库上下文</param>
+    /// <param name="table">表名</param>
+    /// <returns>表是否存在</returns>
+    private static async Task<bool> TableExistsAsync(PlatformDbContext db, string table)
+    {
+        var conn = db.Database.GetDbConnection();
+        if (conn.State != System.Data.ConnectionState.Open)
+            await conn.OpenAsync();
+        try
+        {
+            await using var cmd = conn.CreateCommand();
+            if (db.Database.IsSqlServer())
+            {
+                cmd.CommandText = "SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = @t";
+                var p = cmd.CreateParameter(); p.ParameterName = "@t"; p.Value = table; cmd.Parameters.Add(p);
+            }
+            else if (db.Database.IsNpgsql())
+            {
+                cmd.CommandText = "SELECT 1 FROM information_schema.tables WHERE table_name = @t";
+                var p = cmd.CreateParameter(); p.ParameterName = "@t"; p.Value = table; cmd.Parameters.Add(p);
+            }
+            else if (db.Database.IsMySql())
+            {
+                cmd.CommandText = "SELECT 1 FROM information_schema.tables WHERE table_schema = DATABASE() AND table_name = @t";
+                var p = cmd.CreateParameter(); p.ParameterName = "@t"; p.Value = table; cmd.Parameters.Add(p);
+            }
+            else
+            {
+                return false;
+            }
+            var result = await cmd.ExecuteScalarAsync();
+            return result != null;
+        }
+        finally
+        {
+            if (conn.State == System.Data.ConnectionState.Open)
+                await conn.CloseAsync();
+        }
    }

    private static string ResolveConnectionString(IConfiguration configuration, IWebHostEnvironment env, string provider)