|
@@ -2419,7 +2419,7 @@ FROM
|
|
|
decimal auditFee = 0.00M; //已审核金额
|
|
|
decimal unAuditFee = 0.00M; //未审核款项
|
|
|
if (entity.IsAuditGM == 1 || entity.IsAuditGM == 3) auditFee = CurrPayStr;
|
|
|
- else if (entity.IsAuditGM == 0) unAuditFee = CurrPayStr;
|
|
|
+ else if (entity.IsAuditGM == 0) unAuditFee = entity.PayMoney;
|
|
|
/*
|
|
|
* 费用总计
|
|
|
*/
|
|
@@ -2474,7 +2474,7 @@ FROM
|
|
|
decimal amountPayable = strs.Sum(it => it.AmountPayable);
|
|
|
decimal thisPayment = ccpCurrencyPrices.Sum(it => it.ThisPayment);
|
|
|
decimal balancePayment = strs.Sum(it => it.BalancePayment);
|
|
|
- amountPayableStr += string.Format(@"{0}{1} |;", amountPayable.ToString("#0.00"), currencyName);
|
|
|
+ amountPayableStr += string.Format(@"{0}{1} |", amountPayable.ToString("#0.00"), currencyName);
|
|
|
|
|
|
//单独处理此次付款金额
|
|
|
if (item.CurrencyId == 836) //人民币
|
|
@@ -2483,21 +2483,22 @@ FROM
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- thisPaymentStr += string.Format(@"{0}{1} |;", thisPayment.ToString("#0.00"), currencyName);
|
|
|
+ thisPaymentStr += string.Format(@"{0}{1} |", thisPayment.ToString("#0.00"), currencyName);
|
|
|
}
|
|
|
|
|
|
- balancePaymentStr += string.Format(@"{0}{1} |;", balancePayment.ToString("#0.00"), currencyName);
|
|
|
+ balancePaymentStr += string.Format(@"{0}{1} |", balancePayment.ToString("#0.00"), currencyName);
|
|
|
|
|
|
//单独处理已审核费用
|
|
|
- if (item.CurrencyId == 836) //人民币
|
|
|
- {
|
|
|
- decimal auditedFunds = ccpCurrencyPrices.Sum(it => it.AuditedFunds);
|
|
|
- auditedFundsStr += string.Format(@"{0}{1} |", auditedFunds.ToString("#0.00"), currencyName);
|
|
|
- }
|
|
|
- else
|
|
|
- {
|
|
|
- auditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.AmountPayable), currencyName);
|
|
|
- }
|
|
|
+ //if (item.CurrencyId == 836) //人民币
|
|
|
+ //{
|
|
|
+ // decimal auditedFunds = ccpCurrencyPrices.Sum(it => it.AuditedFunds);
|
|
|
+ // auditedFundsStr += string.Format(@"{0}{1} |", auditedFunds.ToString("#0.00"), currencyName);
|
|
|
+ //}
|
|
|
+ //else
|
|
|
+ //{
|
|
|
+ // auditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.AmountPayable), currencyName);
|
|
|
+ //}
|
|
|
+ auditedFundsStr += string.Format(@"{0}{1} |", strs.Sum(x => x.AmountPayable), currencyName);
|
|
|
|
|
|
//未审核费用
|
|
|
var unAudit = strs.Sum(x => x.UnAuditFunds);
|