1、逻辑仓库趋势图增加日期筛选功能

2、逻辑仓库SKU明细增加可用天数字段

Bailun.DC.Models/Stock/mSkuWarehouse.cs

@@ -145,5 +145,10 @@ namespace Bailun.DC.Models.Stock
         /// 动销率，动销率=过去一个月卖出的SKU/SKU的库存金额
         /// </summary>
         public decimal? pin_rate_stock { get; set; }
+
+        /// <summary>
+        /// 可销售天数
+        /// </summary>
+        public int available_days { get; set; }
     }
 }

Bailun.DC.Services/WareHouseServices.cs

@@ -217,11 +217,14 @@ namespace Bailun.DC.Services
         public List<Models.Stock.mSkuWarehouse> ListWareHouseSku(BtTableParameter parameter, string warehousecode, int? categoryid, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax, string skucategoryids,int? push_status, ref int total)
         {
             var sqlparam = new DynamicParameters();
-
-            var sql = @"select t1.*,t2.category_name,t2.sku_image,t2.sku_title_cn,t2.sku_title_en  ";
+            //available_days
+            var sql = @"select t1.*,t2.category_name,t2.sku_image,t2.sku_title_cn,t2.sku_title_en,(case when t3.available_days is null then t4.available_days else t3.available_days end) available_days ";
 
             var sqlwhere = @" from dc_skuwarehouse_stock_sales t1
-                                         join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku ";
+                                         left join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku
+                                         left join dc_base_stock t3 on t1.bailun_sku=t3.bailun_sku and t1.warehouse_code=t3.warehouse_code 
+                                         left join dc_semi_stock_sales_shipping t4 on t1.bailun_sku=t4.sku and t1.warehouse_code=t4.warehouse_id
+                                        ";
 
             if (!string.IsNullOrWhiteSpace(skucategoryids))
             {

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

@@ -246,8 +246,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 cash_in_30days = (p.cash_in_30days ?? 0).ToString("N2"),
                 cash_out_30days = (p.cash_out_30days ?? 0).ToString("N2"),
                 cash_net = (p.cash_net ?? 0).ToString("N2"),
-                pin_rate_stock = ((p.pin_rate_stock??0) * 100).ToString("N2")
-
+                pin_rate_stock = ((p.pin_rate_stock??0) * 100).ToString("N2"),
+                p.available_days,
+                
             });
 
             return JsonConvert.SerializeObject(new { total = total, rows = list });

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

@@ -186,7 +186,8 @@
                 { field: 'cash_in_30days', title: '30天现金流收入', width: '130', sortable: true, iscount: true },
                 { field: 'cash_out_30days', title: '30天现金流支出', width: '130', sortable: true, iscount: true },
                 { field: 'cash_net', title: '净值(30d)', width: '130', sortable: true, iscount: true },
-                { field: 'pin_rate_stock', title: '动销率%(30d)', width: '120', sortable: true, iscount: true }
+                { field: 'pin_rate_stock', title: '动销率%(30d)', width: '120', sortable: true, iscount: true },
+                { field: 'available_days', title:'可销售天数',width:'110'}
             ];
 
             var s = '';

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

@@ -44,8 +44,7 @@
                 alert('请选择日期');
                 return;
             }
-
-
+            
             $.submit({
                 type:'POST',
                 url: '@Url.Content("~/Reports/Warehouse/WarehouseTrendChartJson")',