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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-12-06 16:36:22 +08:00
parent a5e2d4592a a39a1b2556
commit 6087bc9f94
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -3531,6 +3531,11 @@
箱Id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.BoxBillNo">
<summary>
箱号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.MaterialResponse.SubStockId">
<summary>
仓位Id(序列号不存在库存的话仓位是0)

4
src/WMS.Web.Core/Dto/MaterialResponse.cs
View File

@@ -14,6 +14,10 @@ namespace WMS.Web.Core.Dto
/// </summary>
public int BoxId { get; set; } = 0;
/// <summary>
/// 箱号
/// </summary>
public string BoxBillNo { get; set; }
/// <summary>
/// 仓位Id(序列号不存在库存的话仓位是0)
/// </summary>
public int SubStockId { get; set; } = 0;

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

@@ -200,12 +200,15 @@ namespace WMS.Web.Repositories
return response;
}
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 })
.GroupJoin(_context.BoxInventory, 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 })
.FirstOrDefaultAsync(w => serialNumber.Equals(w.serial.SerialNumber));
if (entity == null || entity.serial == null) return null;
response.BoxId = entity.serial.BoxId;
response.SubStockId = entity.box?.SubStockId ?? 0;
response.BoxBillNo = entity.box.BoxBillNo;
response.SubStockId = entity.boxInventory?.SubStockId ?? 0;
response.SerialNumber = entity.serial.SerialNumber;
response.MaterialId = entity.serial.MaterialId;
response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, entity.serial.MaterialId);