diff --git a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs index b5805da9..04b7d24b 100644 --- a/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs +++ b/code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/Materials/MaterialDtoBase.cs @@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using Volo.Abp.Application.Dtos; using Win.Sfs.Shared; using Win.Sfs.Shared.Constant; using Win.Sfs.Shared.DtoBase; @@ -276,37 +277,24 @@ namespace Win.Sfs.SettleAccount.Entities.Materials } - public class MaterialDto : AuditedEntityDtoBase, IBranch + /// + /// 列表 + /// + public class MaterialDto : AuditedEntityDto { /// - ///工厂 - /// - public virtual string Factory { set; get; } - /// - /// 物料编码 - /// - public virtual string MaterialCode { set; get; } - /// - ///物料描述 - /// - public virtual string MaterialDesc - { - set; get; - } - /// - /// 基础单位 - /// - public virtual string Unit { set; get; } - /// - /// 估价类 + /// 厂内物料号 /// - public virtual string EstimateType { set; get; } + [ExporterHeader(DisplayName = "厂内物料号")] + public string MaterialCode { set; get; } + /// - /// 估价类描述 + /// 厂内物料描述 /// - public virtual string EstimateTypeDesc { set; get; } - public Guid BranchId { get; set ; } + [ExporterHeader(DisplayName = "厂内物料描述")] + public string MaterialDesc { set; get; } } + [ImportProject(Name = SettleAccountModuleName.Material)] public class MaterialImportDto {