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, out int rowCount);
+                        var ordermodel = DataNew.GetTemuSKUData(input.PageSize,input.PageIndex,input.GoodsCode, input.Name,input.IsNegative, out int rowCount);
                        
                         if (ordermodel != null)
                         {
@@ -2133,6 +2133,8 @@ namespace TradeManageNew.OuterService
         public class GetDataList
         {
             public string GoodsCode { get; set; }
+            public string Name { get; set; }
+            public bool? IsNegative { 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)
+        public string GetExcelTemuSKUData( string GoodsCode, string Name, bool? IsNegative)
         {
             // 这里确保您的登录逻辑正确
             //PagesNew.Login(this.Session);
@@ -18042,7 +18042,7 @@ 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, out int rowCount);
+                slist = DataNew.GetTemuSKUData(999999, 1, GoodsCode, Name, IsNegative, out int rowCount);
                 #endregion
                 TableColumnCollection listColumns = new TableColumnCollection();
                 // 添加列信息