优化现金流量表

Bailun.DC.DailyPayAndIncoming/Services.cs

@@ -384,7 +384,7 @@ namespace Bailun.DC.DailyPayAndIncoming
             var sqlparam = new DynamicParameters();
             var list = new List<Models.dc_base_finance_logistics>();
 
-            var sql = $"select if(manage_cost_type=1,amount_rmb,-amount_rmb) as amount_rmb from dc_base_finance_logistics where pay_time>='{start.ToString("yyyy-MM-dd")}' and pay_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
+            var sql = $"select if(manage_cost_type=1,amount_rmb,-amount_rmb) as  from dc_base_finance_logistics where pay_time>='{start.ToString("yyyy-MM-dd")}' and pay_time<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
             
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {

Bailun.DC.DailySemiPurchaseSellStock/Program.cs

@@ -22,7 +22,7 @@ namespace Bailun.DC.DailySemiPurchaseSellStock
         {
             var _services = new Services();
 
-            var start = DateTime.Parse("2020-04-10");
+            var start = DateTime.Parse("2020-05-25");
             _services.Init(start);
             //while (start.AddDays(1) < DateTime.Now)
             //{

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -6809,7 +6809,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         {
             //支出包含两部分，一部分是百伦管理费，一部分是产品成本支出
             //管理成本  广州百伦、香港百伦、电子服装厂、阳山仓、深圳仓的管理成本
-            var url = "http://api.fee.bailuntec.com/purchase/other/cost/api/manageCostList?o=0";
+            var url = "http://api.fee.bailuntec.com/fee/api/cost/api/manageCostList?";
             var cwurl = "http://cw.bailuntec.com/api/api/GetRepayPlanDetails?";
             var lgurl = "http://api.fee.bailuntec.com/fee/api/cost/api/logisticsCostList?";
 
@@ -6843,7 +6843,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             if (t == 1)  //管理成本
             {
                 //管理成品
-                var list = new Services.FinanceReportServices().ListOtherCost(url);
+                var list = new Services.FinanceReportServices().ListFinanceManageCost(start,end,"","","",null);
 
                 var colNames = new List<string>() { "费用单号", "管理成本单类型", "部门名称", "付款主体名称", "父级分类", "金额", "付款时间" };
                 
@@ -6851,8 +6851,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 var listval = new List<string>();
                 foreach (var item in list)
                 {
-                    listval.Add(item.no + "|" + item.manageCostType + "|" + item.departmentName + "|" + item.companyName + "|" + item.feeSuperType + "|" + item.amountRmb + "|" +
-                        (item.payTime.HasValue?item.payTime.Value.ToString("yyyy-MM-dd HH:mm:ss"):"") 
+                    listval.Add(item.no + "|" + item.manage_cost_type + "|" + item.department_name + "|" + item.company_name + "|" + item.fee_super_type + "|" + item.amount_rmb + "|" +
+                        (item.pay_time.HasValue?item.pay_time.Value.ToString("yyyy-MM-dd HH:mm:ss"):"") 
                         );
                 }