调整每日销进比报表

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/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>