diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs index bc84be04e..ff1e1c503 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Dtos/SplitPackingRecDto.cs +++ b/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 { /// @@ -244,8 +244,8 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase /// /// 订单号 /// - [Display(Name = "订单号")] - public string PoNumber { get; set; } + //[Display(Name = "订单号")] + //public string PoNumber { get; set; } /// /// 要货看板号 @@ -256,8 +256,8 @@ public class SplitPackingRecDTO : SfsBaseDataDTOBase /// /// 发货单号 /// - [Display(Name = "发货单号")] - public string AsnNumber { get; set; } + //[Display(Name = "发货单号")] + //public string AsnNumber { get; set; } //--------------------------------ProductionInfo /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs index 8da64f8b0..b12998e90 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Application.Contracts/SplitPackings/Inputs/SplitPackingRecEditInput.cs +++ b/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 /// /// 订单号 /// - [Display(Name = "订单号")] - public string PoNumber { get; set; } + //[Display(Name = "订单号")] + //public string PoNumber { get; set; } /// /// 要货看板号 @@ -264,8 +264,8 @@ public class SplitPackingRecEditInput : SfsBaseDataCreateOrUpdateInputBase /// /// 发货单号 /// - [Display(Name = "发货单号")] - public string AsnNumber { get; set; } + //[Display(Name = "发货单号")] + //public string AsnNumber { get; set; } //--------------------------------ProductionInfo /// diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs index 8eb845d83..7d6d6923e 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs +++ b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.Domain/SplitPackings/SplitPackingRec.cs @@ -15,9 +15,9 @@ namespace Win_in.Sfs.Basedata.Domain; /// public class SplitPackingRec : SfsBaseDataAggregateRootBase , IHasItem - , IHasPurchaseInfo - , IHasQualityInfo - , IHasProductionInfo + //, IHasPurchaseInfo + //, IHasQualityInfo + //, IHasProductionInfo { /// /// 操作类型 @@ -200,17 +200,60 @@ public class SplitPackingRec : SfsBaseDataAggregateRootBase /// /// 质量信息 /// - public QualityInfo QualityInfo { get; set; } = new(); + //public QualityInfo QualityInfo { get; set; } = new(); + + /// + /// 质量等级 + /// + [MaxLength(SfsEfCorePropertyConst.CodeLength)] + public string QLevel { get; set; } + + /// + /// 质检文件 + /// + [MaxLength(SfsEfCorePropertyConst.CodeLength)] + public string QualityFile { get; set; } + /// /// 采购信息 /// - public PurchaseInfo PurchaseInfo { get; set; } = new(); + //public PurchaseInfo PurchaseInfo { get; set; } = new(); + + /// + /// 供应商代码 + /// + [MaxLength(SfsEfCorePropertyConst.CodeLength)] + public string SupplierCode { get; set; } + + /// + /// 要货计划号 + /// + [MaxLength(SfsEfCorePropertyConst.CodeLength)] + public string RpNumber { get; set; } /// /// 生产信息 /// - public ProductionInfo ProductionInfo { get; set; } = new(); + //public ProductionInfo ProductionInfo { get; set; } = new(); + + /// + /// 生产线 + /// + [MaxLength(SfsEfCorePropertyConst.CodeLength)] + public string ProdLine { get; set; } + + /// + /// 班组 + /// + [MaxLength(SfsEfCorePropertyConst.CodeLength)] + public string Team { get; set; } + + /// + /// 班次 + /// + [MaxLength(SfsEfCorePropertyConst.CodeLength)] + public string Shift { get; set; } /// /// 规格 diff --git a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs b/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs index c052bccbf..aa386ee6f 100644 --- a/be/Modules/BaseData/src/Win_in.Sfs.Basedata.EntityFrameworkCore/SplitPackings/SplitPackingRecDbContextModelCreatingExtensions.cs +++ b/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); }); diff --git a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs b/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs index bcf582b7b..2da28546f 100644 --- a/be/Modules/Label/src/Win_in.Sfs.Label.Application/InventoryLabels/InventoryLabelAppService.cs +++ b/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;//