Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Bases/EntityBase.cs

@@ -355,7 +355,7 @@ namespace SettleAccount.Bases
         /// </summary>
         public virtual DateTime SettleDate { set; get; }
         /// <summary>
-        /// 零件號
+        /// 客户物料号
         /// </summary>
         public virtual string LU { get ; set ; }
         /// <summary>
@@ -374,7 +374,10 @@ namespace SettleAccount.Bases
         /// 結算分組號
         /// </summary>
         public virtual string GroupNum { get ; set ; }
-
+        /// <summary>
+        /// 厂内物料号
+        /// </summary>
+        public virtual string PartCode { get; set; }
     }
 
     public class SA_CAN_BASE : AuditedAggregateRoot<Guid>, ISA_BASE
@@ -534,9 +537,9 @@ namespace SettleAccount.Bases
         /// 发运单号
         /// </summary>
         public string WmsBillNum { set; get; }
-       
+
         /// <summary>
-        /// 零件號
+        /// 厂内零件号
         /// </summary>
         public string LU { get; set; }
         /// <summary>
@@ -551,7 +554,6 @@ namespace SettleAccount.Bases
         /// 數量
         /// </summary>
         public decimal Qty { get; set; }
-
     }
     public class PD_BASE : FullAuditedAggregateRoot<Guid>, ISBASE
     {

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230810012032_20230810-1.cs

@@ -0,0 +1,64 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202308101 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "Set_VmiBalance",
+                keyColumn: "Id",
+                keyValue: new Guid("6c0cbeb6-6530-4ede-ac96-d0f294f76086"));
+
+            migrationBuilder.AddColumn<string>(
+                name: "PartCode",
+                table: "Set_PUB_SA_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PartCode",
+                table: "Set_HBPO_SA_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PartCode",
+                table: "Set_BBAC_SA_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.InsertData(
+                table: "Set_VmiBalance",
+                columns: new[] { "Id", "BackupTime", "BillTime", "BillType", "CodeType", "ConcurrencyStamp", "Configcode", "CustomerPartCode", "DeliverTime", "ErpToLoc", "MatchNumber", "OrderNum", "PartCode", "PjsNum", "Qty", "ReMark", "RealCode", "Seq", "SubBillType", "UniqueCode", "VinCode", "factory" },
+                values: new object[] { new Guid("ce5291a6-b9d4-48b4-9c6d-4ce09ed4cbf9"), null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), 1, null, "3f981885343b41278337f1b6de40088b", null, null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), "ErpToLoc", null, "OrderNum", "PartCode", null, 0m, null, null, null, 0, null, "VinCode", null });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DeleteData(
+                table: "Set_VmiBalance",
+                keyColumn: "Id",
+                keyValue: new Guid("ce5291a6-b9d4-48b4-9c6d-4ce09ed4cbf9"));
+
+            migrationBuilder.DropColumn(
+                name: "PartCode",
+                table: "Set_PUB_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "PartCode",
+                table: "Set_HBPO_SA_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "PartCode",
+                table: "Set_BBAC_SA_DETAIL");
+
+            migrationBuilder.InsertData(
+                table: "Set_VmiBalance",
+                columns: new[] { "Id", "BackupTime", "BillTime", "BillType", "CodeType", "ConcurrencyStamp", "Configcode", "CustomerPartCode", "DeliverTime", "ErpToLoc", "MatchNumber", "OrderNum", "PartCode", "PjsNum", "Qty", "ReMark", "RealCode", "Seq", "SubBillType", "UniqueCode", "VinCode", "factory" },
+                values: new object[] { new Guid("6c0cbeb6-6530-4ede-ac96-d0f294f76086"), null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), 1, null, "4d0aea6c7eb24ecf908624ef4ffc315a", null, null, new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified), "ErpToLoc", null, "OrderNum", "PartCode", null, 0m, null, null, null, 0, null, "VinCode", null });
+        }
+    }
+}

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

@@ -569,6 +569,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<string>("PartCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<decimal>("Price")
                         .HasColumnType("decimal(18,2)");
 
@@ -1704,6 +1707,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<string>("PartCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<decimal>("Price")
                         .HasColumnType("decimal(18,2)");
 
@@ -3342,6 +3348,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<string>("PartCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<decimal>("Price")
                         .HasColumnType("decimal(18,2)");
 
@@ -4366,10 +4375,10 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.HasData(
                         new
                         {
-                            Id = new Guid("6c0cbeb6-6530-4ede-ac96-d0f294f76086"),
+                            Id = new Guid("ce5291a6-b9d4-48b4-9c6d-4ce09ed4cbf9"),
                             BillTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
                             BillType = 1,
-                            ConcurrencyStamp = "4d0aea6c7eb24ecf908624ef4ffc315a",
+                            ConcurrencyStamp = "3f981885343b41278337f1b6de40088b",
                             DeliverTime = new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified),
                             ErpToLoc = "ErpToLoc",
                             OrderNum = "OrderNum",