解决逻辑仓SKU明细显示不对的问题

Bailun.DC.Services/WareHouseServices.cs

@@ -214,7 +214,7 @@ namespace Bailun.DC.Services
         /// <param name="stockamountmax">库存金额 max值</param>
         /// <param name="total">符合条件的总记录数</param>
         /// <returns></returns>
-        public List<Models.Stock.mSkuWarehouse> ListWareHouseSku(BtTableParameter parameter, string code, int? categoryid, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax, string skucategoryids,int? push_status, ref int total)
+        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();
 
@@ -248,10 +248,10 @@ namespace Bailun.DC.Services
 
             sqlwhere += " where 1=1 ";
 
-            if (!string.IsNullOrWhiteSpace(code))
+            if (!string.IsNullOrWhiteSpace(warehousecode))
             {
                 sqlwhere += " and t1.warehouse_code=@warehouse_code";
-                sqlparam.Add("warehouse_code", code);
+                sqlparam.Add("warehouse_code", warehousecode);
             }
 
             if (categoryid.HasValue)

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

@@ -203,10 +203,10 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
         /// <param name="stockamountmin">库存金额 最小值</param>
         /// <param name="stockamountmax">库存金额 最大值</param>
         /// <returns></returns>
-        public string ListWareHouseSkuJson(BtTableParameter parameter, string code, int? push_status, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax,string skucategoryids)
+        public string ListWareHouseSkuJson(BtTableParameter parameter, string warehousecode, int? push_status, int? minordercount, int? maxordercount, int? stockmin, int? stockmax, decimal? stockamountmin, decimal? stockamountmax,string skucategoryids)
         {
             var total = 0;
-            var obj = new Services.WareHouseServices().ListWareHouseSku(parameter, code, null, minordercount, maxordercount, stockmin, stockmax, stockamountmin, stockamountmax, skucategoryids, push_status, ref total);
+            var obj = new Services.WareHouseServices().ListWareHouseSku(parameter, warehousecode, null, minordercount, maxordercount, stockmin, stockmax, stockamountmin, stockamountmax, skucategoryids, push_status, ref total);
 
             var list = obj.Select(p => new {
                 amount_onedaysale = p.amount_onedaysale??0,

Bailun.DC.Web/Controllers/HomeController.cs

@@ -77,7 +77,7 @@ namespace Bailun.DC.Web.Controllers
         public ActionResult Main()
         {
 #if DEBUG
-            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjdhZDA5MjQ5ZDk0ZDgxN2VhNmI5ZThhMTc1MzlmNmY3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTkxMTQyMDQsImV4cCI6MTU5OTE1MDIwNCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk5MTE0MjA0LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTgsXCJOYW1lXCI6XCLmlbDmja7kuK3lv4NcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.MxAXGhWVE1q2sGtvo_Clpqe9CtaTyA6OrvvV9dCoCwDeiaB5Fvx3SGwmY_kLFkpShxw9m9LptwZMKucys9lBiFa1pe_TU32o1SxeIaAqsucDqqaiiQt1tJZ1_IGJjF1DAKFBejTgJG_2zNuq3rJsv1C_CCz7tDodeuwy3p5KyS8TQOdqb3QqgrOX-O3xMofqrv0HHRwqD_WLK_YahwUXqSA4CzxIKlscxmPWrfI7RGVthG-hwRkhzvYGapqDeEWZuQrb-WrKuERhnSsqcAwPA2aheuWtA3r01SI00zlNMBSodoGMX0zYwAvRvbPQZCgSJUAnoYAK7_ydTtZ0wSmNjA";
+            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjdhZDA5MjQ5ZDk0ZDgxN2VhNmI5ZThhMTc1MzlmNmY3IiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTkzNzM1NzAsImV4cCI6MTU5OTQwOTU3MCwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTk5MzczNTcwLCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsIkRlcGFydG1lbnQiOiJ7XCJEZXBhcnRtZW50SWRcIjoyNTgsXCJOYW1lXCI6XCLmlbDmja7kuK3lv4NcIixcIkNvZGVcIjpcIlwifSIsInNjb3BlIjpbIm9wZW5pZCIsInByb2ZpbGUiLCJiYWlsdW5BcGkiXSwiYW1yIjpbImN1c3RvbSJdfQ.aSMbeClIajX6bPFbw4GNlYFP5MytY_U6lDlog-J6WpT5rjhrQ7eL-3_HLKuWXVXDgzdd49tP45kP8iE4e5SgpicKe6w67rVvRB23sJoZqYUccCPwh7obs8fUxjqqfaQl14ozShjFaQPNCMPRadxVbe9R2uWacpr8h_QHsH8FelVetfNswkSkP5wKcC1uZuxvyH58zfZt-uKB-zVOp5dJUoPVHWaIzw0dB2vTcU84gJ70wp4NQwYHLr19I-ybMTHLZJi2Oe5lb3h51mpLOtHqOVki3jIClyQx0T3nzmfwea7QvJkzFGAipV9F-2gayKvirZKL1YNzHghdQsivHcOThw";
 #else
             //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
             var cookie = HttpContext.Request.Cookies["BailunToken"];