up

1 year ago · 7d0e7c5e0a
7 changed files with 6046 additions and 29 deletions
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs
@ -399,10 +399,6 @@ namespace SettleAccount.Bases
        /// 匹配类型
        /// </summary>
        public EnumMappingType MappingType { get; set; }
-        /// <summary>
-        /// 计数
-        /// </summary>
-        public int IndexNum { get; set; }
    }

    public class SA_CAN_BASE : AuditedAggregateRoot<Guid>, ISA_BASE
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_CAN_SA.cs
@ -108,7 +108,11 @@ public class PUB_CAN_SA_DETAIL : SA_CAN_BASE

    [Display(Name = "订单号")]
    public string PoBillNum { get; set; }
-
+    /// <summary>
+    /// 计数
+    /// </summary>
+    [Display(Name = "计数")]
+    public int IndexNum { get; set; }
    /// <summary>
    /// 对应字段DeliveryNode
    /// </summary>
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_NOT_SA_DETAIL.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_NOT_SA_DETAIL.cs
@ -69,7 +69,11 @@ public class PUB_NOT_SA_DETAIL : SA_NOT_BASE
    //public string GroupNum { get; set; } = null!;
    [Display(Name ="订单号")]
    public string PoBillNum { get; set; }
-
+    /// <summary>
+    /// 计数
+    /// </summary>
+    [Display(Name = "计数")]
+    public int IndexNum { get; set; }

    public PUB_NOT_SA_DETAIL(string keyCode, int version, string settleBillNum, string lU, string pN, string site, decimal qty, string extend1, string extend2, string extend3, decimal price, string invGroupNum, DateTime settleDate, EnumBusinessType businessType, string groupNum,string partcode,string pobillnum)
    {
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SA.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SA.cs
@ -110,12 +110,11 @@ public class PUB_SA_DETAIL:SA_BASE

    [Display(Name = "扩展字段3")]
    public string Extend3 { get; set; } = null!;
-
-    ///// <summary>
-    ///// 对应字段Reference
-    ///// </summary>
-    //[Display(Name = "结算分组")]
-    //public string GroupNum { get; set; } = null!;
+    /// <summary>
+    /// 计数
+    /// </summary>
+    [Display(Name = "计数")]
+    public int IndexNum { get; set; }

    public PUB_SA_DETAIL(Guid guid, string keyCode, int version, string billNum, string lU, string pN, string site, decimal qty, decimal price, string invGroupNum, DateTime settleDate, string extend1, string extend2, string extend3, string groupNum)
    {
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230913025512_20230913-2.Designer.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230913025512_20230913-2.Designer.cs
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230913025512_20230913-2.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230913025512_20230913-2.cs
@ -0,0 +1,212 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202309132 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_HBPO_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_BBAC_SA_DETAIL");
+
+            migrationBuilder.AddColumn<int>(
+                name: "IndexNum",
+                table: "Set_PUB_NOT_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IndexNum",
+                table: "Set_PUB_CAN_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "b3c6a359087b41e4b586c8c172efae5d");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "a37556b1d5ab4bc5b0cf1c1622eefff3");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "b2fdf754c09d4f3f816a378f71b76b6f");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "65b4aa76401a4f1ab800dc8b1702f0b9");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "136aad88976d4bf9b58a6e3586ca9fe1");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "017827b08deb447ab5729a69e06d31dd");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "289386fefb924a41afcc768204745473");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "30329237998d4b458194994a3e2229e5");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "a36bef05d3324491ac31fae24d5d622a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "8516c291b3ed4d5aba3a1a832535c4ae");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "d2500499b42341d784f5067aa91cf66d");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_PUB_NOT_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_PUB_CAN_SA_DETAIL");
+
+            migrationBuilder.AddColumn<int>(
+                name: "IndexNum",
+                table: "Set_HBPO_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "IndexNum",
+                table: "Set_BBAC_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "99884a6a7033490bbc93b2ffcf1212fe");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "d6b499590a7f4d738e6d4d53cbae1419");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "708a84b07be44ee99c1e70fe0f42820e");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "b80a98f0c7154dfeb56c387e2e22c482");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "787cc284e9db4280a35d2ee3d71c0822");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "32e17d97277a40b991b7f54e22668bac");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "a0869b3e24eb4620bd5f01db384652ac");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "8b15dfbd04ac49f2b52a3db7d7ebe9ed");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "5da31dc2347145acbc2b660c3adbb582");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "0227468d6ab64b9c86ed33e7feaf88ae");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "8934e9981b4041249cdeaf63ff00c468");
+        }
+    }
+}
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs
@ -583,9 +583,6 @@ namespace Win.Sfs.SettleAccount.Migrations
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");

-                    b.Property<int>("IndexNum")
-                        .HasColumnType("int");
-
                    b.Property<string>("IsReturn")
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");
@ -1821,9 +1818,6 @@ namespace Win.Sfs.SettleAccount.Migrations
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");

-                    b.Property<int>("IndexNum")
-                        .HasColumnType("int");
-
                    b.Property<string>("InvGroupNum")
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");
@ -3116,6 +3110,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");

+                    b.Property<int>("IndexNum")
+                        .HasColumnType("int");
+
                    b.Property<string>("InvGroupNum")
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");
@ -3224,6 +3221,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");

+                    b.Property<int>("IndexNum")
+                        .HasColumnType("int");
+
                    b.Property<string>("InvGroupNum")
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");
@ -4486,7 +4486,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
-                            ConcurrencyStamp = "0227468d6ab64b9c86ed33e7feaf88ae",
+                            ConcurrencyStamp = "8516c291b3ed4d5aba3a1a832535c4ae",
                            Cron = "0 0 8 26 *",
                            IsDisabled = false,
                            IsRunning = false,
@ -4496,7 +4496,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
-                            ConcurrencyStamp = "99884a6a7033490bbc93b2ffcf1212fe",
+                            ConcurrencyStamp = "b3c6a359087b41e4b586c8c172efae5d",
                            Cron = "0 0/1 * * * ?",
                            IsDisabled = false,
                            IsRunning = false,
@ -4506,7 +4506,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
-                            ConcurrencyStamp = "d6b499590a7f4d738e6d4d53cbae1419",
+                            ConcurrencyStamp = "a37556b1d5ab4bc5b0cf1c1622eefff3",
                            Cron = "0 0/1 * * * ?",
                            IsDisabled = false,
                            IsRunning = false,
@ -4516,7 +4516,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
-                            ConcurrencyStamp = "a0869b3e24eb4620bd5f01db384652ac",
+                            ConcurrencyStamp = "289386fefb924a41afcc768204745473",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4526,7 +4526,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
-                            ConcurrencyStamp = "708a84b07be44ee99c1e70fe0f42820e",
+                            ConcurrencyStamp = "b2fdf754c09d4f3f816a378f71b76b6f",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4536,7 +4536,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
-                            ConcurrencyStamp = "787cc284e9db4280a35d2ee3d71c0822",
+                            ConcurrencyStamp = "136aad88976d4bf9b58a6e3586ca9fe1",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4546,7 +4546,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
-                            ConcurrencyStamp = "b80a98f0c7154dfeb56c387e2e22c482",
+                            ConcurrencyStamp = "65b4aa76401a4f1ab800dc8b1702f0b9",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4556,7 +4556,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
-                            ConcurrencyStamp = "8934e9981b4041249cdeaf63ff00c468",
+                            ConcurrencyStamp = "d2500499b42341d784f5067aa91cf66d",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4566,7 +4566,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
-                            ConcurrencyStamp = "32e17d97277a40b991b7f54e22668bac",
+                            ConcurrencyStamp = "017827b08deb447ab5729a69e06d31dd",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4576,7 +4576,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
-                            ConcurrencyStamp = "5da31dc2347145acbc2b660c3adbb582",
+                            ConcurrencyStamp = "a36bef05d3324491ac31fae24d5d622a",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4586,7 +4586,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
-                            ConcurrencyStamp = "8b15dfbd04ac49f2b52a3db7d7ebe9ed",
+                            ConcurrencyStamp = "30329237998d4b458194994a3e2229e5",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,