up

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs

@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Cronos;
 using Microsoft.AspNetCore.SignalR;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using SettleAccount.Job.SignalR;
@@ -164,6 +163,10 @@ public class JobHostdService : BackgroundService, IApplicationService
                                 }
                             }
                         }
+                        catch(CronFormatException ex)
+                        {
+                            Console.WriteLine($"{job.Name},Cron解析失败：{ex.Message},{ex.ToString()}");
+                        }
                         catch (Exception ex)
                         {
                             Console.WriteLine(ex.ToString());
@@ -254,7 +257,7 @@ public class JobHostdService : BackgroundService, IApplicationService
     private JobItem GetJobItem(Guid id)
     {
         using var scope = this._serviceProvider.CreateScope();
-        return scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>().Set<JobItem>().AsNoTracking().FirstOrDefault(o => o.Id == id);
+        return scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>().Set<JobItem>().FirstOrDefault(o => o.Id == id);
     }
 
     private void JobItemHeartBeat(Guid id)
@@ -298,7 +301,7 @@ public class JobHostdService : BackgroundService, IApplicationService
         this._stoppingToken = stoppingToken;
         using var scope = this._serviceProvider.CreateScope();
         var db = scope.ServiceProvider.GetRequiredService<SettleAccountDbContext>();
-        var jobs = db.Set<JobItem>().AsNoTracking().ToList();
+        var jobs = db.Set<JobItem>().ToList();
         jobs.ForEach(this.AddJob);
         return Task.CompletedTask;
     }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAsyncBalanceService.cs

@@ -84,12 +84,10 @@ public class VmiAsyncBalanceService : ApplicationService, IJobService, ITransien
                     }
                     if (logType == VmiLogType.Type100 && balance.Qty < decimal.Zero && log.Qty > 0)
                     {
-                        //更新补货
-                        var log2 = db.Set<VmiLog>().FirstOrDefault(o => o.Id == log.Id);
-                        if (log2 != null)
-                        {
-                            log2.IsReplenished = true;
-                        }
+                        //添加负库存补货记录
+                        var log2 = new VmiReplenished();
+                        log2.InjectFrom(log);
+                        await db.Set<VmiReplenished>().AddAsync(log2).ConfigureAwait(false);
                     }
                 }
                 message.isConsumed = true;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/JobItem.cs

@@ -4,7 +4,7 @@ using Volo.Abp.Domain.Entities;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 
-public class JobItem : Entity<Guid>, IHasConcurrencyStamp
+public class JobItem : Entity<Guid>
 {
     public JobItem()
     {

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiAsyncTask.cs

@@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 
-public class VmiSyncTask : Entity<Guid>, IHasConcurrencyStamp
+public class VmiSyncTask : Entity<Guid>
 {
     public VmiSyncTask()
     {

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiBalance.cs

@@ -8,7 +8,7 @@ namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 /// <summary>
 /// ERP库位+零件号+生产码
 /// </summary>
-public class VmiBalance : Entity<Guid>, IHasConcurrencyStamp
+public class VmiBalance : Entity<Guid>
 {
     public VmiBalance()
     {

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiMessage.cs

@@ -3,7 +3,7 @@ using Volo.Abp.Domain.Entities;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 
-public class VmiMessage : Entity<Guid>, IHasConcurrencyStamp
+public class VmiMessage : Entity<Guid>
 {
     public VmiMessage()
     {

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiReplenished.cs

@@ -0,0 +1,5 @@
+namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
+
+public class VmiReplenished : VmiLog
+{
+}

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiShardingRecord.cs

@@ -0,0 +1,10 @@
+using System;
+using Volo.Abp.Domain.Entities;
+
+namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
+
+public class VmiShardingRecord : Entity<Guid>
+{
+    public string MainTable { get; set; }
+    public string ShardingTable { get; set; }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs

@@ -1290,7 +1290,7 @@ namespace Win.Sfs.SettleAccount
                 b.HasIndex(o => o.Name).IsUnique();
                 b.Property(o => o.Service).HasMaxLength(100).IsRequired();
                 b.Property(o => o.Cron).HasMaxLength(50).IsRequired();
-                b.Property(x => x.ConcurrencyStamp).HasMaxLength(50);
+                b.Property(o => o.ConcurrencyStamp).HasMaxLength(50).IsConcurrencyToken();
             });
 
             builder.Entity<JobLog>(b =>
@@ -1304,6 +1304,7 @@ namespace Win.Sfs.SettleAccount
                 b.ToTable($"{options.TablePrefix}_VmiMessage", options.Schema);
                 b.ConfigureByConvention();
                 b.Property(o => o.Number).ValueGeneratedOnAdd().Metadata.SetAfterSaveBehavior(PropertySaveBehavior.Ignore);
+                b.Property(o => o.ConcurrencyStamp).HasMaxLength(50).IsConcurrencyToken();
             });
 
             builder.Entity((Action<EntityTypeBuilder<VmiBalance>>)(b =>
@@ -1312,6 +1313,7 @@ namespace Win.Sfs.SettleAccount
                 b.ConfigureByConvention();
                 b.Property(o => o.CreatedTime).ValueGeneratedOnAdd().Metadata.SetAfterSaveBehavior(PropertySaveBehavior.Ignore);
                 b.Property(o => o.UpdatedTime).ValueGeneratedOnAddOrUpdate().Metadata.SetAfterSaveBehavior(PropertySaveBehavior.Ignore);
+                b.Property(o => o.ConcurrencyStamp).HasMaxLength(50).IsConcurrencyToken();
                 b.HasIndex(o => (new
                 {
                     o.DeliverBillType,
@@ -1334,6 +1336,12 @@ namespace Win.Sfs.SettleAccount
                 b.Property(o => o.UpdatedTime).ValueGeneratedOnAddOrUpdate().Metadata.SetAfterSaveBehavior(PropertySaveBehavior.Ignore);
             });
 
+            builder.Entity<VmiReplenished>(b =>
+            {
+                b.ToTable($"{options.TablePrefix}_VmiReplenished", options.Schema);
+                b.ConfigureByConvention();
+            });
+
             builder.Entity<VmiSnapshot>(b =>
             {
                 b.ToTable($"{options.TablePrefix}_VmiSnapshot", options.Schema);
@@ -1344,6 +1352,7 @@ namespace Win.Sfs.SettleAccount
             {
                 b.ToTable($"{options.TablePrefix}_VmiSyncTask", options.Schema);
                 b.ConfigureByConvention();
+                b.Property(o => o.ConcurrencyStamp).HasMaxLength(50).IsConcurrencyToken();
             });
 
             //seed

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230825011303_vmi14.cs

@@ -0,0 +1,330 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class vmi14 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "Set_VmiBalance",
+                keyColumn: "Id",
+                keyValue: new Guid("eaaaf238-9865-4851-91d4-faa239bf6fca"));
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "Set_VmiSyncTask",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(40)",
+                oldMaxLength: 40,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "Set_VmiMessage",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(40)",
+                oldMaxLength: 40,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "Set_VmiBalance",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(40)",
+                oldMaxLength: 40,
+                oldNullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "Set_VmiReplenished",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Set_VmiReplenished", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Set_VmiReplenished_Set_VmiLog_Id",
+                        column: x => x.Id,
+                        principalTable: "Set_VmiLog",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "800892b9cac64cb69669dc937238d39d");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "4794bc4fa2ad409ea64cdd2404983475");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "0efcdccaa94d4e7fb550794d50efa9ab");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "1e3131d9f8454d96b0429796010752d3");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "5f427300bdfd44a19eaf54fddde31db1");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8e1cb5a9-8bcf-17fd-97e3-4c10532a5794"),
+                column: "ConcurrencyStamp",
+                value: "a4c7d3ff7e3b4578bc2332f114c7a6bb");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "3ab808a6104c483496414711259c375b");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "4d161eb0a7154f1db4cf7dcca4ffceea");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "9186efa28e7242bf94451f40834c2160");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "742b38d034d94d4685b7f074f35cd3ce");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c3fe2b66-28cc-c612-eca6-a362769ae90c"),
+                column: "ConcurrencyStamp",
+                value: "98dff4b93f1e4b0ba88a556ab20e7973");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "e25c06d5cdd34b2bbf909e8c655f94fc");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "602c85109f6743a6949bb260b3846ca7");
+
+            migrationBuilder.InsertData(
+                table: "Set_VmiBalance",
+                columns: new[] { "Id", "AssembleData", "BillTime", "CodeType", "ConcurrencyStamp", "Configcode", "CustPartCode", "DeliverBillType", "DeliverSubBillType", "ErpToLoc", "IsReplenished", "LastUpdate", "MatchNumber", "OrderNum", "PjsNum", "Qty", "ReMark", "RealCode", "RealPartCode", "Seq", "SettlementPartCode", "SettlementVinCode", "UniqueCode", "VinCode", "factory" },
+                values: new object[] { new Guid("67c5b578-8110-4674-ac1e-c3da0814244a"), null, null, null, "71adabfbf9a74d35985c08ecba2dd537", null, null, 1, null, "ErpToLoc", null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), null, "OrderNum", null, 0m, null, null, "PartCode", null, null, null, null, "VinCode", null });
+
+            migrationBuilder.UpdateData(
+                table: "Set_VmiSyncTask",
+                keyColumn: "Id",
+                keyValue: new Guid("08de7a37-5ede-f524-cb3d-3c80888fd7d8"),
+                columns: new[] { "ConcurrencyStamp", "LastUpdate" },
+                values: new object[] { "09290251f9914e5385fbae2fa00c4734", new DateTime(2023, 8, 20, 0, 0, 0, 0, DateTimeKind.Local) });
+
+            migrationBuilder.UpdateData(
+                table: "Set_VmiSyncTask",
+                keyColumn: "Id",
+                keyValue: new Guid("b8ba69e3-f5a3-c95e-8f82-c9c2fec960b4"),
+                columns: new[] { "ConcurrencyStamp", "LastUpdate" },
+                values: new object[] { "cecf7d9ac9924ac99b3665395406b3af", new DateTime(2023, 8, 20, 0, 0, 0, 0, DateTimeKind.Local) });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Set_VmiReplenished");
+
+            migrationBuilder.DeleteData(
+                table: "Set_VmiBalance",
+                keyColumn: "Id",
+                keyValue: new Guid("67c5b578-8110-4674-ac1e-c3da0814244a"));
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "Set_VmiSyncTask",
+                type: "nvarchar(40)",
+                maxLength: 40,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(50)",
+                oldMaxLength: 50,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "Set_VmiMessage",
+                type: "nvarchar(40)",
+                maxLength: 40,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(50)",
+                oldMaxLength: 50,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "ConcurrencyStamp",
+                table: "Set_VmiBalance",
+                type: "nvarchar(40)",
+                maxLength: 40,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(50)",
+                oldMaxLength: 50,
+                oldNullable: true);
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "fe58be3c510f477da0752ac73c40d681");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "5b04d6f48ea64f1594b4f54a57b74637");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "f31814e50b6f41f384278fb6f0af0998");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "0198660d53f34e529c1b72060251e05d");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "2c87caef446f428da6f3f243e8d7c3f9");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8e1cb5a9-8bcf-17fd-97e3-4c10532a5794"),
+                column: "ConcurrencyStamp",
+                value: "613b7650456c4c97a67bcff9c90a32d0");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "b4f16078aa6f43d49da98f03072c7ce9");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "6a28afa95d824c11adf073841328d4d7");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "cfd79a067c014e8fa2123fe3d3055af5");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "9df05934dd384f12a55d4469cad4ef08");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c3fe2b66-28cc-c612-eca6-a362769ae90c"),
+                column: "ConcurrencyStamp",
+                value: "79a28a9f333543219b44e10b1c50d8ef");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "40066948ecb841e4849cfb928b117045");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "134d1d1587d64f3abd932d6bc86d8e57");
+
+            migrationBuilder.InsertData(
+                table: "Set_VmiBalance",
+                columns: new[] { "Id", "AssembleData", "BillTime", "CodeType", "ConcurrencyStamp", "Configcode", "CustPartCode", "DeliverBillType", "DeliverSubBillType", "ErpToLoc", "IsReplenished", "LastUpdate", "MatchNumber", "OrderNum", "PjsNum", "Qty", "ReMark", "RealCode", "RealPartCode", "Seq", "SettlementPartCode", "SettlementVinCode", "UniqueCode", "VinCode", "factory" },
+                values: new object[] { new Guid("eaaaf238-9865-4851-91d4-faa239bf6fca"), null, null, null, "506b3fdc042d453fb4ee16c3fc5fa518", null, null, 1, null, "ErpToLoc", null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), null, "OrderNum", null, 0m, null, null, "PartCode", null, null, null, null, "VinCode", null });
+
+            migrationBuilder.UpdateData(
+                table: "Set_VmiSyncTask",
+                keyColumn: "Id",
+                keyValue: new Guid("08de7a37-5ede-f524-cb3d-3c80888fd7d8"),
+                columns: new[] { "ConcurrencyStamp", "LastUpdate" },
+                values: new object[] { "f489e433f5f14309810179ef2498ec00", new DateTime(2023, 8, 18, 0, 0, 0, 0, DateTimeKind.Local) });
+
+            migrationBuilder.UpdateData(
+                table: "Set_VmiSyncTask",
+                keyColumn: "Id",
+                keyValue: new Guid("b8ba69e3-f5a3-c95e-8f82-c9c2fec960b4"),
+                columns: new[] { "ConcurrencyStamp", "LastUpdate" },
+                values: new object[] { "93224b6dfb8347348e757dd7f828d28d", new DateTime(2023, 8, 18, 0, 0, 0, 0, DateTimeKind.Local) });
+        }
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

@@ -4378,8 +4378,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasMaxLength(50)
-                        .HasColumnType("nvarchar(50)")
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<string>("Cron")
                         .IsRequired()
@@ -4416,7 +4415,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
-                            ConcurrencyStamp = "40066948ecb841e4849cfb928b117045",
+                            ConcurrencyStamp = "e25c06d5cdd34b2bbf909e8c655f94fc",
                             Cron = "0 0 8 26 *",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4426,7 +4425,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
-                            ConcurrencyStamp = "fe58be3c510f477da0752ac73c40d681",
+                            ConcurrencyStamp = "800892b9cac64cb69669dc937238d39d",
                             Cron = "0 0/1 * * * ?",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4436,7 +4435,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
-                            ConcurrencyStamp = "5b04d6f48ea64f1594b4f54a57b74637",
+                            ConcurrencyStamp = "4794bc4fa2ad409ea64cdd2404983475",
                             Cron = "0 0/1 * * * ?",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4446,7 +4445,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("8e1cb5a9-8bcf-17fd-97e3-4c10532a5794"),
-                            ConcurrencyStamp = "613b7650456c4c97a67bcff9c90a32d0",
+                            ConcurrencyStamp = "a4c7d3ff7e3b4578bc2332f114c7a6bb",
                             Cron = "0 0/5 * * * ? *",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4456,7 +4455,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("c3fe2b66-28cc-c612-eca6-a362769ae90c"),
-                            ConcurrencyStamp = "79a28a9f333543219b44e10b1c50d8ef",
+                            ConcurrencyStamp = "98dff4b93f1e4b0ba88a556ab20e7973",
                             Cron = "0 0/5 * * * ? *",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4466,7 +4465,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
-                            ConcurrencyStamp = "6a28afa95d824c11adf073841328d4d7",
+                            ConcurrencyStamp = "4d161eb0a7154f1db4cf7dcca4ffceea",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4476,7 +4475,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
-                            ConcurrencyStamp = "f31814e50b6f41f384278fb6f0af0998",
+                            ConcurrencyStamp = "0efcdccaa94d4e7fb550794d50efa9ab",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4486,7 +4485,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
-                            ConcurrencyStamp = "2c87caef446f428da6f3f243e8d7c3f9",
+                            ConcurrencyStamp = "5f427300bdfd44a19eaf54fddde31db1",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4496,7 +4495,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
-                            ConcurrencyStamp = "0198660d53f34e529c1b72060251e05d",
+                            ConcurrencyStamp = "1e3131d9f8454d96b0429796010752d3",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4506,7 +4505,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
-                            ConcurrencyStamp = "134d1d1587d64f3abd932d6bc86d8e57",
+                            ConcurrencyStamp = "602c85109f6743a6949bb260b3846ca7",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4516,7 +4515,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
-                            ConcurrencyStamp = "b4f16078aa6f43d49da98f03072c7ce9",
+                            ConcurrencyStamp = "3ab808a6104c483496414711259c375b",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4526,7 +4525,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
-                            ConcurrencyStamp = "9df05934dd384f12a55d4469cad4ef08",
+                            ConcurrencyStamp = "742b38d034d94d4685b7f074f35cd3ce",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4536,7 +4535,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
-                            ConcurrencyStamp = "cfd79a067c014e8fa2123fe3d3055af5",
+                            ConcurrencyStamp = "9186efa28e7242bf94451f40834c2160",
                             Cron = "0 0/30 * * * ? ",
                             IsDisabled = false,
                             IsRunning = false,
@@ -4593,9 +4592,8 @@ namespace Win.Sfs.SettleAccount.Migrations
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
-                        .HasMaxLength(40)
-                        .HasColumnType("nvarchar(40)")
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<string>("Configcode")
                         .HasColumnType("nvarchar(450)");
@@ -4676,8 +4674,8 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.HasData(
                         new
                         {
-                            Id = new Guid("eaaaf238-9865-4851-91d4-faa239bf6fca"),
-                            ConcurrencyStamp = "506b3fdc042d453fb4ee16c3fc5fa518",
+                            Id = new Guid("67c5b578-8110-4674-ac1e-c3da0814244a"),
+                            ConcurrencyStamp = "71adabfbf9a74d35985c08ecba2dd537",
                             CreatedTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
                             DeliverBillType = 1,
                             ErpToLoc = "ErpToLoc",
@@ -4801,9 +4799,8 @@ namespace Win.Sfs.SettleAccount.Migrations
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
-                        .HasMaxLength(40)
-                        .HasColumnType("nvarchar(40)")
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<DateTime>("CreatedTime")
                         .HasColumnType("datetime2");
@@ -4855,9 +4852,8 @@ namespace Win.Sfs.SettleAccount.Migrations
 
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
-                        .HasMaxLength(40)
-                        .HasColumnType("nvarchar(40)")
-                        .HasColumnName("ConcurrencyStamp");
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<DateTime>("LastUpdate")
                         .HasColumnType("datetime2");
@@ -4876,16 +4872,16 @@ namespace Win.Sfs.SettleAccount.Migrations
                         new
                         {
                             Id = new Guid("08de7a37-5ede-f524-cb3d-3c80888fd7d8"),
-                            ConcurrencyStamp = "f489e433f5f14309810179ef2498ec00",
-                            LastUpdate = new DateTime(2023, 8, 18, 0, 0, 0, 0, DateTimeKind.Local),
+                            ConcurrencyStamp = "09290251f9914e5385fbae2fa00c4734",
+                            LastUpdate = new DateTime(2023, 8, 20, 0, 0, 0, 0, DateTimeKind.Local),
                             Name = "库存事务备份",
                             Number = "Set_VmiLog"
                         },
                         new
                         {
                             Id = new Guid("b8ba69e3-f5a3-c95e-8f82-c9c2fec960b4"),
-                            ConcurrencyStamp = "93224b6dfb8347348e757dd7f828d28d",
-                            LastUpdate = new DateTime(2023, 8, 18, 0, 0, 0, 0, DateTimeKind.Local),
+                            ConcurrencyStamp = "cecf7d9ac9924ac99b3665395406b3af",
+                            LastUpdate = new DateTime(2023, 8, 20, 0, 0, 0, 0, DateTimeKind.Local),
                             Name = "库存余额备份",
                             Number = "Set_VmiBalance"
                         });
@@ -5725,6 +5721,13 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.ToTable("Set_relationship");
                 });
 
+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.BQ.Vmi.VmiReplenished", b =>
+                {
+                    b.HasBaseType("Win.Sfs.SettleAccount.Entities.BQ.Vmi.VmiLog");
+
+                    b.ToTable("Set_VmiReplenished");
+                });
+
             modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.BQ.Vmi.JobLog", b =>
                 {
                     b.HasOne("Win.Sfs.SettleAccount.Entities.BQ.Vmi.JobItem", "Job")
@@ -5735,6 +5738,15 @@ namespace Win.Sfs.SettleAccount.Migrations
 
                     b.Navigation("Job");
                 });
+
+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.BQ.Vmi.VmiReplenished", b =>
+                {
+                    b.HasOne("Win.Sfs.SettleAccount.Entities.BQ.Vmi.VmiLog", null)
+                        .WithOne()
+                        .HasForeignKey("Win.Sfs.SettleAccount.Entities.BQ.Vmi.VmiReplenished", "Id")
+                        .OnDelete(DeleteBehavior.ClientCascade)
+                        .IsRequired();
+                });
 #pragma warning restore 612, 618
         }
     }