修复bug

Bailun.DC.Services/WareHouseServices.cs

@@ -1060,7 +1060,7 @@ namespace Bailun.DC.Services
                         where t1.isfinish=0 and warehouse_code>0 and t1.day>='{start.ToString("yyyy-MM-dd")}' and t1.day<'{end.AddDays(1).ToString()}'
                         ";
 
-            sql += " group by t1.warehouse_code";
+            sql += " group by t1.warehouse_name";
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {
                 if (cn.State == System.Data.ConnectionState.Closed)
@@ -1068,7 +1068,7 @@ namespace Bailun.DC.Services
                     cn.Open();
                 }
 
-                var obj = cn.Query<dc_daily_purchase_sales>(sql, sqlparam, null, true, 2 * 60).AsList();
+                var obj = cn.Query<dc_daily_purchase_sales>(sql, sqlparam, null, true, 2 * 60).ToList();
                 return obj;
             }
         }

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

@@ -754,6 +754,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             #region 采购和发货情况 Add by Allan at 20191104
 
+            Console.WriteLine(objSemiCategory.Count);
+
+
             var listSubCount1 = new List<Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>>();
             var listSubCount2 = new List<Tuple<string, decimal, decimal, decimal, decimal, decimal, decimal>>();
             var semi_E_Oil = objSemiCategory.Where(a => a.category_simple_name == "精油灌装车间" || a.category_simple_name == "精油灌装车间").ToList(); //精油原料