|
|
|
@ -1,5 +1,5 @@
|
|
|
|
|
using DS.Module.Core;
|
|
|
|
|
using System.Runtime.Serialization;
|
|
|
|
|
using System.Runtime.Serialization;
|
|
|
|
|
using DS.Module.Core;
|
|
|
|
|
using DS.Module.Core.Enums;
|
|
|
|
|
using DS.WMS.Core.Op.Entity;
|
|
|
|
|
|
|
|
|
@ -30,6 +30,11 @@ namespace DS.WMS.Core.Fee.Dtos
|
|
|
|
|
/// </summary>
|
|
|
|
|
public decimal? AmountUSD { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 其他币别申请金额
|
|
|
|
|
/// </summary>
|
|
|
|
|
public decimal? AmountOther { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 申请币别
|
|
|
|
|
/// </summary>
|
|
|
|
@ -91,7 +96,7 @@ namespace DS.WMS.Core.Fee.Dtos
|
|
|
|
|
public string? Reason { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 客户名称
|
|
|
|
|
/// 客户名称/结算单位
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string? CustomerName { get; set; }
|
|
|
|
|
|
|
|
|
@ -143,6 +148,7 @@ namespace DS.WMS.Core.Fee.Dtos
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 所属分部
|
|
|
|
|
/// </summary>
|
|
|
|
|
[IgnoreDataMember]
|
|
|
|
|
public long? SaleDeptId { get; set; }
|
|
|
|
|
|
|
|
|
|
public string? SaleDeptName { get; set; }
|
|
|
|
@ -165,6 +171,16 @@ namespace DS.WMS.Core.Fee.Dtos
|
|
|
|
|
public string CreateByName { get; set; }
|
|
|
|
|
|
|
|
|
|
public List<FeeApplicationDetailDto>? Details { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 委托单位
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string? Client { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 结算对象银行
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string? CustomerBank { get; set; }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
@ -189,6 +205,11 @@ namespace DS.WMS.Core.Fee.Dtos
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string? MBLNO { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 分提单号
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string? HBLNO { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 委托编号
|
|
|
|
|
/// </summary>
|
|
|
|
@ -203,6 +224,7 @@ namespace DS.WMS.Core.Fee.Dtos
|
|
|
|
|
/// 业务锁定
|
|
|
|
|
/// </summary>
|
|
|
|
|
public bool? IsBusinessLocking { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 费用锁定
|
|
|
|
|
/// </summary>
|
|
|
|
@ -258,6 +280,11 @@ namespace DS.WMS.Core.Fee.Dtos
|
|
|
|
|
/// </summary>
|
|
|
|
|
public decimal Amount { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 原始金额
|
|
|
|
|
/// </summary>
|
|
|
|
|
public decimal OriginalAmount { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 原始币别
|
|
|
|
|
/// </summary>
|
|
|
|
@ -273,11 +300,6 @@ namespace DS.WMS.Core.Fee.Dtos
|
|
|
|
|
/// </summary>
|
|
|
|
|
public decimal? ExchangeRate { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 原始金额
|
|
|
|
|
/// </summary>
|
|
|
|
|
public decimal OriginalAmount { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 销项税率
|
|
|
|
|
/// </summary>
|
|
|
|
@ -312,5 +334,78 @@ namespace DS.WMS.Core.Fee.Dtos
|
|
|
|
|
/// 订舱代理
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string? Forwarder { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 未收合计
|
|
|
|
|
/// </summary>
|
|
|
|
|
public decimal? OutstandingAmount { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 发票备注
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string? InvoiceRemark { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 订舱编号
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string? BookingNo { get; set; }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 费用申请单审核信息展示
|
|
|
|
|
/// </summary>
|
|
|
|
|
public class FeeApplicationSummary
|
|
|
|
|
{
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 费用汇总
|
|
|
|
|
/// </summary>
|
|
|
|
|
public List<SummaryItem> SummaryItems { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 申请单明细
|
|
|
|
|
/// </summary>
|
|
|
|
|
public List<FeeApplicationDetailDto>? Details { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 初始化
|
|
|
|
|
/// </summary>
|
|
|
|
|
/// <param name="details">申请单明细</param>
|
|
|
|
|
public FeeApplicationSummary(List<FeeApplicationDetailDto> details)
|
|
|
|
|
{
|
|
|
|
|
Details = details;
|
|
|
|
|
SummaryItems = details.GroupBy(x => new { x.FeeType, x.OriginalCurrency }).Select(x => new SummaryItem
|
|
|
|
|
{
|
|
|
|
|
FeeType = x.Key.FeeType,
|
|
|
|
|
Currency = x.Key.OriginalCurrency,
|
|
|
|
|
Amount = x.Sum(y => y.Amount),
|
|
|
|
|
OriginalAmount = x.Sum(y => y.OriginalAmount)
|
|
|
|
|
}).ToList();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 申请单费用汇总
|
|
|
|
|
/// </summary>
|
|
|
|
|
public class SummaryItem
|
|
|
|
|
{
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 费用类型
|
|
|
|
|
/// </summary>
|
|
|
|
|
public FeeType FeeType { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 币别
|
|
|
|
|
/// </summary>
|
|
|
|
|
public string Currency { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 申请金额
|
|
|
|
|
/// </summary>
|
|
|
|
|
public decimal Amount { get; set; }
|
|
|
|
|
|
|
|
|
|
/// <summary>
|
|
|
|
|
/// 原始金额
|
|
|
|
|
/// </summary>
|
|
|
|
|
public decimal OriginalAmount { get; set; }
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|