diff --git a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/PurchaseReturnModel.cs b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/PurchaseReturnModel.cs index 5730357..fc6ff5e 100644 --- a/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/PurchaseReturnModel.cs +++ b/Reportapi/MyCode.Project.Domain/Message/Request/KingDee/SaveModel/PurchaseReturnModel.cs @@ -50,11 +50,6 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel public string FNumber { get; set; } } - public class FSettleId - { - public string FNumber { get; set; } - } - public class FCHARGEID { public string FNumber { get; set; } @@ -71,23 +66,13 @@ namespace MyCode.Project.Domain.Message.Request.KingDee.SaveModel public FSettleCurrId FSettleCurrId { get; set; } public bool? FIsIncludedTax { get; set; } public string FPRICETIMEPOINT { get; set; } - public FLOCALCURRID FLOCALCURRID { get; set; } - public FEXCHANGETYPEID FEXCHANGETYPEID { get; set; } + public FLocalCurrId FLOCALCURRID { get; set; } + public FExchangeTypeId FEXCHANGETYPEID { get; set; } public decimal? FEXCHANGERATE { get; set; } public bool? FISPRICEEXCLUDETAX { get; set; } public decimal? FHSExchangeRate { get; set; } } - public class FLOCALCURRID - { - public string FNumber { get; set; } - } - - public class FEXCHANGETYPEID - { - public string FNumber { get; set; } - } - public class FPURMRBENTRY { public string FRowType { get; set; } diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj index 801eb06..9cbb02b 100644 --- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj +++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj @@ -73,6 +73,7 @@ + diff --git a/Reportapi/MyCode.Project.Services/Implementation/PurchaseReturnService.cs b/Reportapi/MyCode.Project.Services/Implementation/PurchaseReturnService.cs index 624f29f..bc4aa96 100644 --- a/Reportapi/MyCode.Project.Services/Implementation/PurchaseReturnService.cs +++ b/Reportapi/MyCode.Project.Services/Implementation/PurchaseReturnService.cs @@ -335,11 +335,11 @@ namespace MyCode.Project.Services.Implementation }, FIsIncludedTax = true, FPRICETIMEPOINT = "1", - FLOCALCURRID = new FLOCALCURRID() + FLOCALCURRID = new FLocalCurrId() { FNumber = outHead.CurrencyCode ?? DEFAULT_CURRENCY }, - FEXCHANGETYPEID = new FEXCHANGETYPEID() + FEXCHANGETYPEID = new FExchangeTypeId() { FNumber = EXCHANGE_TYPE },