Commit 964fdf53 by guanzhenshan

解决应收款明细无法访问的问题

parent 9c5f0284
...@@ -4492,7 +4492,7 @@ group by currency"; ...@@ -4492,7 +4492,7 @@ group by currency";
/// <returns></returns> /// <returns></returns>
public List<dc_daily_receivable> ListReceivable(BtTableParameter parameter,string platform,DateTime start, DateTime end,ref int total) public List<dc_daily_receivable> ListReceivable(BtTableParameter parameter,string platform,DateTime start, DateTime end,ref int total)
{ {
var sql = $"select * from dc_base_receivable where day>='{start.ToString("yyyy-MM-dd")}' and day<'{end.AddDays(1).ToString("yyyy-MM-dd")}'"; var sql = $"select * from dc_daily_receivable where day>='{start.ToString("yyyy-MM-dd")}' and day<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
if (!string.IsNullOrEmpty(platform)) if (!string.IsNullOrEmpty(platform))
...@@ -4523,7 +4523,7 @@ group by currency"; ...@@ -4523,7 +4523,7 @@ group by currency";
/// <returns></returns> /// <returns></returns>
public dc_daily_receivable ListReceivableCount(string platform, DateTime start, DateTime end) public dc_daily_receivable ListReceivableCount(string platform, DateTime start, DateTime end)
{ {
var sql = $"select sum(amount_sale_pay) amount_sale_pay,sum(amount_shipping) amount_shipping,sum(amount_refund) amount_refund,sum(amount_sale_shipping) amount_sale_shipping,sum(amount_platformfee) amount_platformfee,sum(amount_incoming) amount_incoming,sum(amount_other) amount_other from dc_base_receivable where day>='{start.ToString("yyyy-MM-dd")}' and day<'{end.AddDays(1).ToString("yyyy-MM-dd")}'"; var sql = $"select sum(amount_sale_pay) amount_sale_pay,sum(amount_shipping) amount_shipping,sum(amount_refund) amount_refund,sum(amount_sale_shipping) amount_sale_shipping,sum(amount_platformfee) amount_platformfee,sum(amount_incoming) amount_incoming,sum(amount_other) amount_other from dc_daily_receivable where day>='{start.ToString("yyyy-MM-dd")}' and day<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
var sqlparam = new DynamicParameters(); var sqlparam = new DynamicParameters();
if (!string.IsNullOrEmpty(platform)) if (!string.IsNullOrEmpty(platform))
...@@ -4562,7 +4562,7 @@ group by currency"; ...@@ -4562,7 +4562,7 @@ group by currency";
cn.Open(); cn.Open();
} }
var obj = cn.QueryFirstOrDefault<dc_daily_receivable>("select * from dc_base_receivable where id="+id); var obj = cn.QueryFirstOrDefault<dc_daily_receivable>("select * from dc_daily_receivable where id=" + id);
if (obj == null) if (obj == null)
{ {
......
...@@ -7,27 +7,27 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales ...@@ -7,27 +7,27 @@ namespace Bailun.DC.SkuDailyPurchaseAndSales
{ {
class Program class Program
{ {
//static async Task Main(string[] args) static async Task Main(string[] args)
//{
// Console.WriteLine("进入保存每日采购数和售出数");
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// {
// services.AddHostedService<Services>();
// });
// await builder.RunConsoleAsync();
//}
static void Main(string[] args)
{ {
var start = DateTime.Parse("2019-11-24"); Console.WriteLine("进入保存每日采购数和售出数");
while (start.AddDays(1) < DateTime.Now) var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
{ {
Console.WriteLine(start.ToString("yyyy-MM-dd")); services.AddHostedService<Services>();
new Services().Init(start, start.AddDays(1)); });
start = start.AddDays(1);
} await builder.RunConsoleAsync();
} }
//static void Main(string[] args)
//{
// var start = DateTime.Parse("2019-11-01");
// while (start.AddDays(1) < DateTime.Now)
// {
// Console.WriteLine(start.ToString("yyyy-MM-dd"));
// new Services().Init(start, start.AddDays(1));
// start = start.AddDays(1);
// }
//}
} }
} }
...@@ -6104,6 +6104,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers ...@@ -6104,6 +6104,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
rows = list, rows = list,
count_row = new count_row = new
{ {
platform="合计"
amount_end = objCount.amount_end.ToString("N2"), amount_end = objCount.amount_end.ToString("N2"),
amount_incoming = objCount.amount_incoming.ToString("N2"), amount_incoming = objCount.amount_incoming.ToString("N2"),
amount_other = objCount.amount_other.ToString("N2"), amount_other = objCount.amount_other.ToString("N2"),
......
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