1、增加每日发生额统计汇总报表

2、每日销进比汇总报表 合并普货分类数据

Bailun.DC.HappenAmount/Program.cs

@@ -20,9 +20,12 @@ namespace Bailun.DC.HappenAmount
 
         //static void Main(string[] args)
         //{
-        //    Console.WriteLine("Hello World!");
-
-        //    new Services().Init(DateTime.Parse("2019-08-01"), DateTime.Parse("2019-08-02"));
+        //    var start = DateTime.Parse("2019-07-01");
+        //    while (start < DateTime.Now)
+        //    {
+        //        new Services().Init(start, start.AddDays(1));
+        //        start = start.AddDays(1);
+        //    }
 
         //}
     }

Bailun.DC.HappenAmount/Services.cs

@@ -190,7 +190,11 @@ namespace Bailun.DC.HappenAmount
                 var result = cn.Insert(m);
                 if (!result.HasValue || result.Value <= 0)
                 {
-                    Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")+"保存失败，请重试！");
+                    Console.WriteLine(DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "保存失败，请重试！");
+                }
+                else
+                {
+                    Console.WriteLine(m.day + " 保存成功！");
                 }
             }
 

Bailun.DC.Services/FinanceReportServices.cs

@@ -1431,5 +1431,31 @@ namespace Bailun.DC.Services
 
         #endregion
 
+        #region 发生额
+
+        /// <summary>
+        /// 获取发生额
+        /// </summary>
+        /// <param name="start">开始日期</param>
+        /// <param name="end">结束日期</param>
+        /// <returns></returns>
+        public List<dc_daily_happen_amount> ListHappenAmount(DateTime start, DateTime end)
+        {
+            var sql = $"select * from dc_daily_happen_amount where day>='{start.ToString("yyyy-MM-dd")}' and day<'{end.AddDays(1).ToString("yyyy-MM-dd")}' order by day ";
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                return cn.Query<dc_daily_happen_amount>(sql, null, null, true, 2 * 60).AsList();
+            }
+
+        }
+
+        #endregion
+
     }
 }

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

@@ -2982,9 +2982,104 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             return View();
         }
-        
+
 
         #endregion
 
+        #region 发生额
+
+        /// <summary>
+        /// 每日发生额汇总
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult HappenAmountCount()
+        {
+            return View();
+        }
+
+        /// <summary>
+        /// 每日发生额汇总数据
+        /// </summary>
+        /// <param name="start">开始时间</param>
+        /// <param name="end">结束时间</param>
+        /// <param name="dateWay">统计方式 1按日 2按周  3按月</param>
+        /// <returns></returns>
+        [HttpPost]
+        public JsonResult HappenAmountCountJson(DateTime start, DateTime end,int dateWay)
+        {
+            var list = new List<mHappenAmount>();
+            var obj = new Services.FinanceReportServices().ListHappenAmount(start, end);
+
+            if (obj.Count == 0)
+            {
+                return Json(new
+                {
+                    success = true,
+                    list = list,
+                    msg = ""
+                });
+            }
+
+
+            //按周
+            if (dateWay == 2)
+            {
+                var first = obj.FirstOrDefault();
+                var DayOfWeek = first.day.DayOfWeek;
+
+                var startDay = first.day;
+                var endDay = first.day.AddDays((7 - (int)DayOfWeek));
+                var weekIndex = 0;
+
+                foreach (var item in obj)
+                {
+                    if (item.day > endDay)
+                    {
+                        weekIndex++;
+                        startDay = endDay.AddDays(1);
+                        endDay = endDay.AddDays(7);
+                    }
+
+                    var m = list.Where(a => a.start >= item.day && item.day <= a.end);
+
+                    if (m.Count() <= 0)
+                    {
+                        var m1 = new mHappenAmount {
+                            
+                        };
+                    }
+
+
+                }
+
+            }
+
+            //按月
+
+
+            //按日
+
+            return Json("");
+        }
+
+
+        #endregion
+
+    }
+
+    class mHappenAmount {
+        /// <summary>
+        /// 1 管理成本  2 头程物流费   3 尾程物流费  4 一级供应商采购   5 二级供应商采购
+        /// </summary>
+        public int type { get; set; }
+
+        public DateTime start { get; set; }
+
+        public DateTime end { get; set; }
+
+        public string day { get; set; }
+
+        public List<decimal> list {get;set;}
     }
+    
 }
\ No newline at end of file

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

@@ -863,6 +863,13 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     list = new List<string>()
                 };
 
+                var mdefault = new SkuCategory_Col {
+                    category_simple_name = "普货",
+                    list = new List<string>(),
+                };
+
+                var newData = data.Where(a => !a.category_simple_name.Contains("普货")).ToList();
+
                 foreach (var item in data)
                 {
                     for (var i = 0; i < item.list.Count; i++)
@@ -876,9 +883,28 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                             m.list.Add(item.list[i]);
                         }
                     }
+
+                    if (item.category_simple_name.Contains("普货"))
+                    {
+                        for (var i = 0; i < item.list.Count; i++)
+                        {
+                            if (mdefault.list.Count > i)
+                            {
+                                mdefault.list[i] = (decimal.Parse(mdefault.list[i]) + decimal.Parse(item.list[i])).ToString();
+                            }
+                            else
+                            {
+                                mdefault.list.Add(item.list[i]);
+                            }
+                        }
+                    }
                 }
 
-                data.Add(m);
+                newData.Add(mdefault);
+                newData.Add(m);
+
+
+                data = newData;
             }
 
             return Json(new {