diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index d2418d37..16b1953b 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs index edb4bc76..3c0a234d 100644 --- a/src/WMS.Web.Api/Controllers/OutStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/OutStockTaskController.cs @@ -244,8 +244,13 @@ namespace WMS.Web.Api.Controllers var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); res.details.ForEach(x => { - x.MaterialSubStocks = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == res.StockCode && t.OrgCode == res.OrgCode).Select(s => s.SubStock).ToList(); + List rList = new List(); + var slist = materialSubStocks.Where(t => t.MaterialNumber == x.MaterialNumber && t.StockCode == res.StockCode && t.OrgCode == res.OrgCode).Select(s => s.SubStock).ToList(); + slist.ForEach(f => rList.Add(new GetOutStockTaskByNoSubStockResponse(f))); + x.MaterialSubStocks = rList.OrderBy(s => s.SubStock_Do).Select(s => s.SubStock).ToList(); + x.FistSubStock = rList.OrderBy(s => s.SubStock_Do).First().SubStock_Do; }); + res.details = res.details.OrderBy(s => s.FistSubStock).ToList(); return Result.ReSuccess(res); } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 8b2d4c73..f000040e 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -4939,6 +4939,26 @@ 物料对应的仓位有哪些 + + + 所有仓位中排序第一的 + + + + + 处理仓位排序 + + + + + 仓位编码 + + + + + 仓位编码变种 排序用 + + 模糊搜索出库任务单 diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs index 9fdd7bf0..a1c76f5e 100644 --- a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoResponse.cs @@ -61,5 +61,9 @@ namespace WMS.Web.Core.Dto.OutStockTask /// 物料对应的仓位有哪些 /// public List MaterialSubStocks { get; set; } = new List(); + /// + /// 所有仓位中排序第一的 + /// + public string FistSubStock { get; set; } } } diff --git a/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoSubStockResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoSubStockResponse.cs new file mode 100644 index 00000000..d597b47f --- /dev/null +++ b/src/WMS.Web.Core/Dto/OutStockTask/GetOutStockTaskByNoSubStockResponse.cs @@ -0,0 +1,29 @@ +using NPOI.OpenXmlFormats.Spreadsheet; +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.OutStockTask +{ + /// + /// 处理仓位排序 + /// + public class GetOutStockTaskByNoSubStockResponse + { + public GetOutStockTaskByNoSubStockResponse() { + } + public GetOutStockTaskByNoSubStockResponse(string subStock) + { + this.SubStock = subStock; + this.SubStock_Do = subStock.Replace("-0", "-"); + } + /// + /// 仓位编码 + /// + public string SubStock { get; set; } + /// + /// 仓位编码变种 排序用 + /// + public string SubStock_Do { get; set; } + } +}