第二次修改拆箱实体

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs

@@ -11,9 +11,9 @@ using Win_in.Sfs.Basedata.Domain.Shared;
 namespace Win_in.Sfs.Basedata.Application.Contracts;
 
 public class SplitPackingRecDTO : SfsBaseDataDTOBase
-    , IHasPurchaseInfoDto
-    , IHasProductionInfoDto
-    , IHasQualityInfoDto
+    //, IHasPurchaseInfoDto
+    //, IHasProductionInfoDto
+    //, IHasQualityInfoDto
 
 {
     /// <summary>
@@ -244,8 +244,8 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase
     /// <summary>
     /// 订单号
     /// </summary>
-    [Display(Name = "订单号")]
-    public string PoNumber { get; set; }
+    //[Display(Name = "订单号")]
+    //public string PoNumber { get; set; }
 
     /// <summary>
     /// 要货看板号
@@ -256,8 +256,8 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase
     /// <summary>
     /// 发货单号
     /// </summary>
-    [Display(Name = "发货单号")]
-    public string AsnNumber { get; set; }
+    //[Display(Name = "发货单号")]
+    //public string AsnNumber { get; set; }
 
     //--------------------------------ProductionInfo
     /// <summary>

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs

@@ -13,7 +13,7 @@ namespace Win_in.Sfs.Basedata.Application.Contracts;
 
 
 public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase
-    , IHasPurchaseInfoDto
+    //, IHasPurchaseInfoDto
     , IHasProductionInfoDto
     , IHasQualityInfoDto
 {
@@ -252,8 +252,8 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase
     /// <summary>
     /// 订单号
     /// </summary>
-    [Display(Name = "订单号")]
-    public string PoNumber { get; set; }
+    //[Display(Name = "订单号")]
+    //public string PoNumber { get; set; }
 
     /// <summary>
     /// 要货看板号
@@ -264,8 +264,8 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase
     /// <summary>
     /// 发货单号
     /// </summary>
-    [Display(Name = "发货单号")]
-    public string AsnNumber { get; set; }
+    //[Display(Name = "发货单号")]
+    //public string AsnNumber { get; set; }
 
     //--------------------------------ProductionInfo
     /// <summary>

be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs

@@ -15,9 +15,9 @@ namespace Win_in.Sfs.Basedata.Domain;
 /// </summary>
 public class SplitPackingRec : SfsBaseDataAggregateRootBase
     , IHasItem
-    , IHasPurchaseInfo
-    , IHasQualityInfo
-    , IHasProductionInfo
+    //, IHasPurchaseInfo
+    //, IHasQualityInfo
+    //, IHasProductionInfo
 {
     /// <summary>
     /// 操作类型
@@ -200,17 +200,60 @@ public class SplitPackingRec : SfsBaseDataAggregateRootBase
     /// <summary>
     /// 质量信息
     /// </summary>
-    public QualityInfo QualityInfo { get; set; } = new();
+    //public QualityInfo QualityInfo { get; set; } = new();
+
+    /// <summary>
+    /// 质量等级
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string QLevel { get; set; }
+
+    /// <summary>
+    /// 质检文件
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string QualityFile { get; set; }
+
 
     /// <summary>
     /// 采购信息
     /// </summary>
-    public PurchaseInfo PurchaseInfo { get; set; } = new();
+    //public PurchaseInfo PurchaseInfo { get; set; } = new();
+
+    /// <summary>
+    /// 供应商代码
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string SupplierCode { get; set; }
+
+    /// <summary>
+    /// 要货计划号
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string RpNumber { get; set; }
 
     /// <summary>
     /// 生产信息
     /// </summary>
-    public ProductionInfo ProductionInfo { get; set; } = new();
+    //public ProductionInfo ProductionInfo { get; set; } = new();
+
+    /// <summary>
+    /// 生产线
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string ProdLine { get; set; }
+
+    /// <summary>
+    /// 班组
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string Team { get; set; }
+
+    /// <summary>
+    /// 班次
+    /// </summary>
+    [MaxLength(SfsEfCorePropertyConst.CodeLength)]
+    public string Shift { get; set; }
 
     /// <summary>
     /// 规格

be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs

@@ -65,9 +65,9 @@ public static class SplitPackingRecDbContextModelCreatingExtensions
             b.HasIndex(q => new { ToPackingCode = q.ToPackingCode });
             //Relations
 
-            b.OwnsOne(q => q.PurchaseInfo);
-            b.OwnsOne(q => q.ProductionInfo);
-            b.OwnsOne(q => q.QualityInfo);
+            //b.OwnsOne(q => q.PurchaseInfo);
+            //b.OwnsOne(q => q.ProductionInfo);
+            //b.OwnsOne(q => q.QualityInfo);
 
         });
 

be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs

@@ -209,9 +209,9 @@ public class InventoryLabelAppService
             packRec.QLevel = inputObj.QLevel;//
             packRec.QualityFile = inputObj.QualityFile;
             packRec.SupplierCode = inputObj.SupplierCode;
-            packRec.PoNumber = inputObj.PoNumber;
+            //packRec.PoNumber = inputObj.PoNumber;
             packRec.RpNumber = inputObj.RpNumber;
-            packRec.AsnNumber = inputObj.AsnNumber;
+            //packRec.AsnNumber = inputObj.AsnNumber;
             packRec.ProdLine = inputObj.ProdLine;
             packRec.Team = inputObj.Team;
             packRec.Shift = inputObj.Shift;//