增加箱号返回
This commit is contained in:
@@ -4897,6 +4897,11 @@
|
||||
仓位
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.BoxBillNo">
|
||||
<summary>
|
||||
箱号
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.TakeStock.TakeStockQueryInfoResponse.Erp_SubStock">
|
||||
<summary>
|
||||
子仓库
|
||||
|
||||
@@ -50,6 +50,10 @@ namespace WMS.Web.Core.Dto.TakeStock
|
||||
[Column("仓位")]
|
||||
public string SubStock { get; set; }
|
||||
/// <summary>
|
||||
/// 箱号
|
||||
/// </summary>
|
||||
public string BoxBillNo { get; set; }
|
||||
/// <summary>
|
||||
/// 子仓库
|
||||
/// </summary>
|
||||
[Column("子仓库")]
|
||||
|
||||
@@ -216,6 +216,8 @@ namespace WMS.Web.Repositories
|
||||
var query = _context.TakeStockDetails
|
||||
.GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
|
||||
.SelectMany(x => x.orders.DefaultIfEmpty(), (p, order) => new { p.detail, order })
|
||||
.GroupJoin(_context.Box, d => d.detail.BoxId, box => box.Id, (d, box) => new { d, box })
|
||||
.SelectMany(x => x.box.DefaultIfEmpty(), (p, box) => new { p.d.detail,p.d.order, box })
|
||||
.OrderByDescending(o => o.detail.Id)
|
||||
.Where(adv => 1 == 1 && adv.detail.FinalQty > 0);
|
||||
|
||||
@@ -262,6 +264,7 @@ namespace WMS.Web.Repositories
|
||||
BeforeQty = s.detail.BeforeQty,
|
||||
AfterQty = s.detail.AfterQty,
|
||||
FinalQty = s.detail.FinalQty,
|
||||
BoxBillNo=s.box.BoxBillNo,
|
||||
ResultType = s.order.ResultType.GetRemark(),
|
||||
Remark = s.detail.Remark,
|
||||
FailRemark = s.order.FailRemark,
|
||||
|
||||
Reference in New Issue
Block a user