解决冲突后提交

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Notes/TransferLibNotes/TransferLibNoteDetail.cs

@@ -10,7 +10,7 @@ namespace Win_in.Sfs.Wms.Store.Domain;
 /// <summary>
 /// 库存转移记录-明细表 //??TransferLib实体
 /// </summary>
-public class TransferLibNoteDetail : SfsDetailEntityBase//SfsStoreDetailEntityBase
+public class TransferLibNoteDetail : SfsStoreDetailEntityBase
 {
     /// <summary>
     /// 原因
@@ -49,22 +49,22 @@ public class TransferLibNoteDetail : SfsDetailEntityBase//SfsStoreDetailEntityBa
     /// <summary>
     /// 物品代码
     /// </summary>
-    public string ItemCode { get; set; }
+    public new string ItemCode { get; set; }
 
     /// <summary>
     /// 物品名称
     /// </summary>
-    public string ItemName { get; set; }
+    public new string ItemName { get; set; }
 
     /// <summary>
     /// 物品描述1
     /// </summary>
-    public string ItemDesc1 { get; set; }
+    public new string ItemDesc1 { get; set; }
 
     /// <summary>
     /// 物品描述2
     /// </summary>
-    public string ItemDesc2 { get; set; }
+    public new string ItemDesc2 { get; set; }
 
     /// <summary>
     /// 标包数量

be/Modules/Store/src/Win_in.Sfs.Wms.Store.Domain/Requests/TransferLibRequests/TransferLibRequestDetail.cs

@@ -10,7 +10,7 @@ namespace Win_in.Sfs.Wms.Store.Domain;
 /// <summary>
 /// //??TransferLib实体
 /// </summary>
-public class TransferLibRequestDetail : SfsDetailEntityBase //SfsStoreDetailEntityBase
+public class TransferLibRequestDetail : SfsStoreDetailEntityBase
 {
     /// <summary>
     /// 原因代码
@@ -53,22 +53,22 @@ public class TransferLibRequestDetail : SfsDetailEntityBase //SfsStoreDetailEnti
     /// <summary>
     ///     物品代码
     /// </summary>
-    public string ItemCode { get; set; }
+    public new string ItemCode { get; set; }
 
     /// <summary>
     ///     物品名称
     /// </summary>
-    public string ItemName { get; set; }
+    public new string ItemName { get; set; }
 
     /// <summary>
     ///     物品描述1
     /// </summary>
-    public string ItemDesc1 { get; set; }
+    public new string ItemDesc1 { get; set; }
 
     /// <summary>
     ///     物品描述2
     /// </summary>
-    public string ItemDesc2 { get; set; }
+    public new string ItemDesc2 { get; set; }
 
     /// <summary>
     ///     标包数量

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415054835_transferLibV222.Designer.cs → be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/20240415063138_transferLibV2222.Designer.cs

@@ -13,8 +13,8 @@ using Win_in.Sfs.Wms.Store.EntityFrameworkCore;
 namespace Win_in.Sfs.Wms.Store.Migrations
 {
     [DbContext(typeof(StoreDbContext))]
-    [Migration("20240415054835_transferLibV222")]
-    partial class transferLibV222
+    [Migration("20240415063138_transferLibV2222")]
+    partial class transferLibV2222
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {
@@ -6802,8 +6802,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<string>("RequestWarehouseCode")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
 
                     b.Property<decimal>("StdPackQty")
                         .HasColumnType("decimal(18,6)");
@@ -23072,25 +23074,20 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("bit");
 
                     b.Property<string>("ItemCode")
-                        .IsRequired()
                         .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ItemCode");
+                        .HasColumnType("nvarchar(64)");
 
                     b.Property<string>("ItemDesc1")
                         .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)")
-                        .HasColumnName("ItemDesc1");
+                        .HasColumnType("nvarchar(1024)");
 
                     b.Property<string>("ItemDesc2")
                         .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)")
-                        .HasColumnName("ItemDesc2");
+                        .HasColumnType("nvarchar(1024)");
 
                     b.Property<string>("ItemName")
                         .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ItemName");
+                        .HasColumnType("nvarchar(64)");
 
                     b.Property<int>("JobStatus")
                         .HasColumnType("int");
@@ -23990,8 +23987,8 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(64)");
 
                     b.Property<string>("Reason")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
+                        .HasMaxLength(1024)
+                        .HasColumnType("nvarchar(1024)");
 
                     b.Property<DateTime>("RecommendFromArriveDate")
                         .HasColumnType("datetime2");

be/Modules/Store/src/Win_in.Sfs.Wms.Store.EntityFrameworkCore/Migrations/StoreDbContextModelSnapshot.cs

@@ -6800,8 +6800,10 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                     b.Property<string>("RequestWarehouseCode")
                         .HasColumnType("nvarchar(max)");
 
-                    b.Property<int>("Status")
-                        .HasColumnType("int");
+                    b.Property<string>("Status")
+                        .IsRequired()
+                        .HasMaxLength(64)
+                        .HasColumnType("nvarchar(64)");
 
                     b.Property<decimal>("StdPackQty")
                         .HasColumnType("decimal(18,6)");
@@ -23070,25 +23072,20 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("bit");
 
                     b.Property<string>("ItemCode")
-                        .IsRequired()
                         .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ItemCode");
+                        .HasColumnType("nvarchar(64)");
 
                     b.Property<string>("ItemDesc1")
                         .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)")
-                        .HasColumnName("ItemDesc1");
+                        .HasColumnType("nvarchar(1024)");
 
                     b.Property<string>("ItemDesc2")
                         .HasMaxLength(1024)
-                        .HasColumnType("nvarchar(1024)")
-                        .HasColumnName("ItemDesc2");
+                        .HasColumnType("nvarchar(1024)");
 
                     b.Property<string>("ItemName")
                         .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)")
-                        .HasColumnName("ItemName");
+                        .HasColumnType("nvarchar(64)");
 
                     b.Property<int>("JobStatus")
                         .HasColumnType("int");
@@ -23988,8 +23985,8 @@ namespace Win_in.Sfs.Wms.Store.Migrations
                         .HasColumnType("nvarchar(64)");
 
                     b.Property<string>("Reason")
-                        .HasMaxLength(64)
-                        .HasColumnType("nvarchar(64)");
+                        .HasMaxLength(1024)
+                        .HasColumnType("nvarchar(1024)");
 
                     b.Property<DateTime>("RecommendFromArriveDate")
                         .HasColumnType("datetime2");