Merge branch 'master' of https://e.coding.net/ccwin-in/PG/Win.sfs.SmartSettlementSystem.PG

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

@@ -378,7 +378,7 @@ namespace Win.Sfs.SettleAccount
             builder.ConfigureWmsOneTimeSaleOutPutDetial(options);
 
             builder.ConfigureWmsDetailReport(options);
-
+            builder.ConfigureWmsDetailDiffReport(options);
 
             #endregion
 
@@ -580,7 +580,31 @@ namespace Win.Sfs.SettleAccount
 
             });
         }
+        private static void ConfigureWmsDetailDiffReport(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+        {
+
+            builder.Entity<WmsDetailDiffReport>(b =>
+            {
+
+                b.ToTable($"{options.TablePrefix}_WmsDetailDiffReport", options.Schema);
+
+                b.ConfigureByConvention();
+                b.Property(x => x.BillNum).IsRequired().HasMaxLength(50);//必填项
+                b.Property(x => x.MaterialCode).HasMaxLength(50);
+                b.Property(x => x.MaterialDesc).HasMaxLength(100);
+                b.Property(x => x.Client).IsRequired().HasMaxLength(50);
               
+                b.Property(x => x.MaterialCode).HasMaxLength(50);
+                b.Property(x => x.MaterialDesc).HasMaxLength(150);
+
+                b.Property(x => x.MaterialGroup).HasMaxLength(50);
+                b.Property(x => x.MaterialGroupCode).HasMaxLength(50);
+             
+                //创建组合索引
+
+
+            });
+        }
 
         private static void ConfigureHQMKanban(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
         {

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309044526_20220207.cs

@@ -1,62 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Win.Sfs.SettleAccount.Migrations
-{
-    public partial class _20220207 : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Set_WmsDetailReport",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    LineNumber = table.Column<int>(type: "int", nullable: false),
-                    Version = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Client = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
-                    Type = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    SettleCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    SaleCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    ClientCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    BillNum = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
-                    MaterialCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    OutputQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    DiffQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    Price = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    Amt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    OutPutAmt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    DiffAmt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    MaterialGroupCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    MaterialGroup = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    MaterialDesc = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: true),
-                    Remark1 = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    State = table.Column<int>(type: "int", nullable: false),
-                    AccountDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_WmsDetailReport", x => x.Id);
-                });
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Set_WmsDetailReport");
-        }
-    }
-}

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309044526_20220207.Designer.cs → src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220311042548_Init.Designer.cs

@@ -11,8 +11,8 @@ using Win.Sfs.SettleAccount;
 namespace Win.Sfs.SettleAccount.Migrations
 {
     [DbContext(typeof(SettleAccountDbContext))]
-    [Migration("20220309044526_20220207")]
+    [Migration("20220311042548_Init")]
-    partial class _20220207
+    partial class Init
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -11392,6 +11392,116 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.ToTable("Set_WMSSparePart");
                 });
 
+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.WmsDetailDiffReport", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("BillNum")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<Guid>("BranchId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<decimal>("DiffQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MaterialCode")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("MaterialDesc")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("MaterialGroup")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("MaterialGroupCode")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<decimal>("OutputQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("Qty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Remark1")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("State")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SwitchCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Type")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Version")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Set_WmsDetailDiffReport");
+                });
+
             modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.WmsDetailReport", b =>
                 {
                     b.Property<Guid>("Id")

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220309043455_1.cs → src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20220311042548_Init.cs

@@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 
 namespace Win.Sfs.SettleAccount.Migrations
 {
-    public partial class _1 : Migration
+    public partial class Init : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {
@@ -3412,6 +3412,88 @@ namespace Win.Sfs.SettleAccount.Migrations
                     table.PrimaryKey("PK_Set_Unsettle_Version", x => x.Id);
                 });
 
+            migrationBuilder.CreateTable(
+                name: "Set_WmsDetailDiffReport",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Version = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Client = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    Type = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    BillNum = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    SwitchCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    MaterialCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    OutputQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    DiffQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    MaterialGroupCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    MaterialGroup = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    MaterialDesc = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: true),
+                    Remark1 = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    State = table.Column<int>(type: "int", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Set_WmsDetailDiffReport", x => x.Id);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "Set_WmsDetailReport",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    LineNumber = table.Column<int>(type: "int", nullable: false),
+                    Version = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    Client = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    Type = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    SettleCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    SaleCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    ClientCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    BillNum = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
+                    MaterialCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    OutputQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    DiffQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    Price = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    Amt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    OutPutAmt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    DiffAmt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
+                    MaterialGroupCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    MaterialGroup = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
+                    MaterialDesc = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: true),
+                    Remark1 = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    State = table.Column<int>(type: "int", nullable: false),
+                    AccountDate = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
+                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
+                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    Enabled = table.Column<bool>(type: "bit", nullable: false),
+                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Set_WmsDetailReport", x => x.Id);
+                });
+
             migrationBuilder.CreateTable(
                 name: "Set_WmsHQCarOutPut",
                 columns: table => new
@@ -5963,6 +6045,12 @@ namespace Win.Sfs.SettleAccount.Migrations
             migrationBuilder.DropTable(
                 name: "Set_Unsettle_Version");
 
+            migrationBuilder.DropTable(
+                name: "Set_WmsDetailDiffReport");
+
+            migrationBuilder.DropTable(
+                name: "Set_WmsDetailReport");
+
             migrationBuilder.DropTable(
                 name: "Set_WmsHQCarOutPut");
 

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

@@ -11390,6 +11390,116 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.ToTable("Set_WMSSparePart");
                 });
 
+            modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.WmsDetailDiffReport", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("BillNum")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<Guid>("BranchId")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<string>("Client")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasMaxLength(40)
+                        .HasColumnType("nvarchar(40)")
+                        .HasColumnName("ConcurrencyStamp");
+
+                    b.Property<DateTime>("CreationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
+
+                    b.Property<Guid?>("DeleterId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("DeleterId");
+
+                    b.Property<DateTime?>("DeletionTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("DeletionTime");
+
+                    b.Property<decimal>("DiffQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<bool>("Enabled")
+                        .HasColumnType("bit");
+
+                    b.Property<string>("ExtraProperties")
+                        .HasColumnType("nvarchar(max)")
+                        .HasColumnName("ExtraProperties");
+
+                    b.Property<bool>("IsDeleted")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("bit")
+                        .HasDefaultValue(false)
+                        .HasColumnName("IsDeleted");
+
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
+                    b.Property<string>("MaterialCode")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("MaterialDesc")
+                        .HasMaxLength(150)
+                        .HasColumnType("nvarchar(150)");
+
+                    b.Property<string>("MaterialGroup")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<string>("MaterialGroupCode")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
+                    b.Property<decimal>("OutputQty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<decimal>("Qty")
+                        .HasColumnType("decimal(18,2)");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Remark1")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<int>("State")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SwitchCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Type")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Version")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("Set_WmsDetailDiffReport");
+                });
+
             modelBuilder.Entity("Win.Sfs.SettleAccount.Entities.WmsDetailReport", b =>
                 {
                     b.Property<Guid>("Id")

src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/SettleAccount.EntityFrameworkCore.csproj

@@ -31,4 +31,8 @@
     <ProjectReference Include="..\SettleAccount.Domain\SettleAccount.Domain.csproj" />
   </ItemGroup>
 	
+  <ItemGroup>
+    <Folder Include="Migrations\" />
+  </ItemGroup>
+
 </Project>