18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

获取物料接口增加参数

Browse Source
This commit is contained in:
18942506660
2024-03-05 11:18:02 +08:00
parent 896d2a8507
commit 898eb35a28
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/WMS.Web.Repositories/SerialNumbersRepositories.cs
View File

@@ -178,7 +178,7 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="serialNumbers"></param>
/// <returns></returns>
public async Task<MaterialResponse> GetSerialNumber(string serialNumber)
public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode)
{
MaterialResponse response = new MaterialResponse();
var materials_result = await _erpService.BillQueryForMaterial();
@@ -186,7 +186,10 @@ namespace WMS.Web.Repositories
return response;
var materials = materials_result.Data.ToList();
var material = materials.FirstOrDefault(f => f.Specifications.Equals(serialNumber)|| f.MaterialNumber.Equals(serialNumber));
var m = materials.Where(f => (f.Specifications.Equals(serialNumber) || f.MaterialNumber.Equals(serialNumber)));
if (!string.IsNullOrEmpty(orgCode))
m = m.Where(w => w.OrgId.Equals(orgCode));
var material = m.FirstOrDefault();
if (material != null)
{
response.MaterialId = material.MaterialId;
@@ -196,7 +199,7 @@ namespace WMS.Web.Repositories
return response;
}
var entity = await _context.SerialNumbers
.GroupJoin(_context.BoxInventory.Include(x=>x.Details), serial => serial.BoxId, boxInventory => boxInventory.BoxId, (serial, boxInventory) => new { serial, boxInventory })
.GroupJoin(_context.BoxInventory.Include(x => x.Details), serial => serial.BoxId, boxInventory => boxInventory.BoxId, (serial, boxInventory) => new { serial, boxInventory })
.SelectMany(x => x.boxInventory.DefaultIfEmpty(), (p, boxInventory) => new { p.serial, boxInventory })
.GroupJoin(_context.Box, s => s.serial.BoxId, box => box.Id, (s, box) => new { s.serial, s.boxInventory, box })
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, p.boxInventory, box })