Skip to content

D
DataCenter_Core2.1_20190520
Commit f5c395f8 by guanzhenshan
Options

修改oms发货收入会计凭证

parent 619c41c7
Showing with 47 additions and 36 deletions
Bailun.DC.Models/Report/mPlatformAccountingSetting.cs
...@@ -51,6 +51,11 @@ namespace Bailun.DC.Models.Report ...@@ -51,6 +51,11 @@ namespace Bailun.DC.Models.Report
public string currencyname { get; set; } public string currencyname { get; set; }
public string text { get; set; } public string text { get; set; }
/// <summary>
/// 项目编码
/// </summary>
public string projectno { get; set; }
} }
......
Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs
...@@ -10571,61 +10571,63 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -10571,61 +10571,63 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var listPlatformSettings = new List<mPlatformAccountingSetting> var listPlatformSettings = new List<mPlatformAccountingSetting>
{ {
new mPlatformAccountingSetting{ platform_type="Aliexpress",cert_id="700",creator = "张滢萍",subject_no="1122",customer_no="02054",currency="USD",currencyname="美元",website="Global",text="速卖通平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Aliexpress",cert_id="700",creator = "张滢萍",subject_no="1122",customer_no="02054",currency="USD",currencyname="美元",website="Global",text="速卖通平台发货确认收入",projectno="02054"},
new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="727",creator = "张滢萍",subject_no="1122",customer_no="06006",currency="PHP",currencyname="菲律宾比索",website="PH",text="lazada平台菲律宾站点发货确认收入（PH)"}, new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="727",creator = "张滢萍",subject_no="1122",customer_no="06006",currency="PHP",currencyname="菲律宾比索",website="PH",text="lazada平台菲律宾站点发货确认收入（PH)",projectno="06006"},
new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="726",creator = "张滢萍",subject_no="1122",customer_no="06007",currency="MYR",currencyname="马来西亚-林吉特",website="MY",text="lazada平台马来西亚站点发货确认收入（MY）"}, new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="726",creator = "张滢萍",subject_no="1122",customer_no="06007",currency="MYR",currencyname="马来西亚-林吉特",website="MY",text="lazada平台马来西亚站点发货确认收入（MY）",projectno="06007"},
new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="729",creator = "张滢萍",subject_no="1122",customer_no="06008",currency="THB",currencyname="泰铢",website="TH",text="lazada平台泰国站点发货确认收入（TH）"}, new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="729",creator = "张滢萍",subject_no="1122",customer_no="06008",currency="THB",currencyname="泰铢",website="TH",text="lazada平台泰国站点发货确认收入（TH）",projectno="06008"},
new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="728",creator = "张滢萍",subject_no="1122",customer_no="06009",currency="SGD",currencyname="新加坡元",website="SG",text="lazada平台新加坡站点发货确认收入（SG）"}, new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="728",creator = "张滢萍",subject_no="1122",customer_no="06009",currency="SGD",currencyname="新加坡元",website="SG",text="lazada平台新加坡站点发货确认收入（SG）",projectno="06009"},
new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="725",creator = "张滢萍",subject_no="1122",customer_no="06010",currency="IDR",currencyname="印尼卢比",website="ID",text="lazada平台印尼站点发货确认收入（ID）"}, new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="725",creator = "张滢萍",subject_no="1122",customer_no="06010",currency="IDR",currencyname="印尼卢比",website="ID",text="lazada平台印尼站点发货确认收入（ID）",projectno="06010"},
new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="706",creator = "张滢萍",subject_no="1122",customer_no="06011",currency="VND",currencyname="越南盾",website="VN",text="lazada平台越南站点发货确认收入（VN)"}, new mPlatformAccountingSetting{ platform_type="Lazada",cert_id="706",creator = "张滢萍",subject_no="1122",customer_no="06011",currency="VND",currencyname="越南盾",website="VN",text="lazada平台越南站点发货确认收入（VN)"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="710",creator = "张滢萍",subject_no="1122",customer_no="01104",currency="USD",currencyname="美元",website="US",text="亚马逊平台US站点 发货确认收入Seller"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="710",creator = "张滢萍",subject_no="1122",customer_no="01104",currency="USD",currencyname="美元",website="US",text="亚马逊平台US站点 发货确认收入Seller",projectno="0110402"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="705",creator = "张滢萍",subject_no="1122",customer_no="01107",currency="GBP",currencyname="英镑",website="UK",text="亚马逊UK站点 发货确认收入seller"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="705",creator = "张滢萍",subject_no="1122",customer_no="01107",currency="GBP",currencyname="英镑",website="UK",text="亚马逊UK站点 发货确认收入seller",projectno="0110702"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="702",creator = "张滢萍",subject_no="1122",customer_no="01108",currency="EUR",currencyname="欧元",website="DE",text="亚马逊平台DE站点发货确认收入seller（DE)"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="702",creator = "张滢萍",subject_no="1122",customer_no="01108",currency="EUR",currencyname="欧元",website="DE",text="亚马逊平台DE站点发货确认收入seller（DE)",projectno="0110802"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="703",creator = "张滢萍",subject_no="1122",customer_no="01109",currency="EUR",currencyname="欧元",website="ES",text="亚马逊ES站点发货确认收入seller（ES）"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="703",creator = "张滢萍",subject_no="1122",customer_no="01109",currency="EUR",currencyname="欧元",website="ES",text="亚马逊ES站点发货确认收入seller（ES）",projectno="0110902"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="704",creator = "张滢萍",subject_no="1122",customer_no="01110",currency="EUR",currencyname="欧元",website="FR",text="亚马逊FR站点发货确认收入seller（FR)"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="704",creator = "张滢萍",subject_no="1122",customer_no="01110",currency="EUR",currencyname="欧元",website="FR",text="亚马逊FR站点发货确认收入seller（FR)",projectno="0111002"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="707",creator = "张滢萍",subject_no="1122",customer_no="01111",currency="EUR",currencyname="欧元",website="IT",text="亚马逊IT站点平台 发货确认收入seller（IT)"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="707",creator = "张滢萍",subject_no="1122",customer_no="01111",currency="EUR",currencyname="欧元",website="IT",text="亚马逊IT站点平台 发货确认收入seller（IT)",projectno="0111102"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="708",creator = "张滢萍",subject_no="1122",customer_no="01112",currency="EUR",currencyname="欧元",website="NL",text="亚马逊NL站点 发货确认收入seller（NL)"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="708",creator = "张滢萍",subject_no="1122",customer_no="01112",currency="EUR",currencyname="欧元",website="NL",text="亚马逊NL站点 发货确认收入seller（NL)",projectno="0111202"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="709",creator = "张滢萍",subject_no="1122",customer_no="01115",currency="SEK",currencyname="瑞典克朗",website="SE",text="亚马逊SE站点发货确认收入SELLER(SE)"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="709",creator = "张滢萍",subject_no="1122",customer_no="01115",currency="SEK",currencyname="瑞典克朗",website="SE",text="亚马逊SE站点发货确认收入SELLER(SE)",projectno="0111502"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="711",creator = "张滢萍",subject_no="1122",customer_no="01113",currency="JPY",currencyname="日元",website="JP",text="亚马逊JP站点发货确认收入seller"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="711",creator = "张滢萍",subject_no="1122",customer_no="01113",currency="JPY",currencyname="日元",website="JP",text="亚马逊JP站点发货确认收入seller",projectno="0111302"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="706",creator = "张滢萍",subject_no="1122",customer_no="01106",currency="AUD",currencyname="澳元",website="AU",text="亚马逊AU站点发货确认收入seller"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="706",creator = "张滢萍",subject_no="1122",customer_no="01106",currency="AUD",currencyname="澳元",website="AU",text="亚马逊AU站点发货确认收入seller",projectno="0110602"},
new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="701",creator = "张滢萍",subject_no="1122",customer_no="01105",currency="CAD",currencyname="加元",website="CA",text="亚马逊平台CA站点 发货确认收入SELLER（CA）"}, new mPlatformAccountingSetting{ platform_type="Amazon",cert_id="701",creator = "张滢萍",subject_no="1122",customer_no="01105",currency="CAD",currencyname="加元",website="CA",text="亚马逊平台CA站点 发货确认收入SELLER（CA）",projectno="0110502"},
new mPlatformAccountingSetting{ platform_type="DHgate",cert_id="712",creator = "张滢萍",subject_no="1122",customer_no="09006",currency="USD",currencyname="美元",website="Global",text="DHgate发货确认收入"}, new mPlatformAccountingSetting{ platform_type="DHgate",cert_id="712",creator = "张滢萍",subject_no="1122",customer_no="09006",currency="USD",currencyname="美元",website="Global",text="DHgate发货确认收入",projectno="09006"},
new mPlatformAccountingSetting{ platform_type="JD",cert_id="723",creator = "张滢萍",subject_no="1122",customer_no="29001",currency="THB",currencyname="泰铢",website="Global",text="JD平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="JD",cert_id="723",creator = "张滢萍",subject_no="1122",customer_no="29001",currency="THB",currencyname="泰铢",website="Global",text="JD平台发货确认收入",projectno="29001"},
new mPlatformAccountingSetting{ platform_type="JD",cert_id="722",creator = "张滢萍",subject_no="1122",customer_no="31001",currency="SEK",currencyname="瑞典克朗",website="Global",text="JD平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="JD",cert_id="722",creator = "张滢萍",subject_no="1122",customer_no="31001",currency="SEK",currencyname="瑞典克朗",website="Global",text="JD平台发货确认收入",projectno="30001"},
new mPlatformAccountingSetting{ platform_type="Joom",cert_id="724",creator = "张滢萍",subject_no="1122",customer_no="19033",currency="USD",currencyname="美元",website="Global",text="joom平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Joom",cert_id="724",creator = "张滢萍",subject_no="1122",customer_no="19033",currency="USD",currencyname="美元",website="Global",text="joom平台发货确认收入",projectno="18033"},
new mPlatformAccountingSetting{ platform_type="OpenSky",cert_id="722",creator = "张滢萍",subject_no="1122",customer_no="20001",currency="USD",currencyname="美元",website="US",text="opensky平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="OpenSky",cert_id="722",creator = "张滢萍",subject_no="1122",customer_no="20001",currency="USD",currencyname="美元",website="US",text="opensky平台发货确认收入"},
new mPlatformAccountingSetting{ platform_type="PriceMinister",cert_id="723",creator = "张滢萍",subject_no="1122",customer_no="16009",currency="EUR",currencyname="欧元",website="Global",text="PriceMinister平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="PriceMinister",cert_id="723",creator = "张滢萍",subject_no="1122",customer_no="16009",currency="EUR",currencyname="欧元",website="Global",text="PriceMinister平台发货确认收入"},
new mPlatformAccountingSetting{ platform_type="Sears",cert_id="724",creator = "张滢萍",subject_no="1122",customer_no="22001",currency="USD",currencyname="美元",website="US",text="Sears平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Sears",cert_id="724",creator = "张滢萍",subject_no="1122",customer_no="22001",currency="USD",currencyname="美元",website="US",text="Sears平台发货确认收入"},
new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="734",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="IDR",currencyname="印尼卢比",website="ID",text="Shopee平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="734",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="IDR",currencyname="印尼卢比",website="ID",text="Shopee平台发货确认收入",projectno="16032"},
new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="730",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="MYR",currencyname="马来西亚-林吉特",website="MY",text="Shopee平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="730",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="MYR",currencyname="马来西亚-林吉特",website="MY",text="Shopee平台发货确认收入",projectno="16032"},
new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="731",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="PHP",currencyname="菲律宾比索",website="PH",text="Shopee平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="731",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="PHP",currencyname="菲律宾比索",website="PH",text="Shopee平台发货确认收入",projectno="16032"},
new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="732",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="SGD",currencyname="新加坡元",website="SG",text="Shopee平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="732",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="SGD",currencyname="新加坡元",website="SG",text="Shopee平台发货确认收入",projectno="16032"},
new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="729",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="THB",currencyname="泰铢",website="TH",text="Shopee平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="729",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="THB",currencyname="泰铢",website="TH",text="Shopee平台发货确认收入"},
new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="733",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="VND",currencyname="越南盾",website="Global",text="Shopee平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Shopee",cert_id="733",creator = "张滢萍",subject_no="1122",customer_no="17032",currency="VND",currencyname="越南盾",website="Global",text="Shopee平台发货确认收入",projectno="16032"},
new mPlatformAccountingSetting{ platform_type="Shopify",cert_id="735",creator = "张滢萍",subject_no="2203",customer_no="28003",currency="USD",currencyname="美元",website="Global",text="Shopify平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Shopify",cert_id="735",creator = "张滢萍",subject_no="2203",customer_no="28003",currency="USD",currencyname="美元",website="Global",text="Shopify平台发货确认收入",projectno="27003"},
new mPlatformAccountingSetting{ platform_type="Walmart",cert_id="736",creator = "张滢萍",subject_no="1122",customer_no="18006",currency="USD",currencyname="美元",website="US",text="Walmart平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Walmart",cert_id="736",creator = "张滢萍",subject_no="1122",customer_no="18006",currency="USD",currencyname="美元",website="US",text="Walmart平台发货确认收入",projectno="17006"},
new mPlatformAccountingSetting{ platform_type="MARKETING",cert_id="733",creator = "张滢萍",subject_no="1122",customer_no="14001",currency="CNY",currencyname="人民币",website="Global",text="线下客户发货确认收入"}, new mPlatformAccountingSetting{ platform_type="MARKETING",cert_id="733",creator = "张滢萍",subject_no="1122",customer_no="14001",currency="CNY",currencyname="人民币",website="Global",text="线下客户发货确认收入"},
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="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平台发货确认收入"}, 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="Ebay",cert_id="736",creator = "赵娟",subject_no="1122",customer_no="030j4",currency="GBP",currencyname="英镑",website="UK"}, //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平台发货确认收入"}, 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平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Ebay",cert_id="717",creator = "张滢萍",subject_no="2203",customer_no="030j3",currency="EUR",currencyname="欧元",website="",text="eBay-paypal平台发货确认收入",projectno="030j3"},
new mPlatformAccountingSetting{ platform_type="Ebay",cert_id="714",creator = "张滢萍",subject_no="2203",customer_no="030j3",currency="GBP",currencyname="英镑",website="",text="eBay-paypal平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Ebay",cert_id="714",creator = "张滢萍",subject_no="2203",customer_no="030j3",currency="GBP",currencyname="英镑",website="",text="eBay-paypal平台发货确认收入",projectno="030j3"},
new mPlatformAccountingSetting{ platform_type="Ebay",cert_id="715",creator = "张滢萍",subject_no="2203",customer_no="030j3",currency="USD",currencyname="美元",website="",text="eBay-paypal平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Ebay",cert_id="715",creator = "张滢萍",subject_no="2203",customer_no="030j3",currency="USD",currencyname="美元",website="",text="eBay-paypal平台发货确认收入",},
new mPlatformAccountingSetting{ platform_type="Etsy",cert_id="721",creator = "张滢萍",subject_no="2203",customer_no="30001",currency="USD",currencyname="美元",website="US",text="Etsy平台发货确认收入"}, new mPlatformAccountingSetting{ platform_type="Etsy",cert_id="721",creator = "张滢萍",subject_no="2203",customer_no="30001",currency="USD",currencyname="美元",website="US",text="Etsy平台发货确认收入",projectno="28001"},
new mPlatformAccountingSetting{ platform_type="Fyniq",cert_id="722",creator = "张滢萍",subject_no="2203",customer_no="31001",currency="SEK",currencyname="瑞典克朗",website="US",text="Fyniq平台发货确认收入",projectno="30001"},
}; };
...@@ -10669,6 +10671,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -10669,6 +10671,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
var SubjectNo = ""; var SubjectNo = "";
var CustomerNo = ""; var CustomerNo = "";
var currencyName = ""; var currencyName = "";
var projectNo = "";
decimal rate = 0; decimal rate = 0;
var text = ""; var text = "";
...@@ -10691,6 +10695,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -10691,6 +10695,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
currencyName = setting.currencyname; currencyName = setting.currencyname;
text = setting.text; text = setting.text;
projectNo = setting.projectno;
} }
var exchangeRate = listRate.Where(a => a.currency == currencyName).FirstOrDefault(); var exchangeRate = listRate.Where(a => a.currency == currencyName).FirstOrDefault();
...@@ -10721,11 +10727,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -10721,11 +10727,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
} }
list.Add($@"{ID}|{Year}|{Month}|{Date}|记| list.Add($@"{ID}|{Year}|{Month}|{Date}|记|
{ID}|{Creator1}|||{("原币贷方金额取数据中心-oms发货收入" + item.platform_type + "平台-" + item.financecategoryname + "-订单总金额")}| {ID}|{Creator1}||||
{SubjectNo}|{text}|||| {SubjectNo}|{text}||||
{currencyName}|{rate}|||| {currencyName}|{rate}||||
|{item.amount}||{item.amount*rate}|| |{item.amount}||{item.amount*rate}||
||||=""{CustomerNo}""| ||||=""{projectNo ?? CustomerNo}""|
" "
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment