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