修复bug
This commit is contained in:
@@ -5474,6 +5474,16 @@
|
||||
调入仓库
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.InStockCodes">
|
||||
<summary>
|
||||
调入仓库
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OrgCode">
|
||||
<summary>
|
||||
组织编码
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OutStockBeginTime">
|
||||
<summary>
|
||||
出库开始时间
|
||||
|
||||
@@ -96,6 +96,16 @@ namespace WMS.Web.Core.Dto.OutStockTask
|
||||
[Column("调入仓库")]
|
||||
public string InStock { get; set; }
|
||||
/// <summary>
|
||||
/// 调入仓库
|
||||
///</summary>
|
||||
[Ignore]
|
||||
public List<string> InStockCodes { get; set; } = new List<string>();
|
||||
/// <summary>
|
||||
/// 组织编码
|
||||
///</summary>
|
||||
[Ignore]
|
||||
public string OrgCode { get; set; }
|
||||
/// <summary>
|
||||
/// 出库开始时间
|
||||
///</summary>
|
||||
[Column("出库开始时间")]
|
||||
|
||||
@@ -393,7 +393,8 @@ namespace WMS.Web.Repositories
|
||||
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialNumber),
|
||||
Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.detail.MaterialNumber),
|
||||
Remark = s.detail.Remark,
|
||||
InStock = GetInStock(s.detail.ErpDetails.Select(s => s.InStockCode).ToList(), companyId, s.order.OrgCode)
|
||||
InStockCodes= s.detail.ErpDetails.Select(s => s.InStockCode).ToList(),
|
||||
OrgCode= s.order.OrgCode
|
||||
#endregion
|
||||
|
||||
}).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||
@@ -401,6 +402,7 @@ namespace WMS.Web.Repositories
|
||||
{
|
||||
l.SourceBillNo = string.Join(",", l.SourceBillNoList.Distinct());
|
||||
l.SaleBillNo = string.Join(",", l.SaleBillNoList.Distinct());
|
||||
l.InStock = GetInStock(l.InStockCodes, companyId, l.OrgCode);
|
||||
}
|
||||
return (list, total);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user