up

1 year ago · eab056b0f7
5 changed files with 6022 additions and 34 deletions
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs
@ -12,6 +12,7 @@ using Volo.Abp.Validation;
 using Win.Sfs.SettleAccount;
 using Win.Sfs.SettleAccount.Entities.BQ.Syncs;
 using Win.Sfs.SettleAccount.Entities.SettleAccountDomain;
+using Win.Sfs.SettleAccount.Enums;
 using static System.Runtime.CompilerServices.RuntimeHelpers;

 namespace SettleAccount.Bases
@ -342,11 +343,8 @@ namespace SettleAccount.Bases

    public class SA_BASE : AuditedAggregateRoot<Guid>, ISA_BASE
    {
-
-
        public SA_BASE() { }
        public SA_BASE(Guid id) : base(id) { }
-
        /// <summary>
        /// 期间
        /// </summary>
@ -392,16 +390,15 @@ namespace SettleAccount.Bases
        /// 厂内物料号
        /// </summary>
        public virtual string PartCode { get; set; }
-
-
-
-
-
        /// <summary>
        /// 业务分类
        /// </summary>
        [Display(Name = "业务分类")]
        public EnumBusinessType BusinessType { get; set; }
+        /// <summary>
+        /// 匹配类型
+        /// </summary>
+        public EnumMappingType MappingType { get; set; }
    }

    public class SA_CAN_BASE : AuditedAggregateRoot<Guid>, ISA_BASE
@ -605,12 +602,6 @@ namespace SettleAccount.Bases
        /// </summary>
        [Display(Name = "业务分类")]
        public EnumBusinessType BusinessType { get; set; }
-        [Display(Name = "日顺序号")]
-        public string SeqNumber { get; set; } = null!;
-        [Display(Name = "小总成号")]
-        public string AssemblyCode { get; set; } = null!;
-        [Display(Name = "注塑码")]
-        public string InjectionCode { get; set; } = null!;
        [Display(Name = "订单时间")]
        public DateTime BeginDate { get; set; }
    }
@ -695,6 +686,12 @@ namespace SettleAccount.Bases

    public class JisSeBase : SE_BASE
    {
+        [Display(Name = "日顺序号")]
+        public string SeqNumber { get; set; }
+        [Display(Name = "小总成号")]
+        public string AssemblyCode { get; set; }
+        [Display(Name = "注塑码")]
+        public string InjectionCode { get; set; }
        /// <summary>
        /// UID
        /// </summary>
--- a/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs
@ -17,15 +17,6 @@ public class PUB_SE_DETAIL :SE_BASE

    [Display(Name = "扩展3")]
    public string Extend3 { get; set; } = null!;
-
-    /// <summary>
-    /// 业务分类
-    /// </summary>
-    [Display(Name = "业务分类")]
-    public EnumBusinessType BusinessType { get; set; }
-
-    [Display(Name = "订单时间")]
-    public DateTime BeginDate { get; set; }
    /// <summary>
    /// UID
    /// </summary>
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230908053049_20230908-2.Designer.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230908053049_20230908-2.Designer.cs
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230908053049_20230908-2.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230908053049_20230908-2.cs
@ -0,0 +1,201 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202309082 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "MappingType",
+                table: "Set_PUB_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "MappingType",
+                table: "Set_HBPO_SA_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "MappingType",
+                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: "1aefd0b8d1ab49458c36e3932717ab35");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "6b33d7dda3f645dcbe8b4a3f51a7399f");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "22c0f3b78cf8410392dbaf098eecc973");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "25d4d2fdf5e6403188ccd684459a6a47");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "9475ae5b030a480b81c539f9eeabd7d5");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "cdd7dba0132b488aa38becaebc9725eb");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "f54dc633986d4eba9ce0793f450545c0");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "d3521bfcefe94a38962bd1b7d72ed219");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "c63da47e046c4d8cbe927a450388df2f");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "024d5742d21c41e4b63052f4e03f15f8");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "ff08e4cbf0c0461d8426470f9b84bf62");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "MappingType",
+                table: "Set_PUB_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "MappingType",
+                table: "Set_HBPO_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "MappingType",
+                table: "Set_BBAC_SA_DETAIL");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
+                column: "ConcurrencyStamp",
+                value: "47fe18e0c4174614b1fcf60db5a35627");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
+                column: "ConcurrencyStamp",
+                value: "7ef18156df8f444b97ea9c14d54dbd42");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
+                column: "ConcurrencyStamp",
+                value: "12c345ad1a5146f993350fef54c3c6a7");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
+                column: "ConcurrencyStamp",
+                value: "015197fa7217489f87d3f2aa90b88c9f");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
+                column: "ConcurrencyStamp",
+                value: "0add991c7b55439d831a4df9d8073ea2");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
+                column: "ConcurrencyStamp",
+                value: "81771ab92b504c57bf3e240e41174522");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
+                column: "ConcurrencyStamp",
+                value: "02504a27952b462b8e294ff5886cb884");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
+                column: "ConcurrencyStamp",
+                value: "4962eff9d1874befaef668e046480d92");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
+                column: "ConcurrencyStamp",
+                value: "ac058682bcfd43a4922543012c542b0c");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
+                column: "ConcurrencyStamp",
+                value: "be930d1502d742a8ae7d784c1a05ff60");
+
+            migrationBuilder.UpdateData(
+                table: "Set_JobItem",
+                keyColumn: "Id",
+                keyValue: new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
+                column: "ConcurrencyStamp",
+                value: "e32d05eeb3ba41148010a47c05753298");
+        }
+    }
+}
--- a/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs
+++ b/code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs
@ -603,6 +603,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                        .HasColumnType("uniqueidentifier")
                        .HasColumnName("LastModifierId");

+                    b.Property<int>("MappingType")
+                        .HasColumnType("int");
+
                    b.Property<string>("PN")
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");
@ -1835,6 +1838,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                        .HasColumnType("uniqueidentifier")
                        .HasColumnName("LastModifierId");

+                    b.Property<int>("MappingType")
+                        .HasColumnType("int");
+
                    b.Property<string>("PN")
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");
@ -3577,6 +3583,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                        .HasColumnType("uniqueidentifier")
                        .HasColumnName("LastModifierId");

+                    b.Property<int>("MappingType")
+                        .HasColumnType("int");
+
                    b.Property<string>("PN")
                        .HasMaxLength(50)
                        .HasColumnType("nvarchar(50)");
@ -4465,7 +4474,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("ef3d8e8a-a88e-ca1f-e615-714c6bc48824"),
-                            ConcurrencyStamp = "be930d1502d742a8ae7d784c1a05ff60",
+                            ConcurrencyStamp = "024d5742d21c41e4b63052f4e03f15f8",
                            Cron = "0 0 8 26 *",
                            IsDisabled = false,
                            IsRunning = false,
@ -4475,7 +4484,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("185c5968-e02b-267e-db2f-225fccfc9716"),
-                            ConcurrencyStamp = "47fe18e0c4174614b1fcf60db5a35627",
+                            ConcurrencyStamp = "1aefd0b8d1ab49458c36e3932717ab35",
                            Cron = "0 0/1 * * * ?",
                            IsDisabled = false,
                            IsRunning = false,
@ -4485,7 +4494,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("1bb02f67-ed05-6cc1-1507-502e8f6c7a31"),
-                            ConcurrencyStamp = "7ef18156df8f444b97ea9c14d54dbd42",
+                            ConcurrencyStamp = "6b33d7dda3f645dcbe8b4a3f51a7399f",
                            Cron = "0 0/1 * * * ?",
                            IsDisabled = false,
                            IsRunning = false,
@ -4495,7 +4504,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("b9b9c79f-4894-474b-4f67-b1ec121c41e5"),
-                            ConcurrencyStamp = "02504a27952b462b8e294ff5886cb884",
+                            ConcurrencyStamp = "f54dc633986d4eba9ce0793f450545c0",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4505,7 +4514,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("49b1da12-418c-544d-fe8b-be7e5b572452"),
-                            ConcurrencyStamp = "12c345ad1a5146f993350fef54c3c6a7",
+                            ConcurrencyStamp = "22c0f3b78cf8410392dbaf098eecc973",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4515,7 +4524,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("7a0dc087-a859-5863-eb6e-56f588bd779e"),
-                            ConcurrencyStamp = "0add991c7b55439d831a4df9d8073ea2",
+                            ConcurrencyStamp = "9475ae5b030a480b81c539f9eeabd7d5",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4525,7 +4534,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("6f68fc8f-b058-c3f4-e07d-722c61f3f7fa"),
-                            ConcurrencyStamp = "015197fa7217489f87d3f2aa90b88c9f",
+                            ConcurrencyStamp = "25d4d2fdf5e6403188ccd684459a6a47",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4535,7 +4544,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("f306b380-47e5-5c01-b902-67ca4113a8f4"),
-                            ConcurrencyStamp = "e32d05eeb3ba41148010a47c05753298",
+                            ConcurrencyStamp = "ff08e4cbf0c0461d8426470f9b84bf62",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4545,7 +4554,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("8f7dc23d-e2e9-3691-cfe9-545bb958e3f2"),
-                            ConcurrencyStamp = "81771ab92b504c57bf3e240e41174522",
+                            ConcurrencyStamp = "cdd7dba0132b488aa38becaebc9725eb",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4555,7 +4564,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("c1f71240-1b81-0107-8b23-ddc9811a3efe"),
-                            ConcurrencyStamp = "ac058682bcfd43a4922543012c542b0c",
+                            ConcurrencyStamp = "c63da47e046c4d8cbe927a450388df2f",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,
@ -4565,7 +4574,7 @@ namespace Win.Sfs.SettleAccount.Migrations
                        new
                        {
                            Id = new Guid("c09c23ea-815f-1b43-4476-2365a8d9a60b"),
-                            ConcurrencyStamp = "4962eff9d1874befaef668e046480d92",
+                            ConcurrencyStamp = "d3521bfcefe94a38962bd1b7d72ed219",
                            Cron = "0 0/30 * * * ? ",
                            IsDisabled = false,
                            IsRunning = false,