公共接口

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

@@ -119,13 +119,13 @@ namespace WMS.Web.Api.Controllers
         /// <returns></returns>
         [HttpGet]
         [Route("GetSubUcStockByName/{name}")]
-        public async Task<Result<List<UcStockResponse>>> GetSubUcStockByName([FromRoute] string name)
+        public async Task<Result<List<UcSubStockResponse>>> 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);
+                return Result<List<UcSubStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
             var r = await _basicsRepositories.GetSubUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), name, loginInfo.UserInfo.CompanyId);
-            return Result<List<UcStockResponse>>.ReSuccess(r);
+            return Result<List<UcSubStockResponse>>.ReSuccess(r);
         }
 
         /// <summary>

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

@@ -960,9 +960,14 @@
             ID
             </summary>
         </member>
-        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.Fid">
+        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.SupplierId">
             <summary>
-            单据ID(等同-入库任务单ID)
+            供应商Id
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.OrgId">
+            <summary>
+            组织ID
             </summary>
         </member>
         <member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto.MaterialId">
@@ -2745,6 +2750,41 @@
             是否禁用：true为禁用，false为启用
             </summary>
         </member>
+        <member name="T:WMS.Web.Core.Dto.SingleData.UcSubStockResponse">
+            <summary>
+            仓位响应对象
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcSubStockResponse.Id">
+            <summary>
+            id
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcSubStockResponse.StockId">
+            <summary>
+            仓库ID
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcSubStockResponse.StockName">
+            <summary>
+            仓库名称
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcSubStockResponse.StockCode">
+            <summary>
+            仓库code
+            </summary>
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcSubStockResponse.Name">
+            <summary>
+            名称
+            </summary> 
+        </member>
+        <member name="P:WMS.Web.Core.Dto.SingleData.UcSubStockResponse.Code">
+            <summary>
+            编码
+            </summary>
+        </member>
         <member name="T:WMS.Web.Core.Dto.TakeStock.SaveTakeStockRequest">
             <summary>
             盘点单明细

src/WMS.Web.Core/Dto/InStockTask/InStockTaskDetailsInfoDto.cs

@@ -13,10 +13,15 @@ namespace WMS.Web.Core.Dto.InStockTask
         /// ID
         /// </summary>
         public int Id { get; set; }
+
         /// <summary>
-        /// 单据ID(等同-入库任务单ID)
+        /// 供应商Id
         /// </summary>
-        public int Fid { get; set; }
+        public int SupplierId { get; set; }
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        public int OrgId { get; set; }
 
         /// <summary>
         /// 物料ID

src/WMS.Web.Core/Dto/SingleData/UcSubStockResponse.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace WMS.Web.Core.Dto.SingleData
+{
+    /// <summary>
+    /// 仓位响应对象
+    /// </summary>
+    public class UcSubStockResponse
+    {
+        /// <summary>
+        /// id
+        /// </summary> 
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 仓库ID
+        /// </summary>
+        public int StockId { get; set; }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string StockName { get; set; }
+
+        /// <summary>
+        /// 仓库code
+        /// </summary>
+        public string StockCode { get; set; }
+
+
+        /// <summary>
+        /// 名称
+        /// </summary> 
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 编码
+        /// </summary>
+        public string Code { get; set; }
+    }
+}

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

@@ -31,7 +31,7 @@ namespace WMS.Web.Domain.Infrastructure
         /// <param name="name"></param>
         /// <param name="companyId"></param>
         /// <returns></returns>
-        Task<List<UcStockResponse>> GetSubUcStockAsync(string systemCode, string name, int companyId);
+        Task<List<UcSubStockResponse>> GetSubUcStockAsync(string systemCode, string name, int companyId);
         /// <summary>
         /// 获取仓库
         /// </summary>

src/WMS.Web.Repositories/BasicsRepositories.cs

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