更新每日销进比报表

Bailun.DC.Services/WareHouseServices.cs

@@ -862,17 +862,21 @@ namespace Bailun.DC.Services
         /// <returns></returns>
         public List<dc_daily_purchase_sales> ListDailyPurchaseSale(BtTableParameter parameter, DateTime start, DateTime end,ref int total)
         {
-            var sql = $"select t1.* 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.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 = $" where t1.day='{end.ToString("yyyy-MM-dd")}'";
+            var sqlwhere = $" where t1.day>='{start.ToString("yyyy-MM-dd")}' and t1.day<'{end.AddDays(1).ToString("yyyy-MM-dd")}' group by t1.warehouse_code,t1.bailun_sku";
+            
+
+            sql += sqlwhere;
+
+            sql = "select t01.*,t03.stock_end,t03.stockamount_end,t02.stockamount_start,t02.stock_start from (" + sql + ") t01 left join dc_daily_purchase_sales t02 on t01.warehouse_code=t02.warehouse_code and t01.bailun_sku=t02.bailun_sku and t02.day='"+start.ToString("yyyy-MM-dd")+"'";
+            sql += " left join dc_daily_purchase_sales t03 on t01.warehouse_code=t03.warehouse_code and t01.bailun_sku=t03.bailun_sku and t03.day='" + end.ToString("yyyy-MM-dd") + "'";
 
             if (!string.IsNullOrEmpty(parameter.sort))
             {
-                sql += " order by t1."+parameter.sort+" "+parameter.order;
+                sql += " order by t01." + parameter.sort + " " + parameter.order;
             }
 
-
-            sql += sqlwhere;
             sql += " limit "+(parameter.pageIndex-1)*parameter.limit+","+parameter.limit;
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {
@@ -899,7 +903,7 @@ namespace Bailun.DC.Services
         {
             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 sqlwhere = $" where t1.day='{end.ToString("yyyy-MM-dd")}'";
+            var sqlwhere = $" where  t1.day>='{start.ToString("yyyy-MM-dd")}' and t1.day<'{end.AddDays(1).ToString("yyyy-MM-dd")}'";
             
             using (var cn = new MySqlConnection(Common.GlobalConfig.ConnectionString))
             {

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

@@ -79,8 +79,8 @@
                 { field: 'stockamount_start', title: '期初库存金额', width: '130' },
                 { field: 'count_purchase', title: '采购(入库)数', width: '130', sortable: true, iscount: true },
                 { field: 'amount_purchase', title: '采购(入库)金额', width: '130', sortable: true, iscount: true },
-                { field: 'count_sales', title: '销售数', width: '100', sortable: true, iscount: true },
-                { field: 'amount_sales', title: '销售金额', width: '120', sortable: true, iscount: true },
+                { field: 'count_sales', title: '销售(发货)数', width: '130', sortable: true, iscount: true },
+                { field: 'amount_sales', title: '销售(发货)金额', width: '130', sortable: true, iscount: true },
                 { field: 'diff_count', title: '差异数', width: '100', sortable: true, iscount: true },
                 { field: 'diff_amount', title: '差异金额', width: '110', sortable: true, iscount: true },
                 { field: 'stock_end', title: '期末库存', width: '100', sortable: true, iscount: true },