From cf0de6997f91329f7a81995756e4fb60a342563c Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Mon, 18 Dec 2023 16:01:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA-=E5=8A=A0?= =?UTF-8?q?=E5=85=AC=E5=8F=B8ID=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BackRecordController.cs | 2 +- .../Controllers/InStockController.cs | 2 +- .../Controllers/InStockTaskController.cs | 2 +- .../Controllers/InventoryController.cs | 6 +++--- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 18 +++++++++++------- .../Infrastructure/IBackRecordRepositories.cs | 3 ++- .../IBoxInventoryRepositories.cs | 3 ++- .../Infrastructure/IInStockRepositories.cs | 2 +- .../Infrastructure/IInStockTaskRepositories.cs | 2 +- .../IInventoryDetailsRepositories.cs | 5 +++-- .../IInventoryInOutDetailsRepositories.cs | 3 ++- .../BackRecordRepositories.cs | 12 ++++++------ .../BoxInventoryRepositories.cs | 9 +++++---- .../InStockRepositories.cs | 8 ++++---- .../InStockTaskRepositories.cs | 10 +++++----- .../InventoryDetailsRepositories.cs | 9 +++++---- .../InventoryInOutDetailsRepositories.cs | 7 ++++--- 17 files changed, 57 insertions(+), 46 deletions(-) diff --git a/src/WMS.Web.Api/Controllers/BackRecordController.cs b/src/WMS.Web.Api/Controllers/BackRecordController.cs index 8f3d2c38..c4723212 100644 --- a/src/WMS.Web.Api/Controllers/BackRecordController.cs +++ b/src/WMS.Web.Api/Controllers/BackRecordController.cs @@ -54,7 +54,7 @@ namespace WMS.Web.Api.Controllers var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return ResultPagedList.ReFailure(ResultCodes.Token_Invalid_Error); - var (list,total) = await _backRecordRepositories.GetPagedList(dto); + var (list,total) = await _backRecordRepositories.GetPagedList(dto, loginInfo.UserInfo.CompanyId); return ResultPagedList.ReSuccess(list, total); } diff --git a/src/WMS.Web.Api/Controllers/InStockController.cs b/src/WMS.Web.Api/Controllers/InStockController.cs index 96239e96..6c308103 100644 --- a/src/WMS.Web.Api/Controllers/InStockController.cs +++ b/src/WMS.Web.Api/Controllers/InStockController.cs @@ -56,7 +56,7 @@ namespace WMS.Web.Api.Controllers var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return ResultPagedList.ReFailure(ResultCodes.Token_Invalid_Error); - var (list, count) = await _inStockRepositories.GetPagedList(dto); + var (list, count) = await _inStockRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId); return ResultPagedList.ReSuccess(list, count); } diff --git a/src/WMS.Web.Api/Controllers/InStockTaskController.cs b/src/WMS.Web.Api/Controllers/InStockTaskController.cs index e1eaece4..eb4a9740 100644 --- a/src/WMS.Web.Api/Controllers/InStockTaskController.cs +++ b/src/WMS.Web.Api/Controllers/InStockTaskController.cs @@ -59,7 +59,7 @@ namespace WMS.Web.Api.Controllers var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return ResultPagedList.ReFailure(ResultCodes.Token_Invalid_Error); - var (list,total) = await _inStockTaskRepositories.GetPagedList(dto); + var (list,total) = await _inStockTaskRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId); return ResultPagedList.ReSuccess(list, total); } diff --git a/src/WMS.Web.Api/Controllers/InventoryController.cs b/src/WMS.Web.Api/Controllers/InventoryController.cs index 12ac34ac..efc8f6c5 100644 --- a/src/WMS.Web.Api/Controllers/InventoryController.cs +++ b/src/WMS.Web.Api/Controllers/InventoryController.cs @@ -61,7 +61,7 @@ namespace WMS.Web.Api.Controllers var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return ResultPagedList.ReFailure(ResultCodes.Token_Invalid_Error); - var (list, count) = await _inventoryDetailsRepositories.GetPagedList(dto); + var (list, count) = await _inventoryDetailsRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId); return ResultPagedList.ReSuccess(list, count); } @@ -100,7 +100,7 @@ namespace WMS.Web.Api.Controllers var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return ResultPagedList.ReFailure(ResultCodes.Token_Invalid_Error); - var (list, count) = await _inventoryInOutDetailsRepositories.GetPagedList(dto); + var (list, count) = await _inventoryInOutDetailsRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId); return ResultPagedList.ReSuccess(list, count); } @@ -139,7 +139,7 @@ namespace WMS.Web.Api.Controllers var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return ResultPagedList.ReFailure(ResultCodes.Token_Invalid_Error); - var (list, count) = await _boxInventoryRepositories.GetPagedList(dto); + var (list, count) = await _boxInventoryRepositories.GetPagedList(dto,loginInfo.UserInfo.CompanyId); return ResultPagedList.ReSuccess(list, count); } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 740564a0..661aaf38 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1887,11 +1887,12 @@ 出入库回退记录-仓储接口 - + 列表-分页 + @@ -1969,11 +1970,12 @@ 箱库存-仓储接口 - + 列表-查询 + @@ -2067,7 +2069,7 @@ wms入库单-仓储接口 - + 列表-分页 @@ -2158,7 +2160,7 @@ 入库任务-仓储接口 - + 列表-分页 @@ -2251,11 +2253,12 @@ 库存相关-仓储接口 - + - 列表-分页 + 列表-分页 + @@ -2298,11 +2301,12 @@ 物料收发明细-仓储接口 - + 列表-分页 + diff --git a/src/WMS.Web.Domain/Infrastructure/IBackRecordRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBackRecordRepositories.cs index f1001522..5da5a962 100644 --- a/src/WMS.Web.Domain/Infrastructure/IBackRecordRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IBackRecordRepositories.cs @@ -17,8 +17,9 @@ namespace WMS.Web.Domain.Infrastructure /// 列表-分页 /// /// + /// /// - Task<(List list, int total)> GetPagedList(BackRecordQueryRequest dto); + Task<(List list, int total)> GetPagedList(BackRecordQueryRequest dto, int companyId); /// /// 新增 diff --git a/src/WMS.Web.Domain/Infrastructure/IBoxInventoryRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBoxInventoryRepositories.cs index 9ee86193..34139ccd 100644 --- a/src/WMS.Web.Domain/Infrastructure/IBoxInventoryRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IBoxInventoryRepositories.cs @@ -17,8 +17,9 @@ namespace WMS.Web.Domain.Infrastructure /// 列表-查询 /// /// + /// /// - Task<(List list,int total)> GetPagedList(BoxInventoryQueryRequest dto); + Task<(List list,int total)> GetPagedList(BoxInventoryQueryRequest dto, int companyId); /// /// 明细集合-根据箱号 diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs index de43c12e..84600b33 100644 --- a/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IInStockRepositories.cs @@ -19,7 +19,7 @@ namespace WMS.Web.Domain.Infrastructure /// /// /// - Task<(List list,int total)> GetPagedList(InStockQueryRequest dto); + Task<(List list,int total)> GetPagedList(InStockQueryRequest dto,int companyId); /// /// 箱是否存在于入库单明细中；（箱是否被上架了） diff --git a/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs index a7c1993f..6503e3b5 100644 --- a/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs @@ -20,7 +20,7 @@ namespace WMS.Web.Domain.Infrastructure /// /// /// - Task<(List list, int total)> GetPagedList(InStockTaskQueryRequest dto); + Task<(List list, int total)> GetPagedList(InStockTaskQueryRequest dto, int companyId); /// /// 详情 diff --git a/src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs index 278bc4af..012f0f2d 100644 --- a/src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IInventoryDetailsRepositories.cs @@ -14,11 +14,12 @@ namespace WMS.Web.Domain.Infrastructure public interface IInventoryDetailsRepositories { /// - /// 列表-分页 + /// 列表-分页 /// /// + /// /// - Task<(List list,int total)> GetPagedList(InventoryDetailsQueryRequest dto); + Task<(List list,int total)> GetPagedList(InventoryDetailsQueryRequest dto, int companyId); /// /// 批量添加 diff --git a/src/WMS.Web.Domain/Infrastructure/IInventoryInOutDetailsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IInventoryInOutDetailsRepositories.cs index 39a0a321..1ee3495e 100644 --- a/src/WMS.Web.Domain/Infrastructure/IInventoryInOutDetailsRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IInventoryInOutDetailsRepositories.cs @@ -17,8 +17,9 @@ namespace WMS.Web.Domain.Infrastructure /// 列表-分页 /// /// + /// /// - Task<(List list,int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto); + Task<(List list,int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto, int companyId); /// /// 批量添加 diff --git a/src/WMS.Web.Repositories/BackRecordRepositories.cs b/src/WMS.Web.Repositories/BackRecordRepositories.cs index bcc7e588..b5824a9c 100644 --- a/src/WMS.Web.Repositories/BackRecordRepositories.cs +++ b/src/WMS.Web.Repositories/BackRecordRepositories.cs @@ -59,7 +59,7 @@ namespace WMS.Web.Repositories /// /// /// - public async Task<(List list,int total)> GetPagedList(BackRecordQueryRequest dto) + public async Task<(List list,int total)> GetPagedList(BackRecordQueryRequest dto, int companyId) { //1.获取物料集合和组织集合和供应商的集合 var materials = new List(); @@ -76,7 +76,7 @@ namespace WMS.Web.Repositories List ids = new List(); if (!string.IsNullOrEmpty(dto.Creator)) { - var staffList = await _basicsRepositories.GetStaffListAsync(_loginRepositories.CompanyId); + var staffList = await _basicsRepositories.GetStaffListAsync(companyId); ids = staffList.Where(w =>w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList(); } @@ -109,15 +109,15 @@ namespace WMS.Web.Repositories BillNo=s.order.BillNo, BoxBillNo = s.box.BoxBillNo, Type = s.order.Type.GetRemark(), - Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), + Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId), CreateTime =s.order.CreateTime, MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), Qty = s.detail.Qty, Org= _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode), - Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode), - SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.order.SubStockId), + Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode + s.order.OrgCode), + SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.order.SubStockId), SerialNumbers = JsonConvert.SerializeObject(s.detail.SerialNumbers), }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); @@ -166,7 +166,7 @@ namespace WMS.Web.Repositories /// public async Task<(object obj, int total)> GetListField(BackRecordQueryRequest dto, int companyId) { - return await GetPagedList(dto); + return await GetPagedList(dto,companyId); } } } diff --git a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs index 04e5b45d..cd83fc06 100644 --- a/src/WMS.Web.Repositories/BoxInventoryRepositories.cs +++ b/src/WMS.Web.Repositories/BoxInventoryRepositories.cs @@ -53,8 +53,9 @@ namespace WMS.Web.Repositories /// 列表-分页 /// /// + /// /// - public async Task<(List list, int total)> GetPagedList(BoxInventoryQueryRequest dto) + public async Task<(List list, int total)> GetPagedList(BoxInventoryQueryRequest dto, int companyId) { //1.获取物料集合和组织集合 var materials = new List(); @@ -108,8 +109,8 @@ namespace WMS.Web.Repositories MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), - Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode), - SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.order.SubStockId), + Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode+s.order.OrgCode), + SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.order.SubStockId), SerialNumbers=(string.Join(",",s.detail.SerialNumbers)).TrimEnd(','), Org = _erpBasicDataExtendService.GetOrgName(orgs, s.order.OrgCode), Qty = s.detail.Qty, @@ -271,7 +272,7 @@ namespace WMS.Web.Repositories /// public async Task<(object obj, int total)> GetListField(BoxInventoryQueryRequest dto, int companyId) { - return await GetPagedList(dto); + return await GetPagedList(dto,companyId); } } } diff --git a/src/WMS.Web.Repositories/InStockRepositories.cs b/src/WMS.Web.Repositories/InStockRepositories.cs index 00484b55..8ad4bd43 100644 --- a/src/WMS.Web.Repositories/InStockRepositories.cs +++ b/src/WMS.Web.Repositories/InStockRepositories.cs @@ -109,7 +109,7 @@ namespace WMS.Web.Repositories /// public async Task<(object obj, int total)> GetListField(InStockQueryRequest dto, int companyId) { - return await GetPagedList(dto); + return await GetPagedList(dto, companyId); } /// @@ -217,7 +217,7 @@ namespace WMS.Web.Repositories /// /// /// - public async Task<(List list, int total)> GetPagedList(InStockQueryRequest dto) + public async Task<(List list, int total)> GetPagedList(InStockQueryRequest dto, int companyId) { //1.获取物料集合和组织集合和供应商的集合 var materials = new List(); @@ -291,9 +291,9 @@ namespace WMS.Web.Repositories MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.detail.MaterialId), MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.detail.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.detail.MaterialId), - Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode + s.order.OrgCode), + Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.order.StockCode + s.order.OrgCode), Qty = s.detail.Qty, - Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId), + Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.CreatorId), CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), SuccessSync = s.order.SuccessSync == SyncStatus.Success ? "成功" : "失败", }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index c7db20a8..1bfc722a 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -419,7 +419,7 @@ namespace WMS.Web.Repositories /// public async Task<(object obj, int total)> GetListField(InStockTaskQueryRequest dto, int companyId) { - return await GetPagedList(dto); + return await GetPagedList(dto, companyId); } /// @@ -427,7 +427,7 @@ namespace WMS.Web.Repositories /// /// /// - public async Task<(List list, int total)> GetPagedList(InStockTaskQueryRequest dto) + public async Task<(List list, int total)> GetPagedList(InStockTaskQueryRequest dto, int companyId) { //1.获取物料集合和组织集合和供应商的集合 var materials = new List(); @@ -520,13 +520,13 @@ 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.StocksJoinOrgCode, _loginRepositories.CompanyId, s.detail.StockCode + s.detail.OrgCode), + Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.detail.StockCode + s.detail.OrgCode), AccruedQty = s.detail.AccruedQty, ReceiveQty = s.detail.ReceiveQty, RealityQty = s.detail.RealityQty, - Receiver = s.order.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ReceiverId.Value) : "", + Receiver = s.order.ReceiverId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.ReceiverId.Value) : "", ReceiveTime = s.order.ReceiveTime.HasValue ? s.order.ReceiveTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", - Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.ShelferId.Value) : "", + Shelfer = s.order.ShelferId.HasValue ? _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.order.ShelferId.Value) : "", ShelfTime = s.order.ShelfTime.HasValue ? s.order.ShelfTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", CreateTime = s.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), Remark = s.detail.Remark, diff --git a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs index 16103a3a..459231d7 100644 --- a/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryDetailsRepositories.cs @@ -52,8 +52,9 @@ namespace WMS.Web.Repositories /// 列表-分页 /// /// + /// /// - public async Task<(List list,int total)> GetPagedList(InventoryDetailsQueryRequest dto) + public async Task<(List list,int total)> GetPagedList(InventoryDetailsQueryRequest dto, int companyId) { //1.获取物料集合和组织集合 var materials = new List(); @@ -100,9 +101,9 @@ namespace WMS.Web.Repositories MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId), Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId), Org= _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode), - Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode + s.OrgCode), + Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.StockCode + s.OrgCode), Qty = s.Qty, - SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockId), + SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, companyId, s.SubStockId), Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId), }).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync(); @@ -177,7 +178,7 @@ namespace WMS.Web.Repositories /// public async Task<(object obj, int total)> GetListField(InventoryDetailsQueryRequest dto, int companyId) { - return await GetPagedList(dto); + return await GetPagedList(dto, companyId); } /// diff --git a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs index cac6f488..0c02ca00 100644 --- a/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs +++ b/src/WMS.Web.Repositories/InventoryInOutDetailsRepositories.cs @@ -53,8 +53,9 @@ namespace WMS.Web.Repositories /// 列表-分页 /// /// + /// /// - public async Task<(List list, int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto) + public async Task<(List list, int total)> GetPagedList(InventoryInOutDetailsQueryRequest dto, int companyId) { //1.获取物料集合和组织集合 var materials = new List(); @@ -108,7 +109,7 @@ namespace WMS.Web.Repositories OrderType=s.OrderType.GetRemark(), OrderBillNo=s.OrderBillNo, Org = _erpBasicDataExtendService.GetOrgName(orgs, s.OrgCode), - Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.StockCode+s.OrgCode), + Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, companyId, s.StockCode+s.OrgCode), Qty = s.Qty, SurplusQty=s.SurplusQty, CreateTime = s.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), @@ -155,7 +156,7 @@ namespace WMS.Web.Repositories /// public async Task<(object obj, int total)> GetListField(InventoryInOutDetailsQueryRequest dto, int companyId) { - return await GetPagedList(dto); + return await GetPagedList(dto,companyId); } } }