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