From da5f3cdb33732feeeff3764cc0e51de977bbb47f Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Thu, 2 Nov 2023 13:44:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/SysConfigController.cs | 6 +-- src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml | 2 +- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 54 ++++++++++++++++--- src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 38 +++++++++++-- .../Dto/SingleData/SubStockRequest.cs | 6 +-- .../Dto/SingleData/SystemCodeRequest.cs | 32 +++++++++++ .../Infrastructure/IBasicsRepositories.cs | 4 +- .../Values/ManagementSystemCode.cs | 17 ++++++ .../Values/Single/SysConfigAction.cs | 7 ++- .../BasicsRepositories.cs | 14 ++--- 10 files changed, 152 insertions(+), 28 deletions(-) create mode 100644 src/WMS.Web.Core/Dto/SingleData/SystemCodeRequest.cs create mode 100644 src/WMS.Web.Domain/Values/ManagementSystemCode.cs diff --git a/src/WMS.Web.Api/Controllers/SysConfigController.cs b/src/WMS.Web.Api/Controllers/SysConfigController.cs index 319947c3..46d87bc1 100644 --- a/src/WMS.Web.Api/Controllers/SysConfigController.cs +++ b/src/WMS.Web.Api/Controllers/SysConfigController.cs @@ -92,7 +92,7 @@ namespace WMS.Web.Api.Controllers var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return ResultList.ReFailure(ResultCodes.Token_Invalid_Error); - var r = await _basicsRepositories.GetUcStockAsync(name, loginInfo.UserInfo.CompanyId); + var r = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId); return ResultList.ReSuccess(r); } @@ -104,12 +104,12 @@ namespace WMS.Web.Api.Controllers /// [HttpGet] [Route("GetSubUcStock/{id}")] - public async Task>> GetSubUcStock([FromRoute] int id, [FromQuery] string name) + public async Task>> GetSubUcStock([FromRoute] int id) { var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]); if (loginInfo == null || loginInfo.UserInfo == null) return Result>.ReFailure(ResultCodes.Token_Invalid_Error); - var r = await _basicsRepositories.GetSubUcStockAsync(id, name); + var r = await _basicsRepositories.GetSubUcStockAsync(id); return Result>.ReSuccess(r); } diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml index 9dd085f7..18630b52 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml @@ -241,7 +241,7 @@ 仓库模糊匹配 不必填 - + 根据仓库获取仓位 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 25d9e6f7..90848987 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -605,6 +605,31 @@ 仓库编码 + + + 仓库信息 + + + + + id + + + + + 编码 + + + + + 名字 + + + + + 业务组织(使用组织)编码 + + Erp同步数据时单据头 @@ -627,7 +652,7 @@ - 单据类型(标准盘亏单; 标准盘盈单) + 单据类型(标准盘亏单; 标准盘盈单 PY01_SYS) 盘亏 PK01_SYS @@ -637,7 +662,7 @@ - 货主类型: 默认为业务组织 + 货主类型: 默认为业务组织 BD_OwnerOrg @@ -657,17 +682,17 @@ - 库存状态 + 库存状态 KCZT001 - - 货主类型: 默认为业务组织 + + 货主类型: 默认为业务组织 BD_OwnerOrg - 取仓库对应的货主信息 + 取仓库对应的货主信息 货主: 等于库存组织 @@ -677,7 +702,7 @@ - 保管者 + 保管者 仓库”库存组织” @@ -2130,6 +2155,21 @@ 是否禁用：true为禁用，false为启用 + + + 系统code获取 + + + + + 系统code + + + + + 仓库名称 + + 仓库响应 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 0f00a434..998e98dd 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1073,14 +1073,14 @@ - + 根据仓库获取子仓库 仓库id - + 获取仓库 @@ -1393,6 +1393,12 @@ + + + 获取仓库信息 + + + 登录服务接口 @@ -2013,6 +2019,12 @@ + + + 获取使用组织 + + + Get方法 @@ -2436,6 +2448,11 @@ 供应商 + + + 仓库 + + 入库状态 @@ -2506,6 +2523,16 @@ 出库 + + + 管理系统的编码：这里的枚举值跟单点的（仓库管理系统表）数据同步编码就行了 + + + + + WMS系统 + + 移箱类型 @@ -2923,7 +2950,7 @@ - 仓位-根据仓库和名称 + 仓位-根据仓库 @@ -3026,6 +3053,11 @@ 获取全部员工：根据公司和组织 + + + 获取仓库:：根据管理系统code和仓库名称和公司ID，备注系统code和公司ID是必填 + + 盘点单类型 diff --git a/src/WMS.Web.Core/Dto/SingleData/SubStockRequest.cs b/src/WMS.Web.Core/Dto/SingleData/SubStockRequest.cs index 1973b991..0ed0925d 100644 --- a/src/WMS.Web.Core/Dto/SingleData/SubStockRequest.cs +++ b/src/WMS.Web.Core/Dto/SingleData/SubStockRequest.cs @@ -7,15 +7,13 @@ namespace WMS.Web.Core.Dto.SingleData /// /// 仓位 /// - public class SubStockRequest:NameRequest + public class SubStockRequest { public SubStockRequest() { } - public SubStockRequest(int stockId,string name,int companyId) + public SubStockRequest(int stockId) { this.StockId = stockId; - this.Name = name; - this.CompanyId = companyId; } /// diff --git a/src/WMS.Web.Core/Dto/SingleData/SystemCodeRequest.cs b/src/WMS.Web.Core/Dto/SingleData/SystemCodeRequest.cs new file mode 100644 index 00000000..64801546 --- /dev/null +++ b/src/WMS.Web.Core/Dto/SingleData/SystemCodeRequest.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Text; + +namespace WMS.Web.Core.Dto.SingleData +{ + /// + /// 系统code获取 + /// + public class SystemCodeRequest : SingleDataRequest + { + public SystemCodeRequest() { } + + public SystemCodeRequest(string systemCode,string name, int companyId) + { + this.Code = systemCode; + this.Name = name; + this.CompanyId = companyId; + } + /// + /// 系统code + /// + [Required(ErrorMessage = "系统code不能未空")] + public string Code { get; set; } + + /// + /// 仓库名称 + /// + public string Name { get; set; } + } +} diff --git a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs index d059a4d0..461d6a5e 100644 --- a/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs +++ b/src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs @@ -22,11 +22,11 @@ namespace WMS.Web.Domain.Infrastructure /// /// 仓库id /// - Task> GetSubUcStockAsync(int id, string name); + Task> GetSubUcStockAsync(int stockId); /// /// 获取仓库 /// /// - Task> GetUcStockAsync(string name, int companyId); + Task> GetUcStockAsync(string systemCode,string name, int companyId); } } diff --git a/src/WMS.Web.Domain/Values/ManagementSystemCode.cs b/src/WMS.Web.Domain/Values/ManagementSystemCode.cs new file mode 100644 index 00000000..49d24d88 --- /dev/null +++ b/src/WMS.Web.Domain/Values/ManagementSystemCode.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WMS.Web.Domain.Values +{ + /// + /// 管理系统的编码：这里的枚举值跟单点的（仓库管理系统表）数据同步编码就行了 + /// + public enum ManagementSystemCode + { + /// + /// WMS系统 + /// + GLXT0004=1, + } +} diff --git a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs index 569ba8de..7eff3c32 100644 --- a/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs +++ b/src/WMS.Web.Domain/Values/Single/SysConfigAction.cs @@ -95,7 +95,7 @@ namespace WMS.Web.Domain.Values.Single GetWareouseByCustomerAndCompany = 21, /// - /// 仓位-根据仓库和名称 + /// 仓位-根据仓库 /// GetChildWarehouseByPid = 22, /// @@ -182,5 +182,10 @@ namespace WMS.Web.Domain.Values.Single /// 获取全部员工：根据公司和组织 /// GetStaffAllByOrgAndCompany = 42, + + /// + /// 获取仓库:：根据管理系统code和仓库名称和公司ID，备注系统code和公司ID是必填 + /// + GetWmsWarehouseBySystemCodeAndNameAndCompany=43, } } diff --git a/src/WMS.Web.Repositories/BasicsRepositories.cs b/src/WMS.Web.Repositories/BasicsRepositories.cs index c73b0b20..a90fb896 100644 --- a/src/WMS.Web.Repositories/BasicsRepositories.cs +++ b/src/WMS.Web.Repositories/BasicsRepositories.cs @@ -50,21 +50,21 @@ namespace WMS.Web.Repositories return result.Data.ToList(); } - public async Task> GetSubUcStockAsync(int id, string name) + public async Task> GetSubUcStockAsync(int stockId) { var result = await _singleDataService.GetSysConfigData, SubStockRequest> - (new SubStockRequest(id, name, _loginService.CompanyId), - SysConfigAction.GetWareouseByCustomerAndCompany); + (new SubStockRequest(stockId), + SysConfigAction.GetChildWarehouseByPid); if (!result.Success) return null; return result.Data.ToList(); } - public async Task> GetUcStockAsync(string name, int companyId) + public async Task> GetUcStockAsync(string systemCode, string name, int companyId) { - var result = await _singleDataService.GetSysConfigData, NameRequest> - (new NameRequest(name, companyId), - SysConfigAction.GetWarehouseByNameAndCompany); + var result = await _singleDataService.GetSysConfigData, SystemCodeRequest> + (new SystemCodeRequest(systemCode,name, companyId), + SysConfigAction.GetWmsWarehouseBySystemCodeAndNameAndCompany); if (!result.Success) return null; return result.Data.ToList();