调整oms收入导出凭证格式

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -10625,7 +10625,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 new mPlatformAccountingSetting{ platform_type="MARKETING",cert_id="734",creator = "张滢萍",subject_no="1122",customer_no="14001",currency="USD",currencyname="美元",website="Global",text="线下客户发货确认收入"},
 
 
-                new mPlatformAccountingSetting{ platform_type="Wish",cert_id="737",creator = "张滢萍",subject_no="1122",customer_no="5021",currency="CNY",currencyname="人民币",website="Global",text="wish平台发货确认收入",projectno="05021"},
+                new mPlatformAccountingSetting{ platform_type="Wish",cert_id="737",creator = "张滢萍",subject_no="1122",customer_no="05021",currency="CNY",currencyname="人民币",website="Global",text="wish平台发货确认收入",projectno="05021"},
                 //new mPlatformAccountingSetting{ platform_type="Ebay",cert_id="736",creator = "赵娟",subject_no="1122",customer_no="030j4",currency="GBP",currencyname="英镑",website="UK"},
                 new mPlatformAccountingSetting{ platform_type="Ebay",cert_id="713",creator = "张滢萍",subject_no="2203",customer_no="030j3",currency="AUD",currencyname="澳元",website="",text="eBay-paypal平台发货确认收入",projectno="030j3"},
                 new mPlatformAccountingSetting{ platform_type="Ebay",cert_id="717",creator = "张滢萍",subject_no="2203",customer_no="030j3",currency="EUR",currencyname="欧元",website="",text="eBay-paypal平台发货确认收入",projectno="030j3"},
@@ -10712,6 +10712,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 {
                     rate = exchangeRate.exchange_rate??0;
                 }
+                else if(currencyName.ToLower()=="人民币")
+                {
+                    rate = 1;
+                }
 
 
                 //判断是否合计
@@ -10721,7 +10725,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                             {ID}|{Creator1}||||
                             {SubjectNo}|{text}||||
                             {currencyName}|{rate}||||
-                            {item.amount}||{item.amount*rate}|||
+                            {item.amount.ToString("#0.00")}||{(item.amount*rate).ToString("#0.00")}|||
                             ||=""{CustomerNo}""|||
                             "
                             );
@@ -10738,7 +10742,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                             {ID}|{Creator1}||||
                             {SubjectNo}|{text}||||
                             {currencyName}|{rate}||||
-                            |{item.amount}||{item.amount*rate}||
+                            |{(item.amount).ToString("#0.00")}||{(item.amount*rate).ToString("#0.00")}||
                             ||||=""{projectNo ?? CustomerNo}""|
                             "
                             );