From 51599420790de02ba7ecd92f6382d9dd298ae1d5 Mon Sep 17 00:00:00 2001 From: wufan Date: Mon, 13 Jan 2025 11:19:59 +0800 Subject: [PATCH] :memo: --- TradeManageNew/DD_OrderServiceNew.asmx.cs | 52 +++++++++++++++++++ .../OuterService/ShageService.ashx.cs | 42 --------------- 2 files changed, 52 insertions(+), 42 deletions(-) diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs index c8fe5e2..5f19996 100644 --- a/TradeManageNew/DD_OrderServiceNew.asmx.cs +++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs @@ -28675,6 +28675,58 @@ namespace TradeManageNew #endregion #endregion + #region 二手商品上架Shopify + + [WebMethod(EnableSession = true)] + public JsonModel> OrderUsedSalePlatformPage(string Code,string BarCode,bool? IsPrinted,bool? IsPublished,string WarehousePositionCode,int PageIndex=1,int PageSize=50) + { + // PagesNew.Login(base.Session); + var result = new JsonModel>(); + using (var db = new TradeUsedSale.Repositories.ErpDbContext()) + { + var query = db.DT_OrderUsedSalePlatform.AsQueryable(); + if (!string.IsNullOrWhiteSpace(Code)) + { + query = query.Where(x => + x.ProductCode.Contains(Code) || x.SkuCode.Contains(Code)); + } + + if (!string.IsNullOrWhiteSpace(BarCode)) + { + query = query.Where(x => x.BarCode == BarCode); + } + + if (IsPrinted.HasValue) + { + query = query.Where(x => x.IsPrinted == IsPrinted.Value); + } + + if (IsPublished.HasValue) + { + query = query.Where(x => x.IsPublished == IsPublished.Value); + } + + if (!string.IsNullOrWhiteSpace(WarehousePositionCode)) + { + query = query.Where(x => x.WarehousePositionCode == WarehousePositionCode); + } + + query = query.OrderByDescending(x => x.CreationTime); + + var count = query.Count(); + result.RowCount = count; + if (count > 0) + { + var page= query.Skip((PageIndex - 1) * PageSize).Take(PageSize).ToList(); + result.DataSource = page; + } + } + + return result; + } + + #endregion + #region 订单同步零星 [WebMethod(EnableSession = true)] diff --git a/TradeManageNew/OuterService/ShageService.ashx.cs b/TradeManageNew/OuterService/ShageService.ashx.cs index ec6fd69..0174a4c 100644 --- a/TradeManageNew/OuterService/ShageService.ashx.cs +++ b/TradeManageNew/OuterService/ShageService.ashx.cs @@ -1510,48 +1510,6 @@ namespace TradeManageNew.OuterService } } } - - if (Method == "OrderUsedSalePlatformPage") - { - var input = JsonConvert.DeserializeObject(ResponseContent); - using (var db = new ErpDbContext()) - { - var query = db.DT_OrderUsedSalePlatform.AsQueryable(); - if (!string.IsNullOrWhiteSpace(input.Code)) - { - query = query.Where(x => - x.ProductCode.Contains(input.Code) || x.SkuCode.Contains(input.Code)); - } - - if (!string.IsNullOrWhiteSpace(input.BarCode)) - { - query = query.Where(x => x.BarCode == input.BarCode); - } - - if (input.IsPrinted.HasValue) - { - query = query.Where(x => x.IsPrinted == input.IsPrinted.Value); - } - - if (input.IsPublished.HasValue) - { - query = query.Where(x => x.IsPublished == input.IsPublished.Value); - } - - if (!string.IsNullOrWhiteSpace(input.WarehousePositionCode)) - { - query = query.Where(x => x.WarehousePositionCode == input.WarehousePositionCode); - } - - query = query.OrderByDescending(x => x.CreationTime); - - var page= query.Skip((input.PageIndex - 1) * input.PageSize).Take(input.PageSize).ToList(); - - md.Code = "100"; - md.Result = "Success"; - md.Data = JsonConvert.SerializeObject(page); - } - } } } catch (Exception ex)