Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

src/WMS.Web.Api/Controllers/SysConfigController.cs

@@ -6,7 +6,10 @@ using System.Linq;
 using System.Threading.Tasks;
 using WMS.Web.Core;
 using WMS.Web.Core.Dto;
+using WMS.Web.Core.Dto.SingleData;
 using WMS.Web.Core.Internal.Results;
+using WMS.Web.Domain.Infrastructure;
+using WMS.Web.Domain.IService.Public;
 using WMS.Web.Domain.Values;
 
 namespace WMS.Web.Api.Controllers
@@ -18,8 +21,12 @@ namespace WMS.Web.Api.Controllers
     [ApiController]
     public class SysConfigController : ControllerBase
     {
-        public SysConfigController()
+        private readonly ILoginService _loginService;
+        private readonly IBasicsRepositories _basicsRepositories;
+        public SysConfigController(ILoginService loginService, IBasicsRepositories basicsRepositories)
         {
+            _loginService = loginService;
+            _basicsRepositories = basicsRepositories;
         }
 
         /// <summary>
@@ -55,5 +62,38 @@ namespace WMS.Web.Api.Controllers
             //1
             return Task.FromResult(Result<EnumStatusResponse>.ReSuccess(response));
         }
+
+        /// <summary>
+        /// 获取仓库
+        /// </summary>
+        /// <param name="name">仓库模糊匹配 不必填</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetUcStock")]
+        public async Task<ResultList<UcStockResponse>> GetUcStock([FromQuery] string name)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return ResultList<UcStockResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+            var r = await _basicsRepositories.GetUcStockAsync(name, loginInfo.UserInfo.CompanyId);
+            return ResultList<UcStockResponse>.ReSuccess(r);
+        }
+
+        /// <summary>
+        /// 根据仓库获取仓位
+        /// </summary>
+        /// <param name="id">仓库id</param>
+        ///  <param name="name">仓库模糊匹配 不必填</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetSubUcStock/{id}")]
+        public async Task<Result<List<UcStockResponse>>> GetSubUcStock([FromRoute] int id, [FromQuery] string name)
+        {
+            var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
+            if (loginInfo == null || loginInfo.UserInfo == null)
+                return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
+            var r = await _basicsRepositories.GetSubUcStockAsync(id, name);
+            return Result<List<UcStockResponse>>.ReSuccess(r);
+        }
     }
 }

src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml

@@ -182,6 +182,21 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetUcStock(System.String)">
+            <summary>
+            获取仓库
+            </summary>
+            <param name="name">仓库模糊匹配 不必填</param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStock(System.Int32,System.String)">
+            <summary>
+            根据仓库获取仓位
+            </summary>
+            <param name="id">仓库id</param>
+             <param name="name">仓库模糊匹配 不必填</param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Api.Controllers.TakeStockController">
             <summary>
             盘点单

src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml

@@ -92,12 +92,12 @@
         </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryRequest.SrcBox">
             <summary>
-            原箱子ID
+            原箱子
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryRequest.DestBox">
             <summary>
-            目标箱子ID
+            目标箱子
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.ChangeBoxRecordQueryRequest.StockId">
@@ -1480,6 +1480,16 @@
             每页条数 不传默认每页10 条
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.SingleData.NameRequest">
+            <summary>
+            名称请求对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.NameRequest.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.SingleData.SingleDataRequest">
             <summary>
             单点数据-请求统一对象
@@ -1520,6 +1530,71 @@
             是否禁用：true为禁用，false为启用
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.SingleData.SubStockRequest">
+            <summary>
+            仓位
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.SubStockRequest.StockId">
+            <summary>
+            仓库ID
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.SingleData.SysStaffResponse">
+            <summary>
+            员工响应
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.Id">
+            <summary>
+            StaffID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.Name">
+            <summary>
+            名称
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.DeptId">
+            <summary>
+            部门ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.Telephone">
+            <summary>
+            电话
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.SysStaffResponse.Disable">
+            <summary>
+            是否禁用：true为禁用，false为启用
+            </summary>
+        </member>
+        <member name="T:WMS.Web.Core.Dto.SingleData.UcStockResponse">
+            <summary>
+            仓库响应
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcStockResponse.Id">
+            <summary>
+            id
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcStockResponse.Name">
+            <summary>
+            名称
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcStockResponse.Code">
+            <summary>
+            编码
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcStockResponse.Disable">
+            <summary>
+            是否禁用：true为禁用，false为启用
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest">
             <summary>
             盘点单明细

src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml

@@ -980,6 +980,31 @@
             备注
             </summary>
         </member>
+        <member name="T:WMS.Web.Domain.Infrastructure.IBasicsRepositories">
+            <summary>
+            基础数据
+            </summary>
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetStaffListAsync(System.Int32)">
+            <summary>
+            获取所有人员-根据主体
+            </summary>
+            <param name="CompanyId"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetSubUcStockAsync(System.Int32,System.String)">
+            <summary>
+            根据仓库获取子仓库
+            </summary>
+            <param name="id">仓库id</param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetUcStockAsync(System.String,System.Int32)">
+            <summary>
+            获取仓库
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Infrastructure.IInStockRepositories">
             <summary>
             wms入库单-仓储接口