diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs index 6aa8355..1e6c3f5 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/POCreateOrUpdateDTOBase.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using Volo.Abp.Application.Dtos; using Win_in.Sfs.Scp.WebApi.Domain.Shared; @@ -11,93 +12,90 @@ namespace Win_in.Sfs.Scp.WebApi.POs public abstract class POCreateOrUpdateDTOBase : EntityDtoBase { /// - /// 代码(Code) + /// 订单号(PoNumber) /// - [Display(Name = "代码(Code)")] - public string Code { set; get; } + [Display(Name = "订单号(PoNumber)")] + public string PoNumber { set; get; } /// - /// 简称(Name) + /// 供应商代码(SupplierCode) /// - [Display(Name = "简称(Name)")] - public string Name { set; get; } + [Display(Name = "供应商代码(SupplierCode)")] + public string SupplierCode { set; get; } /// - /// 描述(Description) + /// 订单类型(PoType) /// - [Display(Name = "描述(Description)")] - public string Desc { set; get; } + [Display(Name = "订单类型(PoType)")] + public string PoType { set; get; } /// - /// 级别(Rank) + /// 订单状态(Status) /// - [Display(Name = "级别(Rank)")] - public string Rank { get; set; } + [Display(Name = "订单状态(Status)")] + public int Status { set; get; } /// - /// 地址 + /// 是否寄存订单(IsConsignment) /// - [Display(Name = "地址(Address)")] - public string Address { get; set; } + [Display(Name = "是否寄存订单(IsConsignment)")] + public bool IsConsignment { set; get; } /// - /// 国家(Country) + /// 订单日期(OrderDate) /// - [Display(Name = "国家(Country)")] - public string Country { get; set; } + [Display(Name = "订单日期(OrderDate)")] + public DateTime OrderDate { set; get; } /// - /// 城市(City) + /// 截止日期(DueDate) /// - [Display(Name = "城市(City)")] - public string City { get; set; } + [Display(Name = "截止日期(DueDate)")] + public DateTime DueDate { set; get; } /// - /// 电话(Phone) + /// 版本(Version) /// - [Display(Name = "电话(Phone)")] - public string Phone { set; get; } + [Display(Name = "版本(Version)")] + public string Version { set; get; } /// - /// 传真(Fax) + /// 税率(TaxRate) /// - [Display(Name = "传真(Fax)")] - public string Fax { set; get; } + [Display(Name = "税率(TaxRate)")] + public decimal TaxRate { set; get; } /// - /// 邮编(PostId) + /// 地点(Site) /// - [Display(Name = "邮编(PostId)")] - public string PostId { set; get; } + [Display(Name = "地点(Site)")] + public string Site { set; get; } /// - /// 联系人(ContactName) - /// - [Display(Name = "联系人(ContactName)")] - public string ContactName { set; get; } - - /// - /// 货币(Currency) + /// 公司(Company) /// - [Display(Name = "货币(Currency)")] - public string Currency { set; get; } + [Display(Name = "公司(Company)")] + public string Company { set; get; } /// - /// 是否激活(IsActive) + /// 联系人(ContactName) /// - [Display(Name = "是否激活(IsActive)")] - public bool IsActive { set; get; } + [Display(Name = "联系人(ContactName)")] + public string ContactName { set; get; } /// - /// 公司(Company) + /// 联系电话(ContactPhone) /// - [Display(Name = "公司(Company)")] - public string Company { set; get; } + [Display(Name = "联系电话(ContactPhone)")] + public string ContactPhone { set; get; } /// /// 备注(Remark) /// [Display(Name = "备注(Remark)")] public string Remark { set; get; } + + + public virtual ICollection Details { get; set; } } } \ No newline at end of file diff --git a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODTO.cs b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODTO.cs index 82bee1b..5dbbecd 100644 --- a/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODTO.cs +++ b/ScpWebApiService/src/Win_in.Sfs.Scp.WebApi.Application.Contracts/POs/PODTO.cs @@ -13,88 +13,82 @@ namespace Win_in.Sfs.Scp.WebApi.POs { /// - /// 代码(Code) + /// 订单号(PoNumber) /// - [Display(Name = "代码(Code)")] - public string Code { set; get; } + [Display(Name = "订单号(PoNumber)")] + public string PoNumber { set; get; } /// - /// 简称(Name) + /// 供应商代码(SupplierCode) /// - [Display(Name = "简称(Name)")] - public string Name { set; get; } + [Display(Name = "供应商代码(SupplierCode)")] + public string SupplierCode { set; get; } /// - /// 描述(Description) + /// 订单类型(PoType) /// - [Display(Name = "描述(Description)")] - public string Desc { set; get; } + [Display(Name = "订单类型(PoType)")] + public string PoType { set; get; } /// - /// 级别(Rank) + /// 订单状态(Status) /// - [Display(Name = "级别(Rank)")] - public string Rank { get; set; } + [Display(Name = "订单状态(Status)")] + public int Status { set; get; } /// - /// 地址 + /// 是否寄存订单(IsConsignment) /// - [Display(Name = "地址(Address)")] - public string Address { get; set; } + [Display(Name = "是否寄存订单(IsConsignment)")] + public bool IsConsignment { set; get; } /// - /// 国家(Country) + /// 订单日期(OrderDate) /// - [Display(Name = "国家(Country)")] - public string Country { get; set; } + [Display(Name = "订单日期(OrderDate)")] + public DateTime OrderDate { set; get; } /// - /// 城市(City) + /// 截止日期(DueDate) /// - [Display(Name = "城市(City)")] - public string City { get; set; } + [Display(Name = "截止日期(DueDate)")] + public DateTime DueDate { set; get; } /// - /// 电话(Phone) + /// 版本(Version) /// - [Display(Name = "电话(Phone)")] - public string Phone { set; get; } + [Display(Name = "版本(Version)")] + public string Version { set; get; } /// - /// 传真(Fax) + /// 税率(TaxRate) /// - [Display(Name = "传真(Fax)")] - public string Fax { set; get; } + [Display(Name = "税率(TaxRate)")] + public decimal TaxRate { set; get; } /// - /// 邮编(PostId) + /// 地点(Site) /// - [Display(Name = "邮编(PostId)")] - public string PostId { set; get; } + [Display(Name = "地点(Site)")] + public string Site { set; get; } /// - /// 联系人(ContactName) - /// - [Display(Name = "联系人(ContactName)")] - public string ContactName { set; get; } - - /// - /// 货币(Currency) + /// 公司(Company) /// - [Display(Name = "货币(Currency)")] - public string Currency { set; get; } + [Display(Name = "公司(Company)")] + public string Company { set; get; } /// - /// 是否激活(IsActive) + /// 联系人(ContactName) /// - [Display(Name = "是否激活(IsActive)")] - public bool IsActive { set; get; } + [Display(Name = "联系人(ContactName)")] + public string ContactName { set; get; } /// - /// 公司(Company) + /// 联系电话(ContactPhone) /// - [Display(Name = "公司(Company)")] - public string Company { set; get; } + [Display(Name = "联系电话(ContactPhone)")] + public string ContactPhone { set; get; } /// /// 备注(Remark) @@ -102,6 +96,7 @@ namespace Win_in.Sfs.Scp.WebApi.POs [Display(Name = "备注(Remark)")] public string Remark { set; get; } + public virtual ICollection Details { get; set; } } } \ No newline at end of file