diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index af1c87a8..5a1f52bb 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -3921,6 +3921,16 @@ 每页条数 不传默认每页10 条 + + + ID请求对象 + + + + + ID + + 名称请求对象 @@ -4081,6 +4091,11 @@ 仓库code + + + 对应的金蝶组织编码 + + 名称 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 4619520e..201b39a4 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -3200,30 +3200,6 @@ - - - 采购上架-箱库存变更--这个有点问题--请使用HandlBoxInventory - - - - - - - - 非采购上架-箱库存变更--这个有点问题--请使用HandlBoxInventory - - - - - - - - 出库下架-箱库存变更--这个有点问题--请使用HandlBoxInventory - - - - - 处理箱库存变更:出入库 @@ -5259,6 +5235,11 @@ 获取仓库::根据管理系统code和仓位名称和公司ID,备注系统code和公司ID是必填 + + + 获取仓位详情:根据仓位ID和公司ID + + 盘点单类型 diff --git a/src/WMS.Web.Core/Dto/SingleData/IdRequest.cs b/src/WMS.Web.Core/Dto/SingleData/IdRequest.cs new file mode 100644 index 00000000..e98999ff --- /dev/null +++ b/src/WMS.Web.Core/Dto/SingleData/IdRequest.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Core.Dto.SingleData +{ + /// + /// ID请求对象 + /// + public class IdRequest:SingleDataRequest + { + public IdRequest() { } + + public IdRequest(int id, int companyId) + { + this.Id = id; + this.CompanyId = companyId; + } + + /// + /// ID + /// + public int Id { get; set; } + } +} diff --git a/src/WMS.Web.Core/Dto/SingleData/UcSubStockResponse.cs b/src/WMS.Web.Core/Dto/SingleData/UcSubStockResponse.cs index 69a2dd1a..9362ce12 100644 --- a/src/WMS.Web.Core/Dto/SingleData/UcSubStockResponse.cs +++ b/src/WMS.Web.Core/Dto/SingleData/UcSubStockResponse.cs @@ -29,6 +29,11 @@ namespace WMS.Web.Core.Dto.SingleData /// public string StockCode { get; set; } + /// + /// 对应的金蝶组织编码 + /// + public string ErpOrgCode { get; set; } + /// /// 名称 diff --git a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs index 9e93c5c7..ada51881 100644 --- a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs @@ -33,6 +33,14 @@ namespace WMS.Web.Domain.Infrastructure /// /// Task> GetSubUcStockAsync(string systemCode, string name, int companyId); + + /// + /// 获取仓位详情:根据仓位ID和公司ID + /// + /// + /// + /// + Task GetSubUcStockAsync(int id, int companyId); /// /// 获取仓库 /// diff --git a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs index 32695fec..f9fb7656 100644 --- a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs +++ b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs @@ -192,5 +192,10 @@ namespace WMS.Web.Domain.Values.Single /// 获取仓库::根据管理系统code和仓位名称和公司ID,备注系统code和公司ID是必填 /// GetWmsSubWarehouseBySystemCodeAndNameAndCompany = 44, + + /// + /// 获取仓位详情:根据仓位ID和公司ID + /// + GetWmsSubWarehouseByIdAndCompany = 45, } } diff --git a/src/WMS.Web.Repositories/BasicsRepositories.cs b/src/WMS.Web.Repositories/BasicsRepositories.cs index e3b8c2b9..dded2071 100644 --- a/src/WMS.Web.Repositories/BasicsRepositories.cs +++ b/src/WMS.Web.Repositories/BasicsRepositories.cs @@ -71,6 +71,22 @@ namespace WMS.Web.Repositories return result.Data.ToList(); } + /// + /// 获取仓位详情:根据仓位ID和公司ID + /// + /// + /// + /// + public async Task GetSubUcStockAsync(int id, int companyId) + { + var result = await _singleDataService.GetSysConfigData, IdRequest> + (new IdRequest(id, companyId), + SysConfigAction.GetWmsSubWarehouseByIdAndCompany); + if (!result.Success) + return null; + return result.Data; + } + public async Task> GetUcStockAsync(string systemCode, string name, int companyId) { var result = await _singleDataService.GetSysConfigData, SystemCodeRequest>