改拆箱表字段引起的store修改

be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Migrations/20240627020919_Basedata20240627.cs

@@ -0,0 +1,107 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Win_in.Sfs.Basedata.Migrations
+{
+    public partial class Basedata20240627 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "PurchaseInfo_AsnNumber1",
+                table: "Basedata_SplitPackingRec");
+
+            migrationBuilder.DropColumn(
+                name: "PurchaseInfo_PoNumber1",
+                table: "Basedata_SplitPackingRec");
+
+            migrationBuilder.RenameColumn(
+                name: "QualityInfo_QualityFile",
+                table: "Basedata_SplitPackingRec",
+                newName: "QualityFile");
+
+            migrationBuilder.RenameColumn(
+                name: "QualityInfo_QLevel",
+                table: "Basedata_SplitPackingRec",
+                newName: "QLevel");
+
+            migrationBuilder.RenameColumn(
+                name: "PurchaseInfo_SupplierCode",
+                table: "Basedata_SplitPackingRec",
+                newName: "SupplierCode");
+
+            migrationBuilder.RenameColumn(
+                name: "PurchaseInfo_RpNumber",
+                table: "Basedata_SplitPackingRec",
+                newName: "RpNumber");
+
+            migrationBuilder.RenameColumn(
+                name: "ProductionInfo_Team",
+                table: "Basedata_SplitPackingRec",
+                newName: "Team");
+
+            migrationBuilder.RenameColumn(
+                name: "ProductionInfo_Shift",
+                table: "Basedata_SplitPackingRec",
+                newName: "Shift");
+
+            migrationBuilder.RenameColumn(
+                name: "ProductionInfo_ProdLine",
+                table: "Basedata_SplitPackingRec",
+                newName: "ProdLine");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.RenameColumn(
+                name: "Team",
+                table: "Basedata_SplitPackingRec",
+                newName: "ProductionInfo_Team");
+
+            migrationBuilder.RenameColumn(
+                name: "SupplierCode",
+                table: "Basedata_SplitPackingRec",
+                newName: "PurchaseInfo_SupplierCode");
+
+            migrationBuilder.RenameColumn(
+                name: "Shift",
+                table: "Basedata_SplitPackingRec",
+                newName: "ProductionInfo_Shift");
+
+            migrationBuilder.RenameColumn(
+                name: "RpNumber",
+                table: "Basedata_SplitPackingRec",
+                newName: "PurchaseInfo_RpNumber");
+
+            migrationBuilder.RenameColumn(
+                name: "QualityFile",
+                table: "Basedata_SplitPackingRec",
+                newName: "QualityInfo_QualityFile");
+
+            migrationBuilder.RenameColumn(
+                name: "QLevel",
+                table: "Basedata_SplitPackingRec",
+                newName: "QualityInfo_QLevel");
+
+            migrationBuilder.RenameColumn(
+                name: "ProdLine",
+                table: "Basedata_SplitPackingRec",
+                newName: "ProductionInfo_ProdLine");
+
+            migrationBuilder.AddColumn<string>(
+                name: "PurchaseInfo_AsnNumber1",
+                table: "Basedata_SplitPackingRec",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PurchaseInfo_PoNumber1",
+                table: "Basedata_SplitPackingRec",
+                type: "nvarchar(64)",
+                maxLength: 64,
+                nullable: true);
+        }
+    }
+}

be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/Migrations/BasedataDbContextModelSnapshot.cs

@@ -3395,6 +3395,10 @@ namespace Win_in.Sfs.Basedata.Migrations
                     b.Property<DateTime>("PlanArriveDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("ProdLine")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<DateTime>("ProduceDate")
                         .HasColumnType("datetime2");
 
@@ -3410,6 +3414,14 @@ namespace Win_in.Sfs.Basedata.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("QLevel")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("QualityFile")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("ReceiptRecNumber")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
@@ -3421,6 +3433,14 @@ namespace Win_in.Sfs.Basedata.Migrations
                     b.Property<string>("Remark")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<string>("RpNumber")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
+                    b.Property<string>("Shift")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("Specifications")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
@@ -3429,6 +3449,10 @@ namespace Win_in.Sfs.Basedata.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("SupplierCode")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<string>("SupplierItemCode")
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
@@ -3449,6 +3473,10 @@ namespace Win_in.Sfs.Basedata.Migrations
                         .HasMaxLength(64)
                         .HasColumnType("nvarchar(64)");
 
+                    b.Property<string>("Team")
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
+
                     b.Property<Guid?>("TenantId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("TenantId");
@@ -4340,92 +4368,6 @@ namespace Win_in.Sfs.Basedata.Migrations
                         .IsRequired();
                 });
 
-            modelBuilder.Entity("Win_in.Sfs.Basedata.Domain.SplitPackingRec", b =>
-                {
-                    b.OwnsOne("Win_in.Sfs.Basedata.ProductionInfo", "ProductionInfo", b1 =>
-                        {
-                            b1.Property<Guid>("SplitPackingRecId")
-                                .HasColumnType("uniqueidentifier");
-
-                            b1.Property<string>("ProdLine")
-                                .HasMaxLength(64)
-                                .HasColumnType("nvarchar(64)");
-
-                            b1.Property<string>("Shift")
-                                .HasMaxLength(64)
-                                .HasColumnType("nvarchar(64)");
-
-                            b1.Property<string>("Team")
-                                .HasMaxLength(64)
-                                .HasColumnType("nvarchar(64)");
-
-                            b1.HasKey("SplitPackingRecId");
-
-                            b1.ToTable("Basedata_SplitPackingRec");
-
-                            b1.WithOwner()
-                                .HasForeignKey("SplitPackingRecId");
-                        });
-
-                    b.OwnsOne("Win_in.Sfs.Basedata.PurchaseInfo", "PurchaseInfo", b1 =>
-                        {
-                            b1.Property<Guid>("SplitPackingRecId")
-                                .HasColumnType("uniqueidentifier");
-
-                            b1.Property<string>("AsnNumber")
-                                .HasMaxLength(64)
-                                .HasColumnType("nvarchar(64)")
-                                .HasColumnName("PurchaseInfo_AsnNumber1");
-
-                            b1.Property<string>("PoNumber")
-                                .HasMaxLength(64)
-                                .HasColumnType("nvarchar(64)")
-                                .HasColumnName("PurchaseInfo_PoNumber1");
-
-                            b1.Property<string>("RpNumber")
-                                .HasMaxLength(64)
-                                .HasColumnType("nvarchar(64)");
-
-                            b1.Property<string>("SupplierCode")
-                                .HasMaxLength(64)
-                                .HasColumnType("nvarchar(64)");
-
-                            b1.HasKey("SplitPackingRecId");
-
-                            b1.ToTable("Basedata_SplitPackingRec");
-
-                            b1.WithOwner()
-                                .HasForeignKey("SplitPackingRecId");
-                        });
-
-                    b.OwnsOne("Win_in.Sfs.Basedata.QualityInfo", "QualityInfo", b1 =>
-                        {
-                            b1.Property<Guid>("SplitPackingRecId")
-                                .HasColumnType("uniqueidentifier");
-
-                            b1.Property<string>("QLevel")
-                                .HasMaxLength(64)
-                                .HasColumnType("nvarchar(64)");
-
-                            b1.Property<string>("QualityFile")
-                                .HasMaxLength(64)
-                                .HasColumnType("nvarchar(64)");
-
-                            b1.HasKey("SplitPackingRecId");
-
-                            b1.ToTable("Basedata_SplitPackingRec");
-
-                            b1.WithOwner()
-                                .HasForeignKey("SplitPackingRecId");
-                        });
-
-                    b.Navigation("ProductionInfo");
-
-                    b.Navigation("PurchaseInfo");
-
-                    b.Navigation("QualityInfo");
-                });
-
             modelBuilder.Entity("Win_in.Sfs.Basedata.Domain.Dict", b =>
                 {
                     b.Navigation("Items");

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/PutawayNotes/PutawayNoteAppService.cs

@@ -74,20 +74,21 @@ public class PutawayNoteAppService :
         var splitPackingRecList = await _splitPackingRecAppService.GetListByToPackingCode(selectPackingCode.ToList()).ConfigureAwait(false);
         //按照不同的条件分组
         var group= splitPackingRecList.GroupBy(p => new {
-            p.SupplierCode,p.AsnNumber,p.PoNumber
+            p.SupplierCode,p.PurchaseInfo_AsnNumber,
+            p.PurchaseInfo_PoNumber
         });
         foreach (var groupWhere in group)
         {
             var tempEditInput = new PutawayNoteEditInput();
             tempEditInput.Details = new List<PutawayNoteDetailInput>();
             tempEditInput.SupplierCode = groupWhere.First().SupplierCode;
-            tempEditInput.AsnNumber = groupWhere.First().AsnNumber;
+            tempEditInput.AsnNumber = groupWhere.First().PurchaseInfo_AsnNumber;
             tempEditInput.InspectNumber = string.Empty;
             tempEditInput.JobNumber = string.Empty;
             tempEditInput.ProductReceiptNumber = string.Empty;
             tempEditInput.PurchaseReceiptRequestNumber = string.Empty;
             tempEditInput.Type = EnumPutawayType.PurchasePutaway;
-            tempEditInput.Number = groupWhere.Key.PoNumber;
+            tempEditInput.Number = groupWhere.Key.PurchaseInfo_PoNumber;
             foreach (var packingCode in groupWhere)
             {
                 var detailInput=input.Details.First(p => p.ToPackingCode == packingCode.ToPackingCode);

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Application/Notes/TransferNotes/TransferNoteAppService.cs

@@ -490,9 +490,9 @@ public class TransferNoteAppService : SfsStoreWithDetailsAppServiceBase
                 packRec.QLevel = inputObj.QLevel;//
                 packRec.QualityFile = inputObj.QualityFile;
                 packRec.SupplierCode = inputObj.SupplierCode;
-                packRec.PoNumber = inputObj.PoNumber;
+                packRec.PurchaseInfo_PoNumber = inputObj.PoNumber;
                 packRec.RpNumber = inputObj.RpNumber;
-                packRec.AsnNumber = inputObj.AsnNumber;
+                packRec.PurchaseInfo_AsnNumber = inputObj.AsnNumber;
                 packRec.ProdLine = inputObj.ProdLine;
                 packRec.Team = inputObj.Team;
                 packRec.Shift = inputObj.Shift;//