diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2
index 7928d256..2c8497f9 100644
Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index f39b9f45..a2cb2285 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -5474,6 +5474,16 @@
调入仓库
+
+
+ 调入仓库
+
+
+
+
+ 组织编码
+
+
出库开始时间
diff --git a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
index d3207290..167acf14 100644
--- a/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
+++ b/src/WMS.Web.Core/Dto/OutStockTask/OutStockTaskQueryInfoResponse.cs
@@ -96,6 +96,16 @@ namespace WMS.Web.Core.Dto.OutStockTask
[Column("调入仓库")]
public string InStock { get; set; }
///
+ /// 调入仓库
+ ///
+ [Ignore]
+ public List InStockCodes { get; set; } = new List();
+ ///
+ /// 组织编码
+ ///
+ [Ignore]
+ public string OrgCode { get; set; }
+ ///
/// 出库开始时间
///
[Column("出库开始时间")]
diff --git a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
index f900ac7d..7f4c7989 100644
--- a/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/OutStockTaskRepositories.cs
@@ -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);
}