Skip to content

D
DataCenter_Core2.1_20190520
Commit 524491de by guanzhenshan
Options

更新资产负债表存货的数据

parent fe1df4e7
Showing with 28 additions and 12 deletions
Bailun.DC.Services/FinanceReportServices.cs
......@@ -1693,10 +1693,10 @@ namespace Bailun.DC.Services
}
var FBABalance = cn.QueryFirstOrDefault<decimal?>("select sum(balance_rmb) from dc_inventory_balance where is_transfer=0 and hq_type='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") +"'"); // +and 2=" + payid);
var NoFBABalance = cn.QueryFirstOrDefault<decimal?>("select sum(balance_rmb) from dc_inventory_balance where is_transfer=0 and hq_type!='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
var NoFBABalance = cn.QueryFirstOrDefault<decimal?>("select sum(balance_rmb) from dc_inventory_balance where is_transfer=0 and hq_type!='FBA仓' and hq_type!='耗材仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
var FBABalance_OnWay = cn.QueryFirstOrDefault<decimal?>("select sum(balance_rmb) from dc_inventory_balance where is_transfer=1 and hq_type='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
var NoFBABalance_OnWay = cn.QueryFirstOrDefault<decimal?>("select sum(balance_rmb) from dc_inventory_balance where is_transfer=1 and hq_type!='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
var FBABalance_OnWay = cn.QueryFirstOrDefault<decimal?>("select sum(transfer_rmb) from dc_inventory_balance where is_transfer=1 and hq_type='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
var NoFBABalance_OnWay = cn.QueryFirstOrDefault<decimal?>("select sum(transfer_rmb) from dc_inventory_balance where is_transfer=1 and hq_type!='FBA仓' and statistical_time='" + day.ToString("yyyy-MM-dd") + "'"); //and 2=" + payid);
var SemiFinishBalance = cn.QueryFirstOrDefault<decimal?>("select sum(inventory_amount) from dc_semi_daily_stock where day='" + day.ToString("yyyy-MM-dd")+"'");
......
Bailun.DC.Services/LogisticsServices.cs
......@@ -36,7 +36,6 @@ namespace Bailun.DC.Services
var result = cn.QueryFirstOrDefault<decimal?>(sql);
return result ?? 0;
}
}
......
Bailun.DC.Web/Areas/Reports/Views/Finance/Index2.cshtml
......@@ -334,7 +334,7 @@
<div style="width:8%;"></div>
</div>
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">1.存货FBA仓在库</div>
<div style="width:11.5%;color:#bbb;background-color:#b1dae4;">1.存货FBA仓在库</div>
<div style="width:11.5%;" class="fba_inventory_amount">0</div>
<div style="width:11.5%;" class="fba_inventory_amount">0</div>
<div style="width:11.5%;" class="fba_inventory_amount">0</div>
......@@ -348,7 +348,7 @@
<div style="width:8%;"></div>
</div>
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">2.存货非FBA仓在库</div>
<div style="width:11.5%;color:#bbb;background-color:#b1dae4;">2.存货非FBA仓在库</div>
<div style="width:11.5%;" class="not_fba_inventory_amount">0</div>
<div style="width:11.5%;" class="not_fba_inventory_amount">0</div>
<div style="width:11.5%;" class="not_fba_inventory_amount">0</div>
......@@ -375,7 +375,7 @@
<div style="width:8%;"></div>
</div>*@
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;" title="3.存货FBA仓在途(不包括调拨计划)">3.存货FBA仓在途(不包括调拨计划)</div>
<div style="width:11.5%;color:#bbb;background-color:#b1dae4;" title="3.存货FBA仓在途(不包括调拨计划)">3.存货FBA仓在途(不包括调拨计划)</div>
<div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
<div style="width:11.5%;" class="fba_transfer_allot_amount">0</div>
......@@ -416,7 +416,7 @@
<div style="width:8%;"></div>
</div>*@
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;" title="5.存货非FBA仓在途(不包括调拨计划)">5.存货非FBA仓在途(不包括调拨计划)</div>
<div style="width:11.5%;color:#bbb;background-color:#b1dae4;" title="5.存货非FBA仓在途(不包括调拨计划)">5.存货非FBA仓在途(不包括调拨计划)</div>
<div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
<div style="width:11.5%;" class="not_fba_transfer_allot_amount">0</div>
......@@ -458,7 +458,7 @@
<div style="width:8%;"></div>
</div>
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">7.1.百伦半成品在库</div>
<div style="width:11.5%;color:#bbb;background-color:#b1dae4;">7.1.百伦半成品在库</div>
<div style="width:11.5%;" class="semi_bailun_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_bailun_inventory_amount">0</div>
......@@ -486,7 +486,7 @@
<div style="width:8%;"></div>
</div>
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">7.3.生产库存</div>
<div style="width:11.5%;color:#bbb;background-color:#b1dae4;">7.3.生产库存</div>
<div style="width:11.5%;" class="semi_prod_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_prod_inventory_amount">0</div>
<div style="width:11.5%;" class="semi_prod_inventory_amount">0</div>
......@@ -542,7 +542,7 @@
<div style="width:8%;"></div>
</div>
<div class="item-row fa fa1" style="width:100%;">
<div style="width:11.5%;color:#bbb;">9.自产采购发货在途</div>
<div style="width:11.5%;color:#bbb;background-color:#b1dae4;">9.自产采购发货在途</div>
<div style="width:11.5%;" class="purchase_pro_amount">0</div>
<div style="width:11.5%;" class="purchase_pro_amount">0</div>
<div style="width:11.5%;" class="purchase_pro_amount">0</div>
......
Bailun.DC.Web/Controllers/ApiController.cs
......@@ -585,6 +585,8 @@ namespace Bailun.DC.Web.Controllers
/// <param name="end">结束时间</param>
/// <param name="skus">sku数组</param>
/// <param name="platform">平台</param>
/// <param name="isplatformtime">是否按平台下单时间统计，1：是，0：否</param>
/// <param name="timetype">1:创建时间，2：付款时间</param>
/// <returns></returns>
[HttpPost]
public JsonResult SkuSales(int page, DateTime start, DateTime end, string skus, int? isplatformtime,int timetype=1, string platform = "Ebay")
......@@ -904,5 +906,19 @@ namespace Bailun.DC.Web.Controllers
}
}
///// <summary>
///// 首次入库时间
///// </summary>
///// <param name="start">开始时间</param>
///// <param name="end">结束时间</param>
///// <returns></returns>
//[HttpPost]
//public JsonResult FirstPutinTime(DateTime start, DateTime end)
//{
//}
}
}
\ No newline at end of file
Bailun.DC.Web/Controllers/HomeController.cs
......@@ -77,7 +77,7 @@ namespace Bailun.DC.Web.Controllers
public ActionResult Main()
{
#if DEBUG
var cookie = "Bearer%20eyJhbGciOiJSUzI1NiIsImtpZCI6IjdhZDA5MjQ5ZDk0ZDgxN2VhNmI5ZThhMTc1MzlmNmY3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTcxMjYzMTgsImV4cCI6MTU5NzE2MjMxOCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk3MTI2MzE4LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsIkRlcGFydG1lbnQiOiIiLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.GrXCYKLlsbZzjw7h2H0FJR3TwD0VFbXCsAfeEDNiNzZEtLQ-oYBe0OdJXjepMTo-1sel7Qf33v8fU-MuRrH6MbmnM-I_ahCajNofr4c-NXLR9UKsLKTEV6ZBQ2nRhnfWbeQfWee7UrIUe8h1k3TNpwMs4XHCmwQEUh2PkmqyLIAHYZQhZ7nbD9AkczXph7v5F7_UUURRdL93z7jfG1WqOveDSBI4uXNCu6VyvA-Xrq0msHNZqiuQo1EhJ0cT3NdPqHn55H9zqa3B3yl3GolCD2ncsE3jjdmbVEJd8HATnnbmOcqR3_E9zX2TBFHr7ToJkmS7zy9i6GCovPEZcjV7GQ";
var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjdhZDA5MjQ5ZDk0ZDgxN2VhNmI5ZThhMTc1MzlmNmY3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTc4MDQxMjUsImV4cCI6MTU5Nzg0MDEyNSwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk3ODA0MTI1LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTgsXCJOYW1lXCI6XCLmlbDmja7kuK3lv4NcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.BuFlJ8EMbhyW1TPfp9J8JblY4A_uOi5r1iY1ogAX5g-5sITK3RfNzSk2YssIgGddUf57uWX0z8eJWfHaNK3Fh9CJOKKyt8z52oPKRj1uFzhJNvMkiIV2zGogYbb8e4X7yVdRYzwcKp8d8Xk0pxOEfZQujYzuZaxtWhyyX0diRZt5tQGjxRazNsPAefC0Kn4joX_czf7gViMp0Ev2xteCOBJPcR5hb9AnCi9MslAqeT0Kbd-zW8PJzHRfs44MKOsI8Mj__4QKiyKiCHFikcF2UfwNjmhFCKU7kVvlz2jJ4DJYRuMEq9DV1CQKJJBhXP6qCtNIVFn-3l867Uj1mgQgtQ";
#else
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
var cookie = HttpContext.Request.Cookies["BailunToken"];
......
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