盘点单增加子仓库

src/WMS.Web.Core/Dto/TakeStock/TakeStockQueryInfoResponse.cs

@@ -42,6 +42,10 @@ namespace WMS.Web.Core.Dto.TakeStock
         /// </summary>
         public string SubStock { get; set; }
         /// <summary>
+        /// 子仓库
+        /// </summary>
+        public string Erp_SubStockCode { get; set; }
+        /// <summary>
         /// 盘点前数量（wms系统数量）
         /// </summary>
         public decimal BeforeQty { get; set; }

src/WMS.Web.Domain/Services/Public/ErpService.cs

@@ -92,7 +92,7 @@ namespace WMS.Web.Domain.Services.Public
         /// <param name="billNo">模糊搜索</param>
         /// <param name="sourceBillNos">单据编号集合精确查找</param>
         /// <returns></returns>
-        public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(string billNo="", List<string> sourceBillNos = null)
+        public async Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(string billNo = "", List<string> sourceBillNos = null)
         {
             try
             {
@@ -140,7 +140,7 @@ namespace WMS.Web.Domain.Services.Public
                 //单据编号模糊查询
                 if (!string.IsNullOrEmpty(billNo))
                 {
-                    param.FilterString = param.FilterString + " and FBillNo like '%"+billNo+"%'";
+                    param.FilterString = param.FilterString + " and FBillNo like '%" + billNo + "%'";
                 }
 
                 //根据原订单号查询
@@ -550,6 +550,11 @@ namespace WMS.Web.Domain.Services.Public
         public async Task<ResultList<ErpStockDto>> BillQueryForSubStock(string code = null)
         {
             try
+            {
+                //1.获取缓存中的仓库数据；
+                var cache_key = "erp_substock_list";
+                var stocks = _memoryCache.Get<List<ErpStockDto>>(cache_key);
+                if (stocks == null || stocks.Count == 0)
                 {
                     var token_result = await this.Init();
                     if (!token_result.IsSuccess)
@@ -577,8 +582,15 @@ namespace WMS.Web.Domain.Services.Public
                         list.Add(lis);
 
                     }
+                    //5.供应商集合进行缓存
+                    _memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
+                    _logger.LogInformation($"子仓库拉取-总条数：{list.Count}");
                     return ResultList<ErpStockDto>.ReSuccess(list);
-
+                }
+                else
+                {
+                    return ResultList<ErpStockDto>.ReSuccess(stocks);
+                }
             }
             catch (Exception)
             {

src/WMS.Web.Repositories/TakeStockRepositories.cs

@@ -166,6 +166,11 @@ namespace WMS.Web.Repositories
             if (!materials_result.IsSuccess)
                 return (new List<TakeStockQueryInfoResponse>(), 0);
             var materials = materials_result.Data.ToList();
+            //金蝶子仓库
+            var subStock_result = await _erpService.BillQueryForSubStock();
+            if (!subStock_result.IsSuccess)
+                return (new List<TakeStockQueryInfoResponse>(), 0);
+            var subStocks = subStock_result.Data.ToList();
 
             var query = _context.TakeStock
                //.GroupJoin(_context.TakeStock, detail => detail.Fid, order => order.Id, (detail, orders) => new { detail, orders })
@@ -193,6 +198,7 @@ namespace WMS.Web.Repositories
                 Unit = _erpBasicDataExtendService.GetMaterialUnitName(materials, s.MaterialId),
                 Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
                 SubStock = _singleDataService.GetSingleData(SingleAction.SubStocks, _loginRepositories.CompanyId, s.SubStockCode),
+                Erp_SubStockCode= _erpBasicDataExtendService.GetStockName(subStocks, s.Erp_SubStockCode),
                 BeforeQty = s.BeforeQty,
                 AfterQty = s.AfterQty,
                 FinalQty = s.FinalQty,