修复每日销进比原料没显示的问题

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

@@ -756,18 +756,18 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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 == "精油灌装车间"); //精油原料
-            var semi_Hairdressing = objSemiCategory.Where(a => a.category_simple_name == "美容组装车间" || a.category_simple_name == "美容生产车间");//美容原料
-            var semi_Manicure = objSemiCategory.Where(a => a.category_simple_name == "阳山美甲灌装车间" || a.category_simple_name == "嘉禾美甲灌装车间" || a.category_simple_name == "哈倪蔓美甲灌装车间");//美甲原料
-            var semi_HNM = objSemiCategory.Where(a => a.category_simple_name == "甲油胶生产车间");//哈倪曼基料
+            var semi_E_Oil = objSemiCategory.Where(a => a.category_simple_name == "精油灌装车间" || a.category_simple_name == "精油灌装车间").ToList(); //精油原料
+            var semi_Hairdressing = objSemiCategory.Where(a => a.category_simple_name == "美容组装车间" || a.category_simple_name == "美容生产车间").ToList();//美容原料
+            var semi_Manicure = objSemiCategory.Where(a => a.category_simple_name == "阳山美甲灌装车间" || a.category_simple_name == "嘉禾美甲灌装车间" || a.category_simple_name == "哈倪蔓美甲灌装车间").ToList();//美甲原料
+            var semi_HNM = objSemiCategory.Where(a => a.category_simple_name == "甲油胶生产车间").ToList();//哈倪曼基料
 
-            var finish_Gen = obj.Where(a => a.category_simple_name.Contains("普货"));  //普货
-            var finish_Manicure = obj.Where(a => a.category_simple_name == "美甲"); //美甲生产
-            var finish_E_Oil = obj.Where(a => a.category_simple_name == "精油");    //精油生产
-            var finish_Hairdressing = obj.Where(a => a.category_simple_name == "美容");  //美容生产
+            var finish_Gen = obj.Where(a => a.category_simple_name.Contains("普货")).ToList();  //普货
+            var finish_Manicure = obj.Where(a => a.category_simple_name == "美甲").ToList(); //美甲生产
+            var finish_E_Oil = obj.Where(a => a.category_simple_name == "精油").ToList();    //精油生产
+            var finish_Hairdressing = obj.Where(a => a.category_simple_name == "美容").ToList();  //美容生产
 
 
-            if (semi_E_Oil.Count() > 0)
+            if (semi_E_Oil.Count > 0)
             {
                 listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("精油原料", semi_E_Oil.Sum(a => a.amount_purchase), semi_E_Oil.Sum(a => a.count_purchase), semi_E_Oil.Sum(a => a.amount_shipping), semi_E_Oil.Sum(a => a.count_shipping),(semi_E_Oil.Sum(a => a.amount_shipping) - semi_E_Oil.Sum(a => a.amount_purchase)),(semi_E_Oil.Sum(a => a.count_shipping) - semi_E_Oil.Sum(a => a.count_purchase))));
             }
@@ -776,7 +776,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("精油原料", 0, 0, 0, 0,0,0));
             }
 
-            if (semi_Hairdressing.Count() > 0)
+            if (semi_Hairdressing.Count > 0)
             {
                 listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美容原料", semi_Hairdressing.Sum(a => a.amount_purchase), semi_Hairdressing.Sum(a => a.count_purchase), semi_Hairdressing.Sum(a => a.amount_shipping), semi_Hairdressing.Sum(a => a.count_shipping), (semi_Hairdressing.Sum(a => a.amount_shipping) - semi_Hairdressing.Sum(a => a.amount_purchase)), (semi_Hairdressing.Sum(a => a.count_shipping) - semi_Hairdressing.Sum(a => a.count_purchase))));
             }
@@ -785,7 +785,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美容原料", 0, 0, 0, 0,0,0));
             }
 
-            if (semi_Manicure.Count() > 0)
+            if (semi_Manicure.Count > 0)
             {
                 listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美甲原料", semi_Manicure.Sum(a => a.amount_purchase), semi_Manicure.Sum(a => a.count_purchase), semi_Manicure.Sum(a => a.amount_shipping), semi_Manicure.Sum(a => a.count_shipping), (semi_Manicure.Sum(a => a.amount_shipping) - semi_Manicure.Sum(a => a.amount_purchase)), (semi_Manicure.Sum(a => a.count_shipping) - semi_Manicure.Sum(a => a.count_purchase))));
             }
@@ -794,7 +794,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美甲原料", 0, 0, 0, 0,0,0));
             }
 
-            if (semi_HNM.Count() > 0)
+            if (semi_HNM.Count > 0)
             {
                 listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("哈倪蔓基料", semi_HNM.Sum(a => a.amount_purchase), semi_HNM.Sum(a => a.count_purchase), semi_HNM.Sum(a => a.amount_shipping), semi_HNM.Sum(a => a.count_shipping), (semi_HNM.Sum(a => a.amount_shipping) - semi_HNM.Sum(a => a.amount_purchase)), (semi_HNM.Sum(a => a.count_shipping) - semi_HNM.Sum(a => a.count_purchase))));
             }
@@ -804,7 +804,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             }
 
 
-            if (finish_Gen.Count() > 0)
+            if (finish_Gen.Count > 0)
             {
                 listSubCount1.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("普货", finish_Gen.Sum(a => a.amount_purchase), finish_Gen.Sum(a => a.count_purchase), finish_Gen.Sum(a => a.amount_shipping), finish_Gen.Sum(a => a.count_shipping), (finish_Gen.Sum(a => a.amount_shipping) - finish_Gen.Sum(a => a.amount_purchase)), (finish_Gen.Sum(a => a.count_shipping) - finish_Gen.Sum(a => a.count_purchase))));
                 
@@ -815,7 +815,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 
             }
 
-            if (finish_Manicure.Count() > 0)
+            if (finish_Manicure.Count > 0)
             {
                 listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美甲生产", finish_Manicure.Sum(a => a.amount_purchase), finish_Manicure.Sum(a => a.count_purchase), finish_Manicure.Sum(a => a.amount_shipping), finish_Manicure.Sum(a => a.count_shipping), (finish_Manicure.Sum(a => a.amount_shipping) - finish_Manicure.Sum(a => a.amount_purchase)), (finish_Manicure.Sum(a => a.count_shipping) - finish_Manicure.Sum(a => a.count_purchase))));
             }
@@ -824,7 +824,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美甲生产", 0, 0, 0, 0,0,0));
             }
 
-            if (finish_E_Oil.Count() > 0)
+            if (finish_E_Oil.Count > 0)
             {
                 listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("精油生产", finish_E_Oil.Sum(a => a.amount_purchase), finish_E_Oil.Sum(a => a.count_purchase), finish_E_Oil.Sum(a => a.amount_shipping), finish_E_Oil.Sum(a => a.count_shipping), (finish_E_Oil.Sum(a => a.amount_shipping) - finish_E_Oil.Sum(a => a.amount_purchase)), (finish_E_Oil.Sum(a => a.count_shipping) - finish_E_Oil.Sum(a => a.count_purchase))));
             }
@@ -833,7 +833,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("精油生产", 0, 0, 0, 0,0,0));
             }
 
-            if (finish_Hairdressing.Count() > 0)
+            if (finish_Hairdressing.Count > 0)
             {
                 listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美容生产", finish_Hairdressing.Sum(a => a.amount_purchase), finish_Hairdressing.Sum(a => a.count_purchase), finish_Hairdressing.Sum(a => a.amount_shipping), finish_Hairdressing.Sum(a => a.count_shipping), (finish_Hairdressing.Sum(a => a.amount_shipping) - finish_Hairdressing.Sum(a => a.amount_purchase)), (finish_Hairdressing.Sum(a => a.count_shipping) - finish_Hairdressing.Sum(a => a.count_purchase))));
             }
@@ -842,7 +842,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("美容生产", 0, 0, 0, 0,0,0));
             }
 
-            if (finish_Gen.Count() > 0)
+            if (finish_Gen.Count > 0)
             {
                 listSubCount2.Add(new Tuple<string, decimal, decimal, decimal, decimal,decimal,decimal>("普货", finish_Gen.Sum(a => a.amount_purchase), finish_Gen.Sum(a => a.count_purchase), finish_Gen.Sum(a => a.amount_shipping), finish_Gen.Sum(a => a.count_shipping), (finish_Gen.Sum(a => a.amount_shipping) - finish_Gen.Sum(a => a.amount_purchase)), (finish_Gen.Sum(a => a.count_shipping) - finish_Gen.Sum(a => a.count_purchase))));
             }