模糊仓位

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

@@ -100,7 +100,6 @@ namespace WMS.Web.Api.Controllers
         /// 根据仓库获取仓位
         /// </summary>
         /// <param name="id">仓库id</param>
-        ///  <param name="name">仓库模糊匹配 不必填</param>
         /// <returns></returns>
         [HttpGet]
         [Route("GetSubUcStock/{id}")]
@@ -113,6 +112,22 @@ namespace WMS.Web.Api.Controllers
             return Result<List<UcStockResponse>>.ReSuccess(r);
         }
 
+        /// <summary>
+        /// 根据仓库获取仓位
+        /// </summary>
+        ///  <param name="name">仓库模糊匹配 不必填</param>
+        /// <returns></returns>
+        [HttpGet]
+        [Route("GetSubUcStock/{name}")]
+        public async Task<Result<List<UcStockResponse>>> GetSubUcStockByName([FromRoute] 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(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
+            return Result<List<UcStockResponse>>.ReSuccess(r);
+        }
+
         /// <summary>
         /// 根据箱号获取箱信息
         /// </summary>

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

@@ -246,6 +246,12 @@
             根据仓库获取仓位
             </summary>
             <param name="id">仓库id</param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String)">
+            <summary>
+            根据仓库获取仓位
+            </summary>
              <param name="name">仓库模糊匹配 不必填</param>
             <returns></returns>
         </member>

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

@@ -1080,6 +1080,15 @@
             <param name="id">仓库id</param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetSubUcStockAsync(System.String,System.String,System.Int32)">
+            <summary>
+            获取仓位：根据name模糊，和系统code和公司
+            </summary>
+            <param name="systemCode"></param>
+            <param name="name"></param>
+            <param name="companyId"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.Infrastructure.IBasicsRepositories.GetUcStockAsync(System.String,System.String,System.Int32)">
             <summary>
             获取仓库
@@ -2030,18 +2039,12 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:WMS.Web.Domain.Services.Public.ErpService.TakeStock_Profit(WMS.Web.Domain.Entitys.TakeStock)">
+        <member name="M:WMS.Web.Domain.Services.Public.ErpService.Sync``1(``0,System.String)">
             <summary>
-            盘盈
+            同步数据(保存提交审核)
             </summary>
-            <param name="entity"></param>
+            <param name="dto"></param>
-            <returns></returns>
+            <param name="formId"></param>
-        </member>
-        <member name="M:WMS.Web.Domain.Services.Public.ErpService.TakeStock_Loss(WMS.Web.Domain.Entitys.TakeStock)">
-            <summary>
-            盘亏
-            </summary>
-            <param name="entity"></param>
             <returns></returns>
         </member>
         <member name="M:WMS.Web.Domain.Services.Public.HttpClientService.GetAsync``1(System.String,System.Int32)">
@@ -2407,6 +2410,20 @@
             <param name="dto"></param>
             <returns></returns>
         </member>
+        <member name="M:WMS.Web.Domain.Services.TakeStockService.Profit(WMS.Web.Domain.Entitys.TakeStock)">
+            <summary>
+            盘盈
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
+        <member name="M:WMS.Web.Domain.Services.TakeStockService.Loss(WMS.Web.Domain.Entitys.TakeStock)">
+            <summary>
+            盘亏
+            </summary>
+            <param name="entity"></param>
+            <returns></returns>
+        </member>
         <member name="T:WMS.Web.Domain.Values.BackRecordType">
             <summary>
             出入库回退类型
@@ -3087,6 +3104,11 @@
             获取仓库:：根据管理系统code和仓库名称和公司ID，备注系统code和公司ID是必填
             </summary>
         </member>
+        <member name="F:WMS.Web.Domain.Values.Single.SysConfigAction.GetWmsSubWarehouseBySystemCodeAndNameAndCompany">
+            <summary>
+            获取仓库:：根据管理系统code和仓位名称和公司ID，备注系统code和公司ID是必填
+            </summary>
+        </member>
         <member name="T:WMS.Web.Domain.Values.TakeStockType">
             <summary>
             盘点单类型

src/WMS.Web.Domain/Infrastructure/IBasicsRepositories.cs

@@ -23,6 +23,15 @@ namespace WMS.Web.Domain.Infrastructure
         /// <param name="id">仓库id</param>
         /// <returns></returns>
         Task<List<UcStockResponse>> GetSubUcStockAsync(int stockId);
+
+        /// <summary>
+        /// 获取仓位：根据name模糊，和系统code和公司
+        /// </summary>
+        /// <param name="systemCode"></param>
+        /// <param name="name"></param>
+        /// <param name="companyId"></param>
+        /// <returns></returns>
+        Task<List<UcStockResponse>> GetSubUcStockAsync(string systemCode, string name, int companyId);
         /// <summary>
         /// 获取仓库
         /// </summary>

src/WMS.Web.Domain/Values/Single/SysConfigAction.cs

@@ -187,5 +187,10 @@ namespace WMS.Web.Domain.Values.Single
         /// 获取仓库:：根据管理系统code和仓库名称和公司ID，备注系统code和公司ID是必填
         /// </summary>
         GetWmsWarehouseBySystemCodeAndNameAndCompany=43,
+
+        /// <summary>
+        /// 获取仓库:：根据管理系统code和仓位名称和公司ID，备注系统code和公司ID是必填
+        /// </summary>
+        GetWmsSubWarehouseBySystemCodeAndNameAndCompany = 44,
     }
 }

src/WMS.Web.Repositories/BasicsRepositories.cs

@@ -60,6 +60,16 @@ namespace WMS.Web.Repositories
             return result.Data.ToList();
         }
 
+        public async Task<List<UcStockResponse>> GetSubUcStockAsync(string systemCode, string name, int companyId)
+        {
+            var result = await _singleDataService.GetSysConfigData<ResultList<UcStockResponse>, SystemCodeRequest>
+           (new SystemCodeRequest(systemCode, name, companyId),
+           SysConfigAction.GetWmsSubWarehouseBySystemCodeAndNameAndCompany);
+            if (!result.Success)
+                return null;
+            return result.Data.ToList();
+        }
+
         public async Task<List<UcStockResponse>> GetUcStockAsync(string systemCode, string name, int companyId)
         {
             var result = await _singleDataService.GetSysConfigData<ResultList<UcStockResponse>, SystemCodeRequest>