From fb67d6e8e2130ba91586f1eac1ff168c5f055f77 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Tue, 21 Nov 2023 17:21:16 +0800 Subject: [PATCH] tt --- src/WMS.Web.Domain/Values/Single/SingleAction.cs | 8 +++++++- src/WMS.Web.Repositories/InStockTaskRepositories.cs | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Domain/Values/Single/SingleAction.cs b/src/WMS.Web.Domain/Values/Single/SingleAction.cs index 156aff4f..a3e7de30 100644 --- a/src/WMS.Web.Domain/Values/Single/SingleAction.cs +++ b/src/WMS.Web.Domain/Values/Single/SingleAction.cs @@ -104,7 +104,13 @@ namespace WMS.Web.Domain.Values.Single /// 仓位集合 /// [EnumRemark("仓位")] - SubStocks = 19 + SubStocks = 19, + + /// + /// 仓库：编码与组织编码结合 + /// + [EnumRemark("仓库")] + StocksJoinOrgCode=20 } } diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index eb52e7a9..b769bd71 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -133,7 +133,7 @@ namespace WMS.Web.Repositories MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), 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, ReceiveQty = s.detail.ReceiveQty, RealityQty = s.detail.RealityQty,