盘点单增加子仓库

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
             {
@@ -122,7 +122,7 @@ namespace WMS.Web.Domain.Services.Public
                 //3.单据类型：标准采购订单和标准委外订单
                 //4.明细关闭状态：正常
                 //5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
-                param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";                
+                param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and (FBillTypeID='83d822ca3e374b4ab01e5dd46a0062bd' or FBillTypeID='6d01d059713d42a28bb976c90a121142') and FMRPCloseStatus='A'";
                 param.FilterString = param.FilterString + " and FSOSTOCKID.FNumber in (";
 
                 var str = "";
@@ -138,9 +138,9 @@ namespace WMS.Web.Domain.Services.Public
                 param.FilterString = param.FilterString + str + ")";
 
                 //单据编号模糊查询
-                if (!string.IsNullOrEmpty(billNo)) 
+                if (!string.IsNullOrEmpty(billNo))
                 {
-                    param.FilterString = param.FilterString + " and FBillNo like '%"+billNo+"%'";
+                    param.FilterString = param.FilterString + " and FBillNo like '%" + billNo + "%'";
                 }
 
                 //根据原订单号查询
@@ -272,7 +272,7 @@ namespace WMS.Web.Domain.Services.Public
 
                 return ResultList<ErpMaterialDto>.ReFailure(ResultCodes.ErpMaterialError);
             }
-            
+
 
         }
 
@@ -551,34 +551,46 @@ namespace WMS.Web.Domain.Services.Public
         {
             try
             {
-                var token_result = await this.Init();
+                //1.获取缓存中的仓库数据；
-                if (!token_result.IsSuccess)
+                var cache_key = "erp_substock_list";
-                    return ResultList<ErpStockDto>.ReFailure(token_result);
+                var stocks = _memoryCache.Get<List<ErpStockDto>>(cache_key);
-                var query = new ErpBillQueryDto(token_result.Data);
+                if (stocks == null || stocks.Count == 0)
-                var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
-                param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'";
-                param.Limit = 100000;
-                if (!string.IsNullOrEmpty(code))
-                    param.FilterString = "FNumber='" + code + "'";//FNumber='C'
-                query.Data = JsonConvert.SerializeObject(param);
-                var json = JsonConvert.SerializeObject(query);
-
-                var result_json = await _client.ExecuteBillQueryAsync(json);
-                var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
-
-                var list = new List<ErpStockDto>();
-                foreach (var item in result)
                 {
-                    var lis = new ErpStockDto();
+                    var token_result = await this.Init();
-                    lis.Id = int.Parse(item[0]);
+                    if (!token_result.IsSuccess)
-                    lis.Name = item[1];
+                        return ResultList<ErpStockDto>.ReFailure(token_result);
-                    lis.Code = item[2];
+                    var query = new ErpBillQueryDto(token_result.Data);
-                    lis.OrgId = Convert.ToInt32(item[3]);
+                    var param = new ErpBillQueryParamDto(FormIdParam.BD_STOCK.ToString());
-                    list.Add(lis);
+                    param.FieldKeys = "FStockFlexDetail_FDetailID,FFlexEntryName,FFlexEntryId,'0'";
+                    param.Limit = 100000;
+                    if (!string.IsNullOrEmpty(code))
+                        param.FilterString = "FNumber='" + code + "'";//FNumber='C'
+                    query.Data = JsonConvert.SerializeObject(param);
+                    var json = JsonConvert.SerializeObject(query);
 
+                    var result_json = await _client.ExecuteBillQueryAsync(json);
+                    var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
+
+                    var list = new List<ErpStockDto>();
+                    foreach (var item in result)
+                    {
+                        var lis = new ErpStockDto();
+                        lis.Id = int.Parse(item[0]);
+                        lis.Name = item[1];
+                        lis.Code = item[2];
+                        lis.OrgId = Convert.ToInt32(item[3]);
+                        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);
                 }
-                return ResultList<ErpStockDto>.ReSuccess(list);
-
             }
             catch (Exception)
             {
@@ -1089,7 +1101,7 @@ namespace WMS.Web.Domain.Services.Public
             }
         }
 
-       
+
 
         #endregion
     }

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,