调整每日销进比报表

Bailun.DC.Services/WareHouseServices.cs

@@ -1056,11 +1056,11 @@ namespace Bailun.DC.Services
         {
             var sqlparam = new DynamicParameters();
 
-            var sql = $@"select t1.day,t1.warehouse_name as category_simple_name,sum(t1.amount_purchase) amount_purchase,sum(t1.count_purchase) count_purchase,sum(t1.amount_sales) amount_sales,sum(t1.count_sales) count_sales from dc_daily_purchase_sales t1 
+            var sql = $@"select t1.warehouse_name as category_simple_name,sum(t1.count_sales) count_sales,sum(t1.amount_sales) amount_sales,sum(t1.count_purchase) count_purchase,sum(t1.amount_purchase) amount_purchase,sum(count_putin) count_putin,sum(amount_putin) amount_putin,sum(count_shipping) count_shipping,sum(t1.amount_shipping) amount_shipping from dc_daily_purchase_sales t1 
                         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.day,t1.warehouse_code";
+            sql += " group by t1.warehouse_code";
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {
                 if (cn.State == System.Data.ConnectionState.Closed)

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

@@ -761,7 +761,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             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 finish_Gen = obj.Where(a => a.category_simple_name == "普货");  //普货
+            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 == "美容");  //美容生产
@@ -769,7 +769,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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_sales), semi_E_Oil.Sum(a => a.count_sales),(semi_E_Oil.Sum(a => a.amount_sales)- semi_E_Oil.Sum(a => a.amount_purchase)),(semi_E_Oil.Sum(a => a.count_sales) - semi_E_Oil.Sum(a => a.count_purchase))));
+                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))));
             }
             else
             {
@@ -778,7 +778,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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_sales), semi_Hairdressing.Sum(a => a.count_sales), (semi_Hairdressing.Sum(a => a.amount_sales) - semi_Hairdressing.Sum(a => a.amount_purchase)), (semi_Hairdressing.Sum(a => a.count_sales) - semi_Hairdressing.Sum(a => a.count_purchase))));
+                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))));
             }
             else
             {
@@ -787,7 +787,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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_sales), semi_Manicure.Sum(a => a.count_sales), (semi_Manicure.Sum(a => a.amount_sales) - semi_Manicure.Sum(a => a.amount_purchase)), (semi_Manicure.Sum(a => a.count_sales) - semi_Manicure.Sum(a => a.count_purchase))));
+                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))));
             }
             else
             {
@@ -796,7 +796,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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_sales), semi_HNM.Sum(a => a.count_sales), (semi_HNM.Sum(a => a.amount_sales) - semi_HNM.Sum(a => a.amount_purchase)), (semi_HNM.Sum(a => a.count_sales) - semi_HNM.Sum(a => a.count_purchase))));
+                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))));
             }
             else
             {
@@ -806,7 +806,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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_sales), finish_Gen.Sum(a => a.count_sales), (finish_Gen.Sum(a => a.amount_sales) - finish_Gen.Sum(a => a.amount_purchase)), (finish_Gen.Sum(a => a.count_sales) - finish_Gen.Sum(a => a.count_purchase))));
+                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))));
                 
             }
             else
@@ -817,7 +817,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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_sales), finish_Manicure.Sum(a => a.count_sales), (finish_Manicure.Sum(a => a.amount_sales) - finish_Manicure.Sum(a => a.amount_purchase)), (finish_Manicure.Sum(a => a.count_sales) - finish_Manicure.Sum(a => a.count_purchase))));
+                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))));
             }
             else
             {
@@ -826,7 +826,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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_sales), finish_E_Oil.Sum(a => a.count_sales), (finish_E_Oil.Sum(a => a.amount_sales) - finish_E_Oil.Sum(a => a.amount_purchase)), (finish_E_Oil.Sum(a => a.count_sales) - finish_E_Oil.Sum(a => a.count_purchase))));
+                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))));
             }
             else
             {
@@ -835,7 +835,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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_sales), finish_Hairdressing.Sum(a => a.count_sales), (finish_Hairdressing.Sum(a => a.amount_sales) - finish_Hairdressing.Sum(a => a.amount_purchase)), (finish_Hairdressing.Sum(a => a.count_sales) - finish_Hairdressing.Sum(a => a.count_purchase))));
+                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))));
             }
             else
             {
@@ -844,7 +844,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             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_sales), finish_Gen.Sum(a => a.count_sales), (finish_Gen.Sum(a => a.amount_sales) - finish_Gen.Sum(a => a.amount_purchase)), (finish_Gen.Sum(a => a.count_sales) - finish_Gen.Sum(a => a.count_purchase))));
+                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))));
             }
             else
             {

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

@@ -68,8 +68,8 @@
                         <td>外采类型</td>
                         <td>采购金额</td>
                         <td>采购数量</td>
-                        <td>销售成本</td>
-                        <td>销售数量</td>
+                        <td>发货成本</td>
+                        <td>发货数量</td>
                         <td>差异金额</td>
                         <td>差异数量</td>
                     </tr>
@@ -83,8 +83,8 @@
                         <td>生产下单类型</td>
                         <td>采购金额</td>
                         <td>采购数量</td>
-                        <td>销售成本</td>
-                        <td>销售数量</td>
+                        <td>发货成本</td>
+                        <td>发货数量</td>
                         <td>差异金额</td>
                         <td>差异数量</td>
                     </tr>