修复发货维度发货明细不对的问题

Bailun.DC.Services/WareHouseServices.cs

@@ -864,7 +864,7 @@ namespace Bailun.DC.Services
         public List<dc_daily_purchase_sales> ListDailyPurchaseSale(BtTableParameter parameter,string warehousetype , string warehouse_code, DateTime start, DateTime end,string skucategoryids,int isfinish, ref int total)
         {
             var sqlparam = new DynamicParameters();
-            var sql = $"select max(t1.day) day,t1.warehouse_code,t1.bailun_sku,t1.warehouse_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(t1.count_putin) count_putin,sum(t1.amount_putin) amount_putin,sum(t1.difference_count) difference_count,sum(t1.difference_amount) difference_amount,sum(t1.diff_putin_count) diff_putin_count,sum(t1.diff_putin_amount) diff_putin_amount from dc_daily_purchase_sales t1 ";
+            var sql = $"select max(t1.day) day,t1.warehouse_code,t1.bailun_sku,t1.warehouse_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(t1.count_putin) count_putin,sum(t1.amount_putin) amount_putin,sum(t1.count_shipping) count_shipping,sum(t1.amount_shipping) amount_shipping,sum(t1.difference_count) difference_count,sum(t1.difference_amount) difference_amount,sum(t1.diff_putin_count) diff_putin_count,sum(t1.diff_putin_amount) diff_putin_amount from dc_daily_purchase_sales t1 ";
 
             var sqlwhere = "";
             if (!string.IsNullOrEmpty(warehousetype))
@@ -928,7 +928,7 @@ namespace Bailun.DC.Services
         public dc_daily_purchase_sales ListDailyPurchaseSaleCount(string warehousetype, string warehouse_code,DateTime start, DateTime end, string skucategoryids,int isfinish)
         {
             var sqlparam = new DynamicParameters();
-            var sql = $"select sum(stock_start) stock_start,sum(stockamount_start) stockamount_start,sum(stock_end) stock_end,sum(stockamount_end) stockamount_end,sum(count_sales) count_sales,sum(amount_sales) amount_sales,sum(count_purchase) count_purchase,sum(amount_purchase) amount_purchase,sum(count_putin) count_putin,sum(amount_putin) amount_putin,sum(difference_count) difference_count,sum(difference_amount) difference_amount,sum(diff_putin_count) diff_putin_count,sum(diff_putin_amount) diff_putin_amount from dc_daily_purchase_sales t1 ";
+            var sql = $"select sum(stock_start) stock_start,sum(stockamount_start) stockamount_start,sum(stock_end) stock_end,sum(stockamount_end) stockamount_end,sum(count_sales) count_sales,sum(amount_sales) amount_sales,sum(count_purchase) count_purchase,sum(amount_purchase) amount_purchase,sum(count_putin) count_putin,sum(amount_putin) amount_putin,sum(t1.count_shipping) count_shipping,sum(t1.amount_shipping) amount_shipping,sum(difference_count) difference_count,sum(difference_amount) difference_amount,sum(diff_putin_count) diff_putin_count,sum(diff_putin_amount) diff_putin_amount from dc_daily_purchase_sales t1 ";
 
             if (!string.IsNullOrEmpty(warehousetype))
             {

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

@@ -580,12 +580,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 day = a.day.ToString("yyyy-MM-dd"),
                 //amount_purchase = a.amount_purchase.ToString("N2"),
                 //amount_putin = a.amount_putin.ToString("N2"),
-                amount_sales = a.amount_sales.ToString("N2"),
+                amount_sales = (t==1?a.amount_sales:a.amount_shipping).ToString("N2"),
                 a.bailun_sku,
 
                 //a.count_purchase,
                 //a.count_putin,
-                a.count_sales,
+                count_sales = (t==1? a.count_sales:a.count_shipping),
                 
                 stockamount_end = a.stockamount_end.ToString("N2"),
                 stockamount_start = a.stockamount_start.ToString("N2"),