Merge branch 'master' of http://192.168.1.150:8083/wufan/ERP

TradeManageNew/OuterService/ShageService.ashx.cs

@@ -2039,7 +2039,7 @@ namespace TradeManageNew.OuterService
 
 
                         var input = JsonConvert.DeserializeObject<GetDataList>(ResponseContent);
-                        var ordermodel = DataNew.GetTemuSKUData(input.PageSize,input.PageIndex,input.GoodsCode, input.Name,input.IsNegative, out int rowCount);
+                        var ordermodel = DataNew.GetTemuSKUData(input, out int rowCount);
                        
                         if (ordermodel != null)
                         {
@@ -2135,6 +2135,16 @@ namespace TradeManageNew.OuterService
             public string GoodsCode { get; set; }
             public string Name { get; set; }
             public bool? IsNegative { get; set; }
+            public int? Day { get; set; }
+            public int? S_SaleNum { get; set; }
+            public int? E_SaleNum { get; set; }
+
+            public int? StoreHouse { get; set; }
+            public int? S_LeftNum { get; set; }
+            public int? E_LeftNum { get; set; }
+
+            public DateTime? S_OrderDate { get; set; }
+            public DateTime? E_OrderDate { get; set; }
             public int PageSize { get; set; }
             public int PageIndex { get; set; }
         }

TradeManageNew/SysManageServiceNew.asmx.cs

@@ -18032,7 +18032,7 @@ where a.storeid in  (6,9,11)  and a.OrderGoodsId=0 and a.KCNum>0  " + tj + "  gr
 
         #region 智能库存temu sku数据导出
         [WebMethod(EnableSession = true)]
-        public string GetExcelTemuSKUData( string GoodsCode, string Name, bool? IsNegative)
+        public string GetExcelTemuSKUData( string GoodsCode, string Name, bool? IsNegative, int? Day, int? S_SaleNum, int? E_SaleNum, int? StoreHouse, int? S_LeftNum, int? E_LeftNum, DateTime? S_OrderDate, DateTime? E_OrderDate)
         {
             // 这里确保您的登录逻辑正确
             //PagesNew.Login(this.Session);
@@ -18042,7 +18042,19 @@ where a.storeid in  (6,9,11)  and a.OrderGoodsId=0 and a.KCNum>0  " + tj + "  gr
                 //Pages.Login(this.Session);
                 #region 信息查询
                 var slist = new List<TemuSKUData_List>();
-                slist = DataNew.GetTemuSKUData(999999, 1, GoodsCode, Name, IsNegative, out int rowCount);
+                var input = new OuterService.ShageService.GetDataList();
+                input.GoodsCode = GoodsCode;
+                input.Name = Name;
+                input.IsNegative = IsNegative;
+                input.Day = Day;
+                input.S_SaleNum = S_SaleNum;
+                input.E_SaleNum = E_SaleNum;
+                input.StoreHouse = StoreHouse;
+                input.S_LeftNum = S_LeftNum;
+                input.E_LeftNum = E_LeftNum;
+                input.S_OrderDate = S_OrderDate;
+                input.E_OrderDate = E_OrderDate;
+                slist = DataNew.GetTemuSKUData(input, out int rowCount);
                 #endregion
                 TableColumnCollection listColumns = new TableColumnCollection();
                 // 添加列信息