逻辑仓库的仓库维度和SKU维度都加上销量跳转到oms的订单明细

Bailun.DC.Models/Stock/mLogicWarehouse.cs

@@ -6,6 +6,8 @@ namespace Bailun.DC.Models.Stock
 {
     public class mLogicWarehouse
     {
+        public string hq_type { get; set; }
+
         /// <summary>
         /// 仓库编码
         /// </summary>

Bailun.DC.Models/Stock/mSkuWarehouse.cs

@@ -7,6 +7,11 @@ namespace Bailun.DC.Models.Stock
     public class mSkuWarehouse
     {
         /// <summary>
+        /// 仓库类型
+        /// </summary>
+        public string hq_type { get; set; }
+
+        /// <summary>
         /// 仓库编码
         /// </summary>
         public string warehouse_code { get; set; }

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

@@ -35,11 +35,11 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <returns></returns>
         public ActionResult LogicWarehouse()
         {
-            ViewBag.EndDate = DateTime.Parse(DateTime.Now.ToString("yyyy-MM-dd")).AddSeconds(-1).ToString("yyyy-MM-dd HH:mm:ss");
-            ViewBag.StartOneDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd");
-            ViewBag.StartSevenDate = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd");
-            ViewBag.StartFourteenDate = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd");
-            ViewBag.StartThirtyDate = DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd");
+            ViewBag.EndDate = DateTime.Now.ToString("yyyy-MM-dd")+" 00:00:00";
+            ViewBag.StartOneDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + " 00:00:00";
+            ViewBag.StartSevenDate = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd") + " 00:00:00";
+            ViewBag.StartFourteenDate = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd") + " 00:00:00";
+            ViewBag.StartThirtyDate = DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd") + " 00:00:00";
 
 
             return View();
@@ -88,6 +88,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 usable_stock = p.usable_stock.ToString("N0"),
                 p.warehouse_code,
                 p.warehouse_name,
+                p.hq_type,
                 quantity_tuneout_onway = (p.quantity_tuneout_onway??0).ToString("N0"),
                 quantity_tuneout_30days = (p.quantity_tuneout_30days??0).ToString("N0"),
                 quantity_tunein_30days = (p.quantity_tunein_30days??0).ToString("N0"),
@@ -204,6 +205,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             ViewBag.listWarehouse = new Services.WareHouseServices().List("", null).OrderBy(a => a.warehouse_name).ToList();
 
+            ViewBag.EndDate = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
+            ViewBag.StartOneDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd") + " 00:00:00";
+            ViewBag.StartSevenDate = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd") + " 00:00:00";
+            ViewBag.StartFourteenDate = DateTime.Now.AddDays(-14).ToString("yyyy-MM-dd") + " 00:00:00";
+            ViewBag.StartThirtyDate = DateTime.Now.AddDays(-30).ToString("yyyy-MM-dd") + " 00:00:00";
+
             return View();
         }
 
@@ -273,6 +280,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 quantity_tuneout_onway = p.quantity_tuneout_onway??0,
                 quantity_tuneout_30days = p.quantity_tuneout_30days,
                 quantity_tunein_30days = (p.quantity_tunein_30days??0),
+                fourteenday_total_sales = (p.fourteenday_total_sales??0),
 
                 cash_in_30days = (p.cash_in_30days ?? 0).ToString("N2"),
                 cash_out_30days = (p.cash_out_30days ?? 0).ToString("N2"),
@@ -280,6 +288,8 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 pin_rate_stock = ((p.pin_rate_stock??0) * 100).ToString("N2"),
                 p.available_days,
 
+                p.hq_type,
+                
             });
 
             return JsonConvert.SerializeObject(new { total = total, rows = list });

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

@@ -196,11 +196,29 @@
                 {
                     field: 'quantity_tunein_30days', title: '30天调入数', width: '130', sortable: true, iscount: true
                 },
-                { field: 'oneday_total_sales', title: '昨日总销量', width: '130', sortable: true },
-                { field: 'amount_onedaysale', title: '昨日总销售额', width: '130', sortable: true },
-                { field: 'sevenday_total_sales', title: '七天销量', width: '100', sortable: true },
-                { field: 'fourteenday_total_sales', title: '十四天销量', width: '120', sortable: true },
-                { field: 'thirtyday_total_sales', title: '三十天销量', width: '130', sortable: true },
+                {
+                    field: 'oneday_total_sales', title: '昨日总销量', width: '130', sortable: true, formatter: function (idx, data) {
+                        return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '昨日总销量' + '\',1,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.oneday_total_sales + '</a>' : data.oneday_total_sales);
+                }
+                },
+                {
+                    field: 'amount_onedaysale', title: '昨日总销售额', width: '130', sortable: true
+                },
+                {
+                    field: 'sevenday_total_sales', title: '七天销量', width: '100', sortable: true, formatter: function (idx, data) {
+                        return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '七天销量' + '\',7,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.sevenday_total_sales + '</a>' : data.sevenday_total_sales);
+                    }
+                },
+                {
+                    field: 'fourteenday_total_sales', title: '十四天销量', width: '120', sortable: true, formatter: function (idx, data) {
+                        return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '十四天销量' + '\',14,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.fourteenday_total_sales + '</a>' : data.fourteenday_total_sales);
+                    }
+                },
+                {
+                    field: 'thirtyday_total_sales', title: '三十天销量', width: '130', sortable: true, formatter: function (idx, data) {
+                        return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '三十天销量' + '\',30,\'' + data.warehouse_code + '\',\'' + data.bailun_sku + '\')">' + data.thirtyday_total_sales + '</a>' : data.thirtyday_total_sales);
+                    }
+                },
                 {
                     field: 'cash_in_30days', title: '30天现金流收入', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
                         return '<a href="javascript:;" onclick="ShowCashFlow(\'' + data.warehouse_code + '\',\'' + data.warehouse_name + '\',\'' + data.bailun_sku + '\')">' + data.cash_in_30days + '</a>';
@@ -328,6 +346,25 @@
             layer_show(name + '现金流明细', 'http://aims.bailuntec.com/view/reports/cash-flow-sku.html?warehouse_code=' + code+'&bailun_sku='+sku, '90%', '90%');
         }
 
+        function ShowOrderList(name,t,warehousecode,sku) {
+            var start = '@(ViewBag.StartOneDate)';
+            var end = '@(ViewBag.EndDate)';
+
+            if (t == 7) {
+                start = '@(ViewBag.StartSevenDate)';
+            }
+            else if (t == 14) {
+                start = '@(ViewBag.StartFourteenDate)';
+            }
+            else if (t == 30) {
+                start = '@(ViewBag.StartThirtyDate)';
+            }
+
+            var url = 'http://oms.bailuntec.com/#/bailun-order/all-orders?baseQueryKey=SkuNo_Accurate&dateType=payTime&baseQueryValue=' + sku + '&daterange=' + start + '&daterange=' + end + '&wareNo=' + warehousecode + '&orderStatus=0&orderStatus=1&orderStatus=3';
+            console.log(url);
+            layer_show(name + " 的订单明细", url, '90%', '90%');
+        }
+
     </script>
 
 }

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

@@ -132,8 +132,9 @@
                         return data.quantity_tunein_30days + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="30天调入数趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'30天调入数\',\'quantity_tunein_30days\',\'' + data.warehouse_name + '\');" />';
                     }
                 },
-                { field: 'oneday_total_sales', title: '昨日总销量', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                    return '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '昨日总销量' + '\',1,\'' + data.warehouse_code + '\')">' + data.oneday_total_sales + '</a><img src="@Url.Content("~/img/icon-trendchart.png")" title="昨日总销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'昨日总销量\',\'oneday_total_sales\',\'' + data.warehouse_name + '\');" />';
+                {
+                    field: 'oneday_total_sales', title: '昨日总销量', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
+                        return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '昨日总销量' + '\',1,\'' + data.warehouse_code + '\')">' + data.oneday_total_sales + '</a>' : data.oneday_total_sales) + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="昨日总销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'昨日总销量\',\'oneday_total_sales\',\'' + data.warehouse_name + '\');" />';
                 }
                 },
                 {
@@ -143,19 +144,18 @@
                 },
                 {
                     field: 'sevenday_total_sales', title: '七天销量', width: '100', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return data.sevenday_total_sales + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="七天销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'七天销量\',\'sevenday_total_sales\',\'' + data.warehouse_name + '\');" />';
+                        return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '七天销量' + '\',7,\'' + data.warehouse_code + '\')">' + data.sevenday_total_sales + '</a>' : data.sevenday_total_sales) + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="七天销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'七天销量\',\'sevenday_total_sales\',\'' + data.warehouse_name + '\');" />';
                 }
                 },
                 {
                     field: 'fourteenday_total_sales', title: '十四天销量', width: '120', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return data.fourteenday_total_sales + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="十四天销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'十四天销量\',\'fourteenday_total_sales\',\'' + data.warehouse_name + '\');" />';
+                        return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '十四天销量' + '\',14,\'' + data.warehouse_code + '\')">' + data.fourteenday_total_sales + '</a>' : data.fourteenday_total_sales) + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="十四天销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'十四天销量\',\'fourteenday_total_sales\',\'' + data.warehouse_name + '\');" />';
                 }
                 },
                 {
                     field: 'thirtyday_total_sales', title: '三十天销量', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
-                        return data.thirtyday_total_sales + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="三十天销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'三十天销量\',\'thirtyday_total_sales\',\'' + data.warehouse_name + '\');" />';
+                        return ((data.hq_type != 'FBA仓' && data.hq_type != '半成品仓') ? '<a href="javascript:;" onclick="ShowOrderList(\'' + data.warehouse_name + '三十天销量' + '\',30,\'' + data.warehouse_code + '\')">' + data.thirtyday_total_sales + '</a>' : data.thirtyday_total_sales) + '<img src="@Url.Content("~/img/icon-trendchart.png")" title="三十天销量趋势图" style="height:20px;margin-left:3px;" onclick="ShowTrendChart(\'' + data.warehouse_code + '\',\'三十天销量\',\'thirtyday_total_sales\',\'' + data.warehouse_name + '\');" />';
                 }
-
                 },
                 {
                     field: 'cash_in_30days', title: '30天现金流收入', width: '130', sortable: true, iscount: true, formatter: function (idx, data) {
@@ -266,13 +266,15 @@
                 start = '@(ViewBag.StartSevenDate)';
             }
             else if (t == 14) {
-                end = '@(ViewBag.StartFourteenDate)';
+                start = '@(ViewBag.StartFourteenDate)';
             }
             else if (t == 30) {
-                end = '@(ViewBag.StartThirtyDate)';
+                start = '@(ViewBag.StartThirtyDate)';
             }
 
-            layer_show(name + "的订单明细", 'http://oms.bailuntec.com/#/bailun-order/all-orders?baseQueryKey=SkuNo_Accurate&dateType=payTime&daterange=' + start + '&daterange=' + end + '&wareNo=' + warehousecode + '&orderStatus=0&orderStatus=1&orderStatus=3', '90%', '90%');
+            var url = 'http://oms.bailuntec.com/#/bailun-order/all-orders?baseQueryKey=SkuNo_Accurate&dateType=payTime&daterange=' + start + '&daterange=' + end + '&wareNo=' + warehousecode + '&orderStatus=0&orderStatus=1&orderStatus=3';
+            console.log(url);
+            layer_show(name + " 的订单明细", url, '90%', '90%');
         }
 
     </script>

Bailun.DC.Web/Pages/Index.cshtml

@@ -24,7 +24,7 @@
 
     <script src="css/hplus/js/jquery.min.js?v=2.1.4"></script>
     <script src="~/js/jquery.cookie.js" type="text/javascript"></script>
-    <script src="~/js/common.js?20200720003" type="text/javascript"></script>
+    <script src="~/js/common.js?202009160001" type="text/javascript"></script>
 </head>
 
 <body class="fixed-sidebar full-height-layout gray-bg" style="overflow:hidden">

Bailun.DC.Web/wwwroot/js/common.js

@@ -315,12 +315,18 @@ function numFormat(num) {
 
 function login() {
     var token = getUrlParam('token');
-
+    alert(baseUrl);
     if (token != '') {
+        if (baseUrl.indexOf('bailuntec') >= 0) {
             $.cookie('BailunToken', token, { expires: 1, domain: 'bailuntec.com' });
             window.location = baseUrl;
         }
         else {
+            $.cookie('BailunToken', token, { expires: 1, domain: 'localhost' });
+            window.location = baseUrl;
+        }
+    }
+    else {
         token = $.cookie('BailunToken');
 
         if (token == '' || token == undefined || token==null) {