From b191fe232dafc1a5f01b2e73a75326d61d8bdb9a Mon Sep 17 00:00:00 2001 From: wufan Date: Mon, 13 Jan 2025 10:55:33 +0800 Subject: [PATCH] :sparkles: --- .../Shage/OrderUsedSalePlatformPageInput.cs | 31 ++++++++++++++ .../OuterService/ShageService.ashx.cs | 41 +++++++++++++++++++ TradeManageNew/TradeManageNew.csproj | 1 + 3 files changed, 73 insertions(+) create mode 100644 TradeManageNew/Models/Shage/OrderUsedSalePlatformPageInput.cs diff --git a/TradeManageNew/Models/Shage/OrderUsedSalePlatformPageInput.cs b/TradeManageNew/Models/Shage/OrderUsedSalePlatformPageInput.cs new file mode 100644 index 0000000..d04cdf8 --- /dev/null +++ b/TradeManageNew/Models/Shage/OrderUsedSalePlatformPageInput.cs @@ -0,0 +1,31 @@ +namespace TradeManageNew.Models.Shage +{ + public class OrderUsedSalePlatformPageInput + { + public int PageIndex { get; set; } = 1; + + public int PageSize { get; set; } = 50; + + public string Code { get; set; } + + /// + /// 打印条码 + /// + public string BarCode { get; set; } + + /// + /// 是否已打印 + /// + public bool? IsPrinted { get; set; } + + /// + /// 是否已推送 + /// + public bool? IsPublished { get; set; } + + /// + /// 库位编码 + /// + public string WarehousePositionCode { get; set; } + } +} \ No newline at end of file diff --git a/TradeManageNew/OuterService/ShageService.ashx.cs b/TradeManageNew/OuterService/ShageService.ashx.cs index 2170dc7..ec6fd69 100644 --- a/TradeManageNew/OuterService/ShageService.ashx.cs +++ b/TradeManageNew/OuterService/ShageService.ashx.cs @@ -1509,7 +1509,48 @@ namespace TradeManageNew.OuterService md.Data = JsonConvert.SerializeObject(newOrderUsedSalePlatform); } } + } + + 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); + } } } } diff --git a/TradeManageNew/TradeManageNew.csproj b/TradeManageNew/TradeManageNew.csproj index 8bf2781..f3c1c86 100644 --- a/TradeManageNew/TradeManageNew.csproj +++ b/TradeManageNew/TradeManageNew.csproj @@ -2920,6 +2920,7 @@ + OrderAPI.ashx