改箱服务调整
This commit is contained in:
@@ -45,25 +45,31 @@ namespace WMS.Web.Repositories
|
||||
/// </summary>
|
||||
/// <param name="BoxBillNo"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<List<BoxDetailResponse>> GetDetails(string BoxBillNo)
|
||||
public async Task<BoxResponse> GetBox(string BoxBillNo)
|
||||
{
|
||||
return await _context.BoxDetails
|
||||
.GroupJoin(_context.Box, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
|
||||
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
|
||||
.Where(w => w.order.BoxBillNo.Equals(BoxBillNo))
|
||||
.Select(s => new BoxDetailResponse()
|
||||
{
|
||||
Fid = s.detail.Fid,
|
||||
BoxId = s.order.OpsBoxId,
|
||||
MaterialId = s.detail.MaterialId,
|
||||
MaterialName = "",
|
||||
MaterialNumber = "",
|
||||
Specifications = "",
|
||||
SerialNumbers = s.detail.SerialNumbers,
|
||||
SupplierId = s.detail.SupplierId,
|
||||
Qty = s.detail.Qty
|
||||
})
|
||||
.ToListAsync();
|
||||
var entity = await _context.Box.FirstOrDefaultAsync(f => f.BoxBillNo.Equals(BoxBillNo));
|
||||
if (entity == null) return null;
|
||||
BoxResponse result = new BoxResponse()
|
||||
{
|
||||
Id = entity.Id,
|
||||
BoxId = entity.OpsBoxId
|
||||
};
|
||||
result.Details = await _context.BoxDetails
|
||||
.GroupJoin(_context.Box, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
|
||||
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
|
||||
.Where(w => w.order.BoxBillNo.Equals(BoxBillNo))
|
||||
.Select(s => new BoxDetailResponse()
|
||||
{
|
||||
MaterialId = s.detail.MaterialId,
|
||||
MaterialName = "",
|
||||
MaterialNumber = "",
|
||||
Specifications = "",
|
||||
SerialNumbers = s.detail.SerialNumbers,
|
||||
SupplierId = s.detail.SupplierId,
|
||||
Qty = s.detail.Qty
|
||||
})
|
||||
.ToListAsync();
|
||||
return result;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user