This commit is contained in:
tongfei
2023-11-21 17:21:16 +08:00
parent 2815d7bd84
commit fb67d6e8e2
2 changed files with 8 additions and 2 deletions

View File

@@ -104,7 +104,13 @@ namespace WMS.Web.Domain.Values.Single
/// 仓位集合 /// 仓位集合
/// </summary> /// </summary>
[EnumRemark("仓位")] [EnumRemark("仓位")]
SubStocks = 19 SubStocks = 19,
/// <summary>
/// 仓库:编码与组织编码结合
/// </summary>
[EnumRemark("仓库")]
StocksJoinOrgCode=20
} }
} }

View File

@@ -133,7 +133,7 @@ namespace WMS.Web.Repositories
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId),
FactoryPrice = s.detail.FactoryPrice, FactoryPrice = s.detail.FactoryPrice,
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.detail.StockCode+s.detail.OrgCode), Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode+s.detail.OrgCode),
AccruedQty = s.detail.AccruedQty, AccruedQty = s.detail.AccruedQty,
ReceiveQty = s.detail.ReceiveQty, ReceiveQty = s.detail.ReceiveQty,
RealityQty = s.detail.RealityQty, RealityQty = s.detail.RealityQty,