dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

Browse Source
DS7Zhanhao
hanxuntao 2 years ago
parent 6cedf7dd31 553284d17f
commit a345036932
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
DSWeb/Areas/MvcShipping/DAL/MsRptZjTotal/MsRptZjTotalDAL.cs
Unescape Escape View File

@ -406,22 +406,22 @@ namespace DSWeb.MvcShipping.DAL.MsRptZjTotalDAL
if (item.SETTLETIME == null) if (item.SETTLETIME == null)
{ {
feedays = (DateTime.Now - Convert.ToDateTime(head.ETD)).Days - days; feedays = (DateTime.Now - Convert.ToDateTime(head.ETD)).Days - days;
amountfee += Convert.ToDecimal(item.EXCHANGERATE * item.AMOUNT * 0.12M / 365); amountfee += feedays * Convert.ToDecimal(item.EXCHANGERATE * item.AMOUNT * 0.12M / 365);
} }
else else
{ {
if (item.SETTLEMENT == item.AMOUNT) if (item.SETTLEMENT == item.AMOUNT)
{ {
feedays = ((DateTime)item.SETTLETIME - Convert.ToDateTime(head.ETD)).Days - days; feedays = ((DateTime)item.SETTLETIME - Convert.ToDateTime(head.ETD)).Days - days;
amountfee += Convert.ToDecimal((item.SETTLEAMOUNT) * 0.12M / 365); amountfee += feedays * Convert.ToDecimal((item.SETTLEAMOUNT) * 0.12M / 365);
} }
else else
{ {
feedays = ((DateTime)item.SETTLETIME - Convert.ToDateTime(head.ETD)).Days - days; feedays = ((DateTime)item.SETTLETIME - Convert.ToDateTime(head.ETD)).Days - days;
amountfee += Convert.ToDecimal((item.SETTLEAMOUNT) * 0.12M / 365); amountfee += feedays * Convert.ToDecimal((item.SETTLEAMOUNT) * 0.12M / 365);
feedays = (DateTime.Now - Convert.ToDateTime(head.ETD)).Days - days; feedays = (DateTime.Now - Convert.ToDateTime(head.ETD)).Days - days;
amountfee += Convert.ToDecimal((item.EXCHANGERATE * item.AMOUNT - item.SETTLEAMOUNT) * 0.12M / 365); amountfee += feedays * Convert.ToDecimal((item.EXCHANGERATE * item.AMOUNT - item.SETTLEAMOUNT) * 0.12M / 365);
} }
} }

Write Preview
Loading…
Cancel
Save