This commit is contained in:
18942506660
2024-08-13 10:06:51 +08:00
parent 4a3bd6a676
commit bc27fb250e
5 changed files with 59 additions and 1 deletions

View File

@@ -244,8 +244,13 @@ namespace WMS.Web.Api.Controllers
var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId); var materialSubStocks = await _inventoryDetailsRepositories.GetMaterialSubStocks(materialNumbers, stockCodes, orgCodes, loginInfo.UserInfo.CompanyId);
res.details.ForEach(x => 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<GetOutStockTaskByNoSubStockResponse> rList = new List<GetOutStockTaskByNoSubStockResponse>();
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<GetOutStockTaskByNoResponse>.ReSuccess(res); return Result<GetOutStockTaskByNoResponse>.ReSuccess(res);
} }

View File

@@ -4939,6 +4939,26 @@
物料对应的仓位有哪些 物料对应的仓位有哪些
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoDetailsResponse.FistSubStock">
<summary>
所有仓位中排序第一的
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoSubStockResponse">
<summary>
处理仓位排序
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoSubStockResponse.SubStock">
<summary>
仓位编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskByNoSubStockResponse.SubStock_Do">
<summary>
仓位编码变种 排序用
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskNosByNoRequest"> <member name="T:WMS.Web.Core.Dto.OutStockTask.GetOutStockTaskNosByNoRequest">
<summary> <summary>
模糊搜索出库任务单 模糊搜索出库任务单

View File

@@ -61,5 +61,9 @@ namespace WMS.Web.Core.Dto.OutStockTask
/// 物料对应的仓位有哪些 /// 物料对应的仓位有哪些
/// </summary> /// </summary>
public List<string> MaterialSubStocks { get; set; } = new List<string>(); public List<string> MaterialSubStocks { get; set; } = new List<string>();
/// <summary>
/// 所有仓位中排序第一的
/// </summary>
public string FistSubStock { get; set; }
} }
} }

View File

@@ -0,0 +1,29 @@
using NPOI.OpenXmlFormats.Spreadsheet;
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.OutStockTask
{
/// <summary>
/// 处理仓位排序
/// </summary>
public class GetOutStockTaskByNoSubStockResponse
{
public GetOutStockTaskByNoSubStockResponse() {
}
public GetOutStockTaskByNoSubStockResponse(string subStock)
{
this.SubStock = subStock;
this.SubStock_Do = subStock.Replace("-0", "-");
}
/// <summary>
/// 仓位编码
/// </summary>
public string SubStock { get; set; }
/// <summary>
/// 仓位编码变种 排序用
/// </summary>
public string SubStock_Do { get; set; }
}
}