up

1 year ago · 42677b2533
5 changed files with 6037 additions and 23 deletions
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SA_SERVICE.cs
@ -433,14 +433,16 @@ public class PUB_SA_SERVICE : SettleAccountApplicationBase<PUB_SA>
        var materialRelationships = new List<MaterialRelationship>();

        #region 处理结算数据
-        pubSaDetails.ForEach(importPubSaDetail =>
-        {
-            importPubSaDetail.SetId(GuidGenerator.Create());
-            importPubSaDetail.CustomerPartCodeNoSpace = importPubSaDetail.LU.Replace(" ", "");
-            importPubSaDetail.KeyCode = importPubSaDetail.PN + importPubSaDetail.LU;
-            importPubSaDetail.Version = _version;
-            importPubSaDetail.BusinessType = businessType;
-        });
+        for (var i = 0; i < pubSaDetails.Count; i++)
+        {
+            var pubSaDetail = pubSaDetails[i];
+            pubSaDetail.SetId(GuidGenerator.Create());
+            pubSaDetail.CustomerPartCodeNoSpace = pubSaDetail.LU.Replace(" ", "");
+            pubSaDetail.KeyCode = pubSaDetail.PN + pubSaDetail.LU;
+            pubSaDetail.Version = _version;
+            pubSaDetail.BusinessType = businessType;
+            pubSaDetail.IndexNum = i;
+        }
        var lus = pubSaDetails.Select(t => t.LU).Distinct().ToList();

        var clientCode = businessType switch
--- 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,10 @@ 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.EntityFrameworkCore/Migrations/20230913024309_20230913-1.Designer.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230913024309_20230913-1.Designer.cs
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230913024309_20230913-1.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230913024309_20230913-1.cs
@ -0,0 +1,201 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202309131 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "IndexNum",
+                table: "Set_PUB_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            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");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_PUB_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_HBPO_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "IndexNum",
+                table: "Set_BBAC_SA_DETAIL");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "dece69c1928241df9f38feccf47d0c0a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "431db509a1f34bfe9fd1a4d7efcf1d4c");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "06df83918cbc4543a2b44a83f739dc67");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "9004a8ecf43a4fe1848f6802a6d4576f");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "960ce38962e949558923f71d04f4e338");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "f9c840d4749b410982c3288ce64a8691");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "de291b54ac7e487988bb2660050b0db4");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "3ec6e8d3979a41088508d5ec64f5118a");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "e5bf812fc44e445991f4a7b6ece063db");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "18add54a57684dd1818440f0d5005ebb");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "03899f76c20043e896f38246ccb0d037");
+        }
+    }
+}
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs
@ -583,6 +583,9 @@ 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)");
@ -1818,6 +1821,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)");
@ -3570,6 +3576,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");

+                    b.Property<int>("IndexNum")
+                        .HasColumnType("int");
+
                    b.Property<string>("KeyCode")
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");
@ -4477,7 +4486,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
-                            ConcurrencyStamp = "18add54a57684dd1818440f0d5005ebb",
+                            ConcurrencyStamp = "0227468d6ab64b9c86ed33e7feaf88ae",
                            Cron = "0 0 8 26 *",
                            IsDisabled = false,
                            IsRunning = false,
@ -4487,7 +4496,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
-                            ConcurrencyStamp = "dece69c1928241df9f38feccf47d0c0a",
+                            ConcurrencyStamp = "99884a6a7033490bbc93b2ffcf1212fe",
                            Cron = "0 0/1 * * * ?",
                            IsDisabled = false,
                            IsRunning = false,
@ -4497,7 +4506,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
-                            ConcurrencyStamp = "431db509a1f34bfe9fd1a4d7efcf1d4c",
+                            ConcurrencyStamp = "d6b499590a7f4d738e6d4d53cbae1419",
                            Cron = "0 0/1 * * * ?",
                            IsDisabled = false,
                            IsRunning = false,
@ -4507,7 +4516,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
-                            ConcurrencyStamp = "de291b54ac7e487988bb2660050b0db4",
+                            ConcurrencyStamp = "a0869b3e24eb4620bd5f01db384652ac",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4517,7 +4526,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
-                            ConcurrencyStamp = "06df83918cbc4543a2b44a83f739dc67",
+                            ConcurrencyStamp = "708a84b07be44ee99c1e70fe0f42820e",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4527,7 +4536,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
-                            ConcurrencyStamp = "960ce38962e949558923f71d04f4e338",
+                            ConcurrencyStamp = "787cc284e9db4280a35d2ee3d71c0822",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4537,7 +4546,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
-                            ConcurrencyStamp = "9004a8ecf43a4fe1848f6802a6d4576f",
+                            ConcurrencyStamp = "b80a98f0c7154dfeb56c387e2e22c482",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4547,7 +4556,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
-                            ConcurrencyStamp = "03899f76c20043e896f38246ccb0d037",
+                            ConcurrencyStamp = "8934e9981b4041249cdeaf63ff00c468",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4557,7 +4566,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
-                            ConcurrencyStamp = "f9c840d4749b410982c3288ce64a8691",
+                            ConcurrencyStamp = "32e17d97277a40b991b7f54e22668bac",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4567,7 +4576,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
-                            ConcurrencyStamp = "e5bf812fc44e445991f4a7b6ece063db",
+                            ConcurrencyStamp = "5da31dc2347145acbc2b660c3adbb582",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4577,7 +4586,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
-                            ConcurrencyStamp = "3ec6e8d3979a41088508d5ec64f5118a",
+                            ConcurrencyStamp = "8b15dfbd04ac49f2b52a3db7d7ebe9ed",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,