增加时间筛选和查看历史sku明细

Bailun.DC.Services/WareHouseServices.cs

@@ -215,15 +215,20 @@ namespace Bailun.DC.Services
         /// <param name="total">符合条件的总记录数</param>
         /// <param name="onedaysalescount">昨日销量，0：0销量，1：0-1销量，2：1-5销量，5：5-10销量，10：大于10的销量</param>
         /// <returns></returns>
-        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,int? available_days_start,int? available_days_end, ref int total,int? onedaysalescount=null)
+        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,int? available_days_start,int? available_days_end, ref int total,DateTime? day,int? onedaysalescount=null)
         {
             var sqlparam = new DynamicParameters();
             //available_days
             var sql = @"select t1.*,t2.category_name,t2.sku_image,t2.sku_title_cn,t2.sku_title_en ";
 
-            var sqlwhere = @" from dc_skuwarehouse_stock_sales t1
-                                         left join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku
-                                        ";
+            var sqlwhere = @" from dc_skuwarehouse_stock_sales t1 ";
+
+            if(day.HasValue)
+            {
+                sqlwhere = @" from dc_skuwarehouse_stock_sales_daily t1 ";
+            }
+
+            sqlwhere += " left join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku ";
 
             if (!string.IsNullOrWhiteSpace(skucategoryids))
             {
@@ -310,6 +315,11 @@ namespace Bailun.DC.Services
                 sqlwhere += " and t1.available_days<"+available_days_end.Value;
             }
 
+            if(day.HasValue)
+            {
+                sqlwhere += " and t1.day='"+day.Value.ToString("yyyy-MM-dd")+"' ";
+            }
+
             if(onedaysalescount.HasValue && onedaysalescount.Value>=0)
             {
                 //sqlwhere += " and t1.oneday_total_sales";
@@ -385,15 +395,19 @@ namespace Bailun.DC.Services
         /// <param name="total">符合条件的总记录数</param>
         /// <param name="onedaysalescount">昨日销量，0：0销量，1：0-1销量，2：1-5销量，5：5-10销量，10：大于10的销量</param>
         /// <returns></returns>
-        public Models.Stock.mSkuWarehouse ListWareHouseSkuCount(string warehousecode, int? categoryid, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax, string skucategoryids, int? push_status, int? available_days_start, int? available_days_end,int? onedaysalescount = null)
+        public Models.Stock.mSkuWarehouse ListWareHouseSkuCount(string warehousecode, int? categoryid, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax, string skucategoryids, int? push_status, int? available_days_start, int? available_days_end,DateTime? day,int? onedaysalescount = null)
         {
             var sqlparam = new DynamicParameters();
             //available_days
             var sql = @"select sum(t1.amount_onedaysale) as amount_onedaysale,sum(t1.amount_stock) as amount_stock,sum(t1.amount_transit) as amount_transit,sum(t1.noshippingcount) as noshippingcount,sum(nostockcount) as nostockcount,sum(oneday_total_sales) oneday_total_sales,sum(purchase_amount) purchase_amount,sum(quantity_purchase) quantity_purchase,sum(quantity_transfer) quantity_transfer,sum(sevenday_total_sales) sevenday_total_sales,sum(thirtyday_total_sales) thirtyday_total_sales,sum(usable_stock) usable_stock,sum(quantity_tuneout_onway) quantity_tuneout_onway,sum(quantity_tuneout_30days) quantity_tuneout_30days,sum(quantity_tunein_30days) quantity_tunein_30days,sum(fourteenday_total_sales) fourteenday_total_sales,sum(cash_in_30days) cash_in_30days,sum(cash_out_30days) cash_out_30days,sum(cash_net) cash_net,sum(pin_rate_stock) pin_rate_stock,sum(amount_tunein_30days) amount_tunein_30days,sum(amount_tuneout_30days) amount_tuneout_30days,sum(sevenday_total_sales_amount) sevenday_total_sales_amount,sum(fourteenday_total_sales_amount) fourteenday_total_sales_amount,sum(thirtyday_total_sales_amount) thirtyday_total_sales_amount ";
 
-            var sqlwhere = @" from dc_skuwarehouse_stock_sales t1
-                                         left join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku
-                                        ";
+            var sqlwhere = @" from dc_skuwarehouse_stock_sales t1 ";
+            if (day.HasValue)
+            {
+                sqlwhere = @" from dc_skuwarehouse_stock_sales_daily t1 ";
+            }
+
+            sqlwhere += " left join dc_base_sku t2 on t1.bailun_sku = t2.bailun_sku ";
 
             if (!string.IsNullOrWhiteSpace(skucategoryids))
             {
@@ -480,6 +494,11 @@ namespace Bailun.DC.Services
                 sqlwhere += " and t1.available_days<" + available_days_end.Value;
             }
 
+            if (day.HasValue)
+            {
+                sqlwhere += " and t1.day='" + day.Value.ToString("yyyy-MM-dd") + "' ";
+            }
+
             if (onedaysalescount.HasValue && onedaysalescount.Value >= 0)
             {
                 //sqlwhere += " and t1.oneday_total_sales";

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

@@ -220,7 +220,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// </summary>
         /// <param name="code">仓库编码</param>
         /// <returns></returns>
-        public ActionResult ListWareHouseSku(string code, string available_days, int? onedaysalescount)
+        public ActionResult ListWareHouseSku(string code, string available_days, int? onedaysalescount,DateTime? day)
         {
             ViewBag.warehousecode = code;
             ViewBag.available_days = available_days;
@@ -235,6 +235,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             ViewBag.onedaysalescount = onedaysalescount;
 
+            ViewBag.day = day.HasValue ? day.Value.ToString("yyyy-MM-dd") : "";
+
             return View();
         }
 
@@ -251,8 +253,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="stockamountmin">库存金额 最小值</param>
         /// <param name="stockamountmax">库存金额 最大值</param>
         /// <param name="onedaysalescount">昨日销量，0：0销量，1：0-1销量，2：1-5销量，5：5-10销量，10：大于10的销量</param>
+        /// <param name="day">统计日期</param>
         /// <returns></returns>
-        public string ListWareHouseSkuJson(BtTableParameter parameter, string warehousecode, int? push_status, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax, string skucategoryids, string available_days, int? onedaysalescount)
+        public string ListWareHouseSkuJson(BtTableParameter parameter, string warehousecode, int? push_status, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax, string skucategoryids, string available_days, int? onedaysalescount,DateTime? day)
         {
             var total = 0;
 
@@ -280,9 +283,9 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             var _service = new Services.WareHouseServices();
 
-            var obj = _service.ListWareHouseSku(parameter, warehousecode, null, minordercount, maxordercount, stockmin, stockmax, stockamountmin, stockamountmax, skucategoryids, push_status, available_days_start, available_days_end, ref total, onedaysalescount);
+            var obj = _service.ListWareHouseSku(parameter, warehousecode, null, minordercount, maxordercount, stockmin, stockmax, stockamountmin, stockamountmax, skucategoryids, push_status, available_days_start, available_days_end, ref total,day,onedaysalescount);
 
-            var objCount = _service.ListWareHouseSkuCount(warehousecode, null, minordercount, maxordercount, stockmin, stockmax, stockamountmin, stockamountmax, skucategoryids, push_status, available_days_start, available_days_end, onedaysalescount);
+            var objCount = _service.ListWareHouseSkuCount(warehousecode, null, minordercount, maxordercount, stockmin, stockmax, stockamountmin, stockamountmax, skucategoryids, push_status, available_days_start, available_days_end,day, onedaysalescount);
 
             var list = obj.Select(p => new
             {
@@ -368,7 +371,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             });
         }
 
-        public ActionResult ExportWareHouseSku(string code, int? push_status, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax, string skucategoryids, string available_days, int? onedaysalescount)
+        public ActionResult ExportWareHouseSku(string code, int? push_status, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax, string skucategoryids, string available_days, int? onedaysalescount,DateTime? day)
         {
             var total = 0;
             int? available_days_start = null;
@@ -392,7 +395,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                     }
                 }
             }
-            var obj = new Services.WareHouseServices().ListWareHouseSku(new BtTableParameter { offset = 0, limit = 0 }, code, null, minordercount, maxordercount, stockmin, stockmax, stockamountmin, stockamountmax, skucategoryids, push_status, available_days_start, available_days_end, ref total, onedaysalescount);
+            var obj = new Services.WareHouseServices().ListWareHouseSku(new BtTableParameter { offset = 0, limit = 0 }, code, null, minordercount, maxordercount, stockmin, stockmax, stockamountmin, stockamountmax, skucategoryids, push_status, available_days_start, available_days_end, ref total,day, onedaysalescount);
 
             var colNames = new List<string>() { "仓库名称","Sku","推送产品库","分类名称","英文标题"
                 ,"库存数量","库存金额","采购在途数量","采购在途金额","调拨在途数量"
@@ -1816,14 +1819,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="warehousecode"></param>
         /// <returns></returns>
         [ServiceFabric.Authorize.BailunAuthentication(LoginMode.Enforce)]
-        public string InventorySummaryJson(BtTableParameter parameter, string warehousetype, string warehousecode)
+        public string InventorySummaryJson(BtTableParameter parameter, string warehousetype, string warehousecode,DateTime day)
         {
             var total = 0;
             var _service = new Services.WareHouseServices();
 
-            var obj = _service.ListInventorySummary(parameter, warehousetype, warehousecode, DateTime.Now.AddDays(-1), ref total);
+            var obj = _service.ListInventorySummary(parameter, warehousetype, warehousecode, day, ref total);
 
-            var objCount = _service.ListInventorySummaryCount(warehousetype, warehousecode, DateTime.Now.AddDays(-1));
+            var objCount = _service.ListInventorySummaryCount(warehousetype, warehousecode, day);
 
             var list = obj.Select(a => new
             {
@@ -1895,12 +1898,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             });
         }
 
-        public ActionResult ExportInventorySummary(string warehousetype, string warehousecode) {
+        public ActionResult ExportInventorySummary(string warehousetype, string warehousecode,DateTime day) {
 
             var total = 0;
             var _service = new Services.WareHouseServices();
 
-            var obj = _service.ListInventorySummary(new BtTableParameter { limit=0,offset=0}, warehousetype, warehousecode, DateTime.Now.AddDays(-1), ref total);
+            var obj = _service.ListInventorySummary(new BtTableParameter { limit=0,offset=0}, warehousetype, warehousecode, day, ref total);
 
             var list = obj.Select(a => new
             {
@@ -1980,12 +1983,14 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="warehousename">仓库名称</param>
         /// <param name="key">显示的字段</param>
         /// <returns></returns>
-        public ActionResult InventorySummaryChart(string warehousecode,string warehousename,string key,string title)
+        public ActionResult InventorySummaryChart(string warehousecode,string warehousename,string key,string title,DateTime? day)
         {
             ViewBag.warehousecode = warehousecode;
             ViewBag.warehousename = warehousename;
             ViewBag.key = key;
             ViewBag.title = title;
+            ViewBag.end = day.HasValue ? day.Value.ToString("yyyy-MM-dd") : "";
+            ViewBag.start = day.HasValue ? day.Value.AddDays(-30).ToString("yyyy-MM-dd") : "";
 
             return View();
         }
@@ -1996,11 +2001,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <returns></returns>
         [ServiceFabric.Authorize.BailunAuthentication(LoginMode.Enforce)]
         [HttpPost]
-        public JsonResult InventorySummaryChartJson(string warehousecode,string key)
+        public JsonResult InventorySummaryChartJson(string warehousecode,string key,DateTime start,DateTime end)
         {
             var _services = new Services.WareHouseServices();
 
-            var obj = _services.InventorySummaryChart(warehousecode, DateTime.Now.AddDays(-30), DateTime.Now.AddDays(-1), key);
+            var obj = _services.InventorySummaryChart(warehousecode, start, end, key);
 
             var listval = new List<string>();
             var listdate = new List<string>();

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

@@ -30,6 +30,11 @@
                         </select>
                     </div>
                     <div class="form-group">
+                        <label>日期</label>
+                        <input id="day" name="day" type="text" class="form-control" style="width:130px;" value="@(DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"))" />
+                    </div>
+                    
+                    <div class="form-group">
                         <label>&nbsp;</label>
                         <button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
                         <button id="btnexport" type="button" class="btn btn-success" onclick="exportxls()">导出</button>
@@ -60,6 +65,7 @@
         $(document).ready(function () {
             var height = document.body.clientHeight;
             $("#roletable").attr("data-height", (height - 160));
+            laydate.render({ elem: '#day' });
 
             list();
 
@@ -72,6 +78,13 @@
         })
 
         function list() {
+
+            var day = $('#day').val();
+            if (day == '') {
+                alert('请选择日期');
+                return;
+            }
+
             var columns = [
                 {
                     field: 'warehousetype', title: '仓库类型', width: '100', formatter: function (idx, data) {
@@ -257,16 +270,30 @@
 
         //导出
         function exportxls() {
+            var day = $('#day').val();
+            if (day == '') {
+                alert('请选择日期');
+                return;
+            }
+
             window.open('@Url.Content("~/Reports/Warehouse/ExportInventorySummary?")' + $("#toolbar").serialize(), '_blank');
         }
 
         function SkuDetail(code,name, type,typename) {
 
+            var day = $('#day').val();
+            if (day == '') {
+                alert('请选择日期');
+                return;
+            }
+
             var _url = '@Url.Content("~/Reports/Warehouse/ListWareHouseSku?code=")'+code;
             if (type != undefined) {
                 _url += '&onedaysalescount=' + type;
             }
 
+            _url += '&day='+day;
+
             layer_show('【' + name + (type != undefined ? '-' + typename:'') + '】仓库SKU明细', _url, '90%', '90%');
         }
 
@@ -275,7 +302,17 @@
                 code = '';
             }
 
-            layer_show(name + "=》" + title + '的趋势图', '@Url.Content("~/Reports/Warehouse/InventorySummaryChart?warehousecode=")' + code + '&warehousename=' + name + '&key=' + key + '&title=' + title,'90%','90%');
+            var day = $('#day').val();
+            if (day == '') {
+                alert('请选择日期');
+                return;
+            }
+
+            var _url = '@Url.Content("~/Reports/Warehouse/InventorySummaryChart?warehousecode=")' + code + '&warehousename=' + name + '&key=' + key + '&title=' + title;
+
+            _url += '&day=' + day;
+
+            layer_show(name + "=》" + title + '的趋势图', _url , '90%', '90%');
         }
 
     </script>

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

@@ -7,11 +7,11 @@
 
 <div class="row">
     <div class="col-sm-12">
-        @*<div class="ibox-content m-b-sm border-bottom">
+        <div class="ibox-content m-b-sm border-bottom">
             <form id="toolbar">
                 <div class="form-inline" style="line-height:40px;">
                     <div class="form-group">
-                        <label>日期：</label>
+                        <label>统计日期：</label>
                         <input id="start" name="start" class="form-control" value="@(ViewBag.start)" placeholder="请选择开始日期" />至
                         <input id="end" name="end" class="form-control" value="@(ViewBag.end)" placeholder="请选择结束日期" />
                     </div>
@@ -21,7 +21,7 @@
                     </div>
                 </div>
             </form>
-        </div>*@
+        </div>
         <div class="ibox-content m-b-sm border-bottom">
             <div id="echart-contain" style="width:100%;height:480px;">
 
@@ -38,10 +38,22 @@
         })
 
         function getData() {
+            var start = $('#start').val();
+            var end = $('#end').val();
+
+            if (start == "") {
+                alert("请选择开始日期");
+                return;
+            }
+            if (end == "") {
+                alert("请选择结束日期");
+                return;
+            }
+
             $.submit({
                 type:'POST',
                 url: '@Url.Content("~/Reports/Warehouse/InventorySummaryChartJson")',
-                paramData: 'warehousecode=@(ViewBag.warehousecode)&key=@(ViewBag.key)',
+                paramData: 'warehousecode=@(ViewBag.warehousecode)&key=@(ViewBag.key)&start='+start+'&end='+end,
                 func: function (result) {
                     if (result) {
                         showChart('@Html.Raw(ViewBag.warehousename)', result.dates, result.val);

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

@@ -75,6 +75,10 @@
                                 </select>
                             </div>
                             <div class="form-group">
+                                <label>日期</label>
+                                <input id="day" name="day" type="text" class="form-control" style="width:130px;" value="@(ViewBag.day)" placeholder="统计日期" />
+                            </div>
+                            <div class="form-group">
                                 <label>&nbsp;</label>
                                 <button type="button" class="btn btn-primary" onclick="list();"><i class="fa fa-search"></i>&nbsp;查询</button>
                                 <button type="button" class="btn btn-warning" onclick="exportlist()">导出</button>
@@ -113,7 +117,7 @@
         $(document).ready(function () {
             var height = document.body.clientHeight;
             $("#roletable").attr("data-height", (height - 160));
-
+            laydate.render({ elem: '#day' });
             if ('@(ViewBag.available_days)' != '') {
                 $('#available_days').val('@(ViewBag.available_days)');
             }