解决逻辑仓库汇总数据的趋势图没有显示的问题

Bailun.DC.Services/WareHouseServices.cs

@@ -1141,6 +1141,41 @@ namespace Bailun.DC.Services
             }
         }
 
+        /// <summary>
+        /// 获取逻辑仓的每日数据，用于显示趋势图(汇总的)
+        /// </summary>
+        /// <param name="warehouse_code"></param>
+        /// <param name="columnname"></param>
+        /// <returns></returns>
+        public List<string> GetMidLogicWarehouseStatisticCount(string columnname, DateTime start, DateTime end)
+        {
+            var sql = "select CONCAT(name,',',DATE_FORMAT(day,'%Y-%m-%d')) as name from ("; 
+            sql += "select sum(" + columnname + ") as name,day from dc_daily_logic_wh_statistic where ";
+
+            if(columnname.Trim()== "pin_rate_stock")
+            {
+                sql = "select sum(thirtyday_total_sales)/sum(usable_stock) as name,day from dc_daily_logic_wh_statistic where ";
+            }
+
+            sql += $" day>='{start.ToString("yyyy-MM-dd")}' and day<='{end.ToString("yyyy-MM-dd")}' group by day";
+
+            sql += " ) t1  ";
+
+            sql += " order by day";
+
+            using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
+            {
+                if (cn.State == System.Data.ConnectionState.Closed)
+                {
+                    cn.Open();
+                }
+
+                return cn.Query<string>(sql).ToList();
+            }
+        }
+
+
+
         #region 动态库存分析
 
         public List<mDynamicStockAnalyse> ListDynamicStockAnalyse(string warehouse_code, int isfinish)

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

@@ -1661,7 +1661,18 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         [HttpPost]
         public JsonResult WarehouseTrendChartJson(string warehouse_code,string key,DateTime start,DateTime end)
         {
-            var obj = new Services.WareHouseServices().GetMidLogicWarehouseStatistic(warehouse_code, key,start,end);
+            var obj = new List<string>();
+
+            if(string.IsNullOrEmpty(warehouse_code))
+            {
+                obj = new Services.WareHouseServices().GetMidLogicWarehouseStatisticCount(key, start, end);
+            }
+            else
+            {
+                new Services.WareHouseServices().GetMidLogicWarehouseStatistic(warehouse_code, key, start, end);
+            }
+
+            
 
             var listval = new List<string>();
             var listdate = new List<string>();

Bailun.DC.Web/Areas/Reports/Views/Warehouse/LogicWarehouse.cshtml

@@ -250,7 +250,11 @@
             layer_show(name+'动态库存分析', '@Url.Content("~/Reports/Warehouse/DynamicStockAnalyse?warehouse_code=")' + code,'90%','90%');
         }
 
-        function ShowTrendChart(code, name, key,whname) {
+        function ShowTrendChart(code, name, key, whname) {
+            if (code == null) {
+                code = '';
+            }
+
             layer_show(whname+"=》"+name + '的趋势图', '@Url.Content("~/Reports/Warehouse/WarehouseTrendChart?warehouse_code=")' + code + '&key=' + key + '&titlename=' + name,'90%','90%');
         }
 
@@ -273,7 +277,7 @@
             }
 
             var url = 'http://oms.bailuntec.com/#/bailun-order/all-orders?baseQueryKey=SkuNo_Accurate&dateType=payTime&daterange=' + start + '&daterange=' + end + '&wareNo=' + warehousecode + '&orderStatus=0&orderStatus=1&orderStatus=3';
-            console.log(url);
+            
             layer_show(name + " 的订单明细", url, '90%', '90%');
         }