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

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

@@ -49,6 +49,23 @@ namespace WMS.Web.Domain.Infrastructure
         /// <param name="companyId"></param>
         /// <returns></returns>
         Task<List<UcSubStockResponse>> GetSubUcStockAsync(List<int> ids, int companyId);
+
+        /// <summary>
+        ///  获取仓位详情：根据仓位ID和公司ID
+        /// </summary>
+        /// <param name="code"></param>
+        /// <param name="companyId"></param>
+        /// <returns></returns>
+        Task<UcSubStockResponse> GetSubUcStockAsync(string code, int companyId);
+
+        /// <summary>
+        /// 获取仓位集合：根据仓位编码集合和公司ID
+        /// </summary>
+        /// <param name="codes"></param>
+        /// <param name="companyId"></param>
+        /// <returns></returns>
+        Task<List<UcSubStockResponse>> GetSubUcStockAsync(List<string> codes, int companyId);
+
         /// <summary>
         /// 获取仓库
         /// </summary>

src/WMS.Web.Domain/Services/ChangeMoveBoxService.cs

@@ -155,13 +155,13 @@ namespace WMS.Web.Domain.Services
             }
 
             List<ChangeBoxRecord> list = new List<ChangeBoxRecord>();
-            var subIds = dto.Select(s => s.SubStockId).ToList();
+            var subIds = dto.Select(s => s.SubStockCode).ToList();
             var subStocks = await _basbicsRepositories.GetSubUcStockAsync(subIds, loginInfo.UserInfo.CompanyId);
 
             var subStocks_s = await _basbicsRepositories.GetSubUcStockAsync(boxs.Select(s => s.SubStockId).ToList(), loginInfo.UserInfo.CompanyId);
             foreach (var dt in dto)
             {
-                var subStock = subStocks.FirstOrDefault(f => f.Id == dt.SubStockId);
+                var subStock = subStocks.FirstOrDefault(f => f.Code == dt.SubStockCode);
                 var boxi = boxs.FirstOrDefault(f => f.BoxId == dt.SrcBoxId);
                 var subStock_s = subStocks_s.FirstOrDefault(f => f.Id == (boxi?.SubStockId ?? 0));
                 foreach (var d in dt.Details)

src/WMS.Web.Repositories/BasicsRepositories.cs

@@ -102,7 +102,26 @@ namespace WMS.Web.Repositories
                 return null;
             return result.Data.ToList();
         }
-
+        /// <summary>
+        /// 获取仓位详情：根据仓位编码和公司ID
+        /// </summary>
+        /// <param name="code"></param>
+        /// <param name="companyId"></param>
+        /// <returns></returns>
+        public Task<UcSubStockResponse> GetSubUcStockAsync(string code, int companyId)
+        {
+            throw new NotImplementedException();
+        }
+        /// <summary>
+        /// 获取仓位集合：根据仓位编码集合和公司ID
+        /// </summary>
+        /// <param name="codes"></param>
+        /// <param name="companyId"></param>
+        /// <returns></returns>
+        public Task<List<UcSubStockResponse>> GetSubUcStockAsync(List<string> codes, int companyId)
+        {
+            throw new NotImplementedException();
+        }
         public async Task<List<UcStockResponse>> GetUcStockAsync(string systemCode, string name, int companyId)
         {
             var result = await _singleDataService.GetSysConfigData<ResultList<UcStockResponse>, SystemCodeRequest>
@@ -139,5 +158,7 @@ namespace WMS.Web.Repositories
             }
             return true;
         }
+
+        
     }
 }