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

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

@@ -1012,11 +1012,17 @@ namespace WMS.Web.Domain.Services.Public
                     param.Limit = 10000;
                     //查询条件：备注其中的条件值以金蝶的值为准！！！
                     param.FilterString = "";
-
+                    var list = new List<ErpCustomerDto>();
                     //备注：因为供应商数据不是很多，就不能和获取物料一样循环获取；组织这里就获取10000条数据就行了
                     var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
                     _logger.LogInformation($"供应商拉取-开始时间：{beginTime}");
+                    int skip = 0;
                     //4.参数json化
+                    while (true)
+                    {
+                        //4.1.页码：页码按照金蝶的要求从0开始
+                        param.StartRow = (Convert.ToInt32(skip) * param.Limit);
+
                         query.Data = JsonConvert.SerializeObject(param);
                         var json = JsonConvert.SerializeObject(query);
 
@@ -1024,10 +1030,10 @@ namespace WMS.Web.Domain.Services.Public
                         var result_json = await _client.ExecuteBillQueryAsync(json);
                         var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
 
-                    var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
-                    _logger.LogInformation($"供应商拉取-结束时间：{endTime}");
+                        if (result == null || result.Count == 0)
+                            break;
+
                         //6.拼装
-                    var list = new List<ErpCustomerDto>();
                         foreach (var item in result)
                         {
                             var lis = new ErpCustomerDto();
@@ -1037,6 +1043,11 @@ namespace WMS.Web.Domain.Services.Public
                             list.Add(lis);
 
                         }
+                        //4.6页面的叠加
+                        skip++;
+                    }
+                    var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff");
+                    _logger.LogInformation($"供应商拉取-结束时间：{endTime}");
                     //5.供应商集合进行缓存
                     _memoryCache.Set(cache_key, list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromHours(12)));
                     _logger.LogInformation($"供应商拉取-总条数：{list.Count}");