Commit a2bf200d by guanzhenshan

每日发生额 管理成本去掉物流费用

parent 6ca2c165
...@@ -9,29 +9,29 @@ namespace Bailun.DC.HappenAmount ...@@ -9,29 +9,29 @@ namespace Bailun.DC.HappenAmount
{ {
class Program class Program
{ {
static async Task Main(string[] args) //static async Task Main(string[] args)
//{
// Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
// var builder = new HostBuilder().ConfigureServices((hostContext, services) =>
// {
// services.AddHostedService<Services>();
// });
// await builder.RunConsoleAsync();
//}
static void Main(string[] args)
{ {
Console.WriteLine("启动服务 " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")); var start = DateTime.Parse("2020-01-01");
var builder = new HostBuilder().ConfigureServices((hostContext, services) => while (start.AddDays(1) < DateTime.Now)
{ {
services.AddHostedService<Services>(); new Services().Init(start, start.AddDays(1));
}); //new Bailun.DC.Services.FinanceReportServices().AddLogisticsWaitPay(start, 0);
start = start.AddDays(1);
await builder.RunConsoleAsync();
} }
//static void Main(string[] args) new Bailun.DC.Services.FinanceReportServices().UpdateLogisticsWaitPay(start, 0, "admin", null);
//{
// var start = DateTime.Parse("2020-03-01");
// while (start.AddDays(1) < DateTime.Now)
// {
// new Services().Init(start, start.AddDays(1));
// //new Bailun.DC.Services.FinanceReportServices().AddLogisticsWaitPay(start, 0);
// start = start.AddDays(1);
// }
// new Bailun.DC.Services.FinanceReportServices().UpdateLogisticsWaitPay(start, 0, "admin", null);
//} }
} }
} }
...@@ -106,7 +106,7 @@ namespace Bailun.DC.HappenAmount ...@@ -106,7 +106,7 @@ namespace Bailun.DC.HappenAmount
url += "&startDate=" + start.ToString("yyyy-MM-dd HH:mm:ss") + "&endDate=" + start.ToString("yyyy-MM-dd HH:mm:ss"); url += "&startDate=" + start.ToString("yyyy-MM-dd HH:mm:ss") + "&endDate=" + start.ToString("yyyy-MM-dd HH:mm:ss");
cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd HH:mm:ss") + "&EndRepayTime=" + end.ToString("yyyy-MM-dd HH:mm:ss"); cwurl += "BeginRepayTime=" + start.ToString("yyyy-MM-dd HH:mm:ss") + "&EndRepayTime=" + end.ToString("yyyy-MM-dd HH:mm:ss");
lgurl += "startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd"); //lgurl += "startDate=" + start.ToString("yyyy-MM-dd") + "&endDate=" + end.AddDays(-1).ToString("yyyy-MM-dd");
//利息支出 //利息支出
var listInterest = new Bailun.DC.Services.FinanceReportServices().ListInterestExpense(cwurl); var listInterest = new Bailun.DC.Services.FinanceReportServices().ListInterestExpense(cwurl);
...@@ -114,7 +114,7 @@ namespace Bailun.DC.HappenAmount ...@@ -114,7 +114,7 @@ namespace Bailun.DC.HappenAmount
//管理成本 //管理成本
var list = new Bailun.DC.Services.FinanceReportServices().ListOtherCost(url); var list = new Bailun.DC.Services.FinanceReportServices().ListOtherCost(url);
//物流费支出 //物流费支出
var listlg = ListLogisticFee(lgurl); //var listlg = ListLogisticFee(lgurl);
...@@ -142,11 +142,11 @@ namespace Bailun.DC.HappenAmount ...@@ -142,11 +142,11 @@ namespace Bailun.DC.HappenAmount
} }
//支出 物流费支出 //支出 物流费支出
if (listlg.Count() > 0) //if (listlg.Count() > 0)
{ //{
m.ac_amount_pay += listlg.Sum(a => a.amountRmb); // m.ac_amount_pay += listlg.Sum(a => a.amountRmb);
m.ac_amount_happen += listlg.Sum(a => a.amountRmb); // m.ac_amount_happen += listlg.Sum(a => a.amountRmb);
} //}
#endregion #endregion
......
...@@ -26,12 +26,12 @@ ...@@ -26,12 +26,12 @@
<td>@(ViewBag.InterestCount)</td> <td>@(ViewBag.InterestCount)</td>
<td><a class="btn btn-xs btn-primary" onclick="showdetail('@(ViewBag.start+"-"+ViewBag.end) 利息支出','@Url.Content("~/Reports/Finance/ListPayAdminCostInterest?start="+ViewBag.start+"&end="+ViewBag.end)')">查看明细</a></td> <td><a class="btn btn-xs btn-primary" onclick="showdetail('@(ViewBag.start+"-"+ViewBag.end) 利息支出','@Url.Content("~/Reports/Finance/ListPayAdminCostInterest?start="+ViewBag.start+"&end="+ViewBag.end)')">查看明细</a></td>
</tr> </tr>
<tr> @*<tr>
<td>3</td> <td>3</td>
<td>物流支出</td> <td>物流支出</td>
<td>@(ViewBag.LGCount)</td> <td>@(ViewBag.LGCount)</td>
<td><a class="btn btn-xs btn-primary" onclick="showdetail('@(ViewBag.start+"-"+ViewBag.end) 物流支出','@Url.Content("~/Reports/Finance/ListPayLogistic?start="+ViewBag.start+"&end="+ViewBag.end)')">查看明细</a></td> <td><a class="btn btn-xs btn-primary" onclick="showdetail('@(ViewBag.start+"-"+ViewBag.end) 物流支出','@Url.Content("~/Reports/Finance/ListPayLogistic?start="+ViewBag.start+"&end="+ViewBag.end)')">查看明细</a></td>
</tr> </tr>*@
</table> </table>
</div> </div>
......
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