Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api
This commit is contained in:
@@ -149,14 +149,18 @@ namespace WMS.Web.Repositories
|
||||
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, material.MaterialId);
|
||||
return response;
|
||||
}
|
||||
var entity = await _context.SerialNumbers.FirstOrDefaultAsync(w => serialNumber.Equals(w.SerialNumber));
|
||||
if (entity == null) return null;
|
||||
response.BoxId = entity.BoxId;
|
||||
response.SerialNumber = entity.SerialNumber;
|
||||
response.MaterialId = entity.MaterialId;
|
||||
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.MaterialId);
|
||||
response.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, entity.MaterialId);
|
||||
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.MaterialId);
|
||||
var entity = await _context.SerialNumbers
|
||||
.GroupJoin(_context.BoxInventory, serial => serial.BoxId, box => box.BoxId, (serial, box) => new { serial, box })
|
||||
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.serial, box })
|
||||
.FirstOrDefaultAsync(w => serialNumber.Equals(w.serial.SerialNumber));
|
||||
if (entity.serial == null) return null;
|
||||
response.BoxId = entity.serial.BoxId;
|
||||
response.SubStockId = entity.box?.SubStockId ?? 0;
|
||||
response.SerialNumber = entity.serial.SerialNumber;
|
||||
response.MaterialId = entity.serial.MaterialId;
|
||||
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialId);
|
||||
response.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, entity.serial.MaterialId);
|
||||
response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, entity.serial.MaterialId);
|
||||
return response;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user