Skip to content

D
DataCenter_Core2.1_20190520
Commit 27bb6c1a by guanzhenshan
Options

修改物流往来统计报表，把所有的物流供应商都显示在报表上。

parent dda2b5ff
Showing with 46 additions and 23 deletions
Bailun.DC.Services/LogisticsServices.cs
...@@ -50,7 +50,7 @@ namespace Bailun.DC.Services ...@@ -50,7 +50,7 @@ namespace Bailun.DC.Services
/// <param name="suppliername">供应商名称</param> /// <param name="suppliername">供应商名称</param>
/// <param name="total"></param> /// <param name="total"></param>
/// <returns></returns> /// <returns></returns>
public List<dc_daily_logistics_supplier_transaction> ListSupplierTransaction(BtTableParameter request, DateTime start, DateTime end, string suppliername,ref int total) public List<dc_daily_logistics_supplier_transaction> ListSupplierTransaction(DateTime start, DateTime end, string suppliername)
{ {
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
...@@ -59,27 +59,40 @@ namespace Bailun.DC.Services ...@@ -59,27 +59,40 @@ namespace Bailun.DC.Services
" from dc_daily_logistics_supplier_transaction t1 "; " from dc_daily_logistics_supplier_transaction t1 ";
sql += $" where t1.day>='{start.ToString("yyyy-MM-dd")}' and t1.day<='{end.ToString("yyyy-MM-dd")}' "; sql += $" where t1.day>='{start.ToString("yyyy-MM-dd")}' and t1.day<='{end.ToString("yyyy-MM-dd")}' ";
var sqlcount = $"select count(0) from (select suppliername from dc_daily_logistics_supplier_transaction t1 where t1.day>='{start.ToString("yyyy-MM-dd")}' and t1.day<='{end.ToString("yyyy-MM-dd")}'"; //var sqlcount = $"select count(0) from (select suppliername from dc_daily_logistics_supplier_transaction t1 where t1.day>='{start.ToString("yyyy-MM-dd")}' and t1.day<='{end.ToString("yyyy-MM-dd")}'";
if (!string.IsNullOrEmpty(suppliername)) if (!string.IsNullOrEmpty(suppliername))
{ {
sql += " and t1.suppliername=@suppliername"; sql += " and t1.suppliername=@suppliername";
sqlparam.Add("suppliername", suppliername); sqlparam.Add("suppliername", suppliername);
sqlcount += " and t1.suppliername=@suppliername"; //sqlcount += " and t1.suppliername=@suppliername";
} }
sql += " group by t1.suppliername "; sql += " group by t1.suppliername ";
sqlcount += " group by t1.suppliername) t0 "; //sqlcount += " group by t1.suppliername) t0 ";
if (!string.IsNullOrEmpty(request.sort)) //if (!string.IsNullOrEmpty(request.sort))
//{
// sql += " order by t1."+request.sort+" "+request.order;
//}
//var sql_start_end = $"left join dc_daily_logistics_supplier_transaction t1 on t1.suppliername=t0.suppliername and t1.day='{start.ToString("yyyy-MM-dd")}'";
if (string.IsNullOrEmpty(suppliername))
{ {
sql += " order by t1."+request.sort+" "+request.order; sql += $@"union all
select t1.suppliername,t1.amount_happen,t1.amount_pay,t1.amount_receipt,t1.amount_other,t1.amount_end from dc_daily_logistics_supplier_transaction t1 where t1.id in (
select max(t0.id) from dc_daily_logistics_supplier_transaction t0 where t0.day<'{start.ToString("yyyy-MM-dd")}'
and t0.suppliername in (select t1.suppliername from (
select suppliername from dc_daily_logistics_supplier_transaction group by suppliername) t1
left join (select suppliername from dc_daily_logistics_supplier_transaction where day>='{start.ToString("yyyy-MM-dd")}' and day<='{end.ToString("yyyy-MM-dd")}' group by suppliername) t2 on t1.suppliername=t2.suppliername
where t2.suppliername is null)
group by t0.suppliername)";
} }
//var sql_start_end = $"left join dc_daily_logistics_supplier_transaction t1 on t1.suppliername=t0.suppliername and t1.day='{start.ToString("yyyy-MM-dd")}'";
using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString)) using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
{ {
if (cn.State == System.Data.ConnectionState.Closed) if (cn.State == System.Data.ConnectionState.Closed)
...@@ -87,7 +100,7 @@ namespace Bailun.DC.Services ...@@ -87,7 +100,7 @@ namespace Bailun.DC.Services
cn.Open(); cn.Open();
} }
var obj = cn.Page<dc_daily_logistics_supplier_transaction>(request.pageIndex, request.limit, sql, ref total,sqlparam, sqlcount).ToList(); var obj = cn.Query<dc_daily_logistics_supplier_transaction>(sql, sqlparam).ToList();
//获取期初 //获取期初
sql = $@"select t1.amount_end,t1.suppliername from dc_daily_logistics_supplier_transaction t1 where t1.id in ( sql = $@"select t1.amount_end,t1.suppliername from dc_daily_logistics_supplier_transaction t1 where t1.id in (
...@@ -191,6 +204,14 @@ namespace Bailun.DC.Services ...@@ -191,6 +204,14 @@ namespace Bailun.DC.Services
var sql = $"select * from dc_daily_logistics_supplier_transaction where suppliername='{name}' and day='{day.ToString("yyyy-MM-dd")}'"; var sql = $"select * from dc_daily_logistics_supplier_transaction where suppliername='{name}' and day='{day.ToString("yyyy-MM-dd")}'";
var obj = cn.QueryFirstOrDefault<dc_daily_logistics_supplier_transaction>(sql); var obj = cn.QueryFirstOrDefault<dc_daily_logistics_supplier_transaction>(sql);
if (obj == null)
{
sql = $@"select * from dc_daily_logistics_supplier_transaction where id = (
select max(t0.id) from dc_daily_logistics_supplier_transaction t0 where t0.day<'{day.ToString("yyyy-MM-dd")}' and t0.suppliername='{name}' group by t0.suppliername)";
obj = cn.QueryFirstOrDefault<dc_daily_logistics_supplier_transaction>(sql);
}
if (obj != null) if (obj != null)
{ {
obj.amount_other = amount; obj.amount_other = amount;
...@@ -201,6 +222,7 @@ namespace Bailun.DC.Services ...@@ -201,6 +222,7 @@ namespace Bailun.DC.Services
return UpdateSupplierTrancationAmountEnd(name, obj.amount_end, obj.day, cn, uid, username); return UpdateSupplierTrancationAmountEnd(name, obj.amount_end, obj.day, cn, uid, username);
} }
return ""; return "";
} }
} }
......
Bailun.DC.Web/Areas/Reports/Controllers/LogisticsController.cs
...@@ -44,9 +44,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -44,9 +44,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
public string SupplierTrancationReportJson(BtTableParameter request,DateTime start,DateTime end,string suppliername) public string SupplierTrancationReportJson(BtTableParameter request,DateTime start,DateTime end,string suppliername)
{ {
var total = 0; var total = 0;
var obj = new Services.LogisticsServices().ListSupplierTransaction(request, start, end, suppliername,ref total); var obj = new Services.LogisticsServices().ListSupplierTransaction(start, end, suppliername);
total = obj.Count;
var objCount = new Services.LogisticsServices().ListSupplierTransactionCount(start, end, suppliername); //var objCount = new Services.LogisticsServices().ListSupplierTransactionCount(start, end, suppliername);
var list = obj.Select(a => new { var list = obj.Select(a => new {
str_day = (start==end?start.ToString("yyyy-MM-dd"):start.ToString("yyyy-MM-dd")+"至"+end.ToString("yyyy-MM-dd")), str_day = (start==end?start.ToString("yyyy-MM-dd"):start.ToString("yyyy-MM-dd")+"至"+end.ToString("yyyy-MM-dd")),
...@@ -58,6 +58,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -58,6 +58,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
amount_end = a.amount_end.ToString("N2"), amount_end = a.amount_end.ToString("N2"),
a.suppliername, a.suppliername,
}); });
return JsonConvert.SerializeObject(new return JsonConvert.SerializeObject(new
{ {
...@@ -66,12 +67,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -66,12 +67,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
count_row = new count_row = new
{ {
str_day = "合计", str_day = "合计",
amount_start = objCount.amount_start.ToString("N2"), amount_start = obj.Count>0?obj.Sum(a=>a.amount_start).ToString("N2"):"0",
amount_happen = objCount.amount_happen.ToString("N2"), amount_happen = obj.Count > 0 ? obj.Sum(a=>a.amount_happen).ToString("N2"):"0",
amount_pay = objCount.amount_pay.ToString("N2"), amount_pay = obj.Count > 0 ? obj.Sum(a=>a.amount_pay).ToString("N2"):"0",
amount_receipt = objCount.amount_receipt.ToString("N2"), amount_receipt = obj.Count > 0 ? obj.Sum(a=>a.amount_receipt).ToString("N2"):"0",
amount_other = objCount.amount_other.ToString("N2"), amount_other = obj.Count > 0 ? obj.Sum(a=>a.amount_other).ToString("N2"):"0",
amount_end = objCount.amount_end.ToString("N2"), amount_end = obj.Count > 0 ? obj.Sum(a=>a.amount_end).ToString("N2"):"0",
} }
}); });
} }
......
Bailun.DC.Web/Areas/Reports/Views/Logistics/SupplierTrancationReport.cshtml
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
} }
} }
} }
}); }, undefined, 1000);
} }
else { else {
tb.bootstrapTable('refresh', { url: url }); tb.bootstrapTable('refresh', { url: url });
......
Bailun.DC.Web/Controllers/HomeController.cs
...@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers ...@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers
public ActionResult Main() public ActionResult Main()
{ {
#if DEBUG #if DEBUG
var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTQ5NTQ4NzYsImV4cCI6MTU5NDk5MDg3NiwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk0OTU0ODc2LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.yU3RZJ2qy5l_DE_kjY6I1d3-vIRyvfpsBfAEKMimkAOx26aQhXeqpd-UwVy8Q5I0d1sgB4THkXJBrDJ2PCvRJ_tsrfDW6wL3TDHS7tkV2z4nU0HhZme6veu7SzpK7njQpn7Qb5nlJrdbiGpPeBof0n13KoQs_fi2HdQtgklGjG6ZL-tiULAAI4VgB820qSnWw6Cq3Bc-RgeeCNyKLlxbtCQEitYcqTK1wNUDkaojgAYrCktG2JbSOX2iI5w_1WwiD87m22y1sGEd5es1D-JAxOQzNVOdIxDkoZ840rnH9RztMwQwR9VyO7N9mXUdnhel44fhps1Ax7UyWd8KldFtow"; var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6ImQ3ZjgyYjYyN2E1OWY4YWJkMWU2OTI5MTlkNzc1NmNkIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTUwMzk4MDMsImV4cCI6MTU5NTA3NTgwMywiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk1MDM5ODAzLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.OYC5eV064HV_koAvGQD9pSsWOqufCMnDn9VZ24gmxm_VesUEBtwsRrp2Ojuab2VwCg_VTFxUZdoAc-92LzK2zDfWRjgsBQtpSmxvc3eu-e7PiWSM9bJKHyaRR4FbS3ZGUUmkWhT5tAPyR4_tspMx-ZJsZeAq58OkwRjEc3UzvSpkTm-zbR_F-gIa_6ywQ_yinuzd2pw_TrAC-g2Xp4mfFSRhdLGxq0zlQynduYBG98bcFtpY_1ydtIjUteDor4MWrXTBNzzciChMxh6Rbd2BAv-B_UlOpGLbKk_RwHfZAnZrmOuWJClUpLW4WrFBU7ifg5JS9xnGWQtkhZpwLvuL7A";
#else #else
//var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource"); //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
var cookie = HttpContext.Request.Cookies["BailunToken"]; var cookie = HttpContext.Request.Cookies["BailunToken"];
......
Bailun.DC.Web/wwwroot/js/common.js
...@@ -5,7 +5,7 @@ var globalOrderType = ''; ...@@ -5,7 +5,7 @@ var globalOrderType = '';
var userid; var userid;
var username; var username;
var jobs; var jobs;
function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam) { function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam,pagesize) {
var $btTable = $('#' + tableId); var $btTable = $('#' + tableId);
$btTable.bootstrapTable({ $btTable.bootstrapTable({
url: actionUrl, url: actionUrl,
...@@ -48,7 +48,7 @@ function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam ...@@ -48,7 +48,7 @@ function OnlyTable(tableId, aoColumn, actionUrl, serverParams,tbParams,dataParam
columns: aoColumn,//列表字段 columns: aoColumn,//列表字段
pageList: "[25, 50, 100,200]", pageList: "[25, 50, 100,200]",
pageSize: 25, pageSize: pagesize||25,
paginationFirstText: "第一页", paginationFirstText: "第一页",
paginationPreText: "上一页", paginationPreText: "上一页",
paginationNextText: "下一页", paginationNextText: "下一页",
......
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