diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index ef3222e1..fc3f0c8a 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Core/Dto/LingXing/LingXingRequest.cs b/src/WMS.Web.Core/Dto/LingXing/LingXingRequest.cs index 79042351..d4df39b9 100644 --- a/src/WMS.Web.Core/Dto/LingXing/LingXingRequest.cs +++ b/src/WMS.Web.Core/Dto/LingXing/LingXingRequest.cs @@ -20,5 +20,10 @@ namespace WMS.Web.Core.Dto.LingXing /// [JsonProperty("length")] public int length { get; set; } = 800; + /// + /// 海外仓 + /// + [JsonProperty("type")] + public int type { get; set; } = 1; } } diff --git a/src/WMS.Web.Domain/Services/Public/LingXingService.cs b/src/WMS.Web.Domain/Services/Public/LingXingService.cs index 71d100c6..805e8021 100644 --- a/src/WMS.Web.Domain/Services/Public/LingXingService.cs +++ b/src/WMS.Web.Domain/Services/Public/LingXingService.cs @@ -77,6 +77,8 @@ namespace WMS.Web.Domain.Services.Public if (stock_list != null && stock_list.Count > 0) return Result>.ReSuccess(stock_list); + List list = new List(); + //默认获取本地仓库 如果需要海外仓 另外需传参数type var request = new LingXingRequest(); var resUrl = await GetStr("/erp/sc/data/local_inventory/warehouse", request); @@ -85,7 +87,20 @@ namespace WMS.Web.Domain.Services.Public var res = await _httpClientService.PostAsync(resUrl.Data, JsonConvert.SerializeObject(request), null); if (res.Code != 0) return Result>.ReFailure(ResultCodes.LingXingDataError); - var list = JsonConvert.DeserializeObject>(res.Data.ToString()); + list.AddRange(JsonConvert.DeserializeObject>(res.Data.ToString())); + + //海外仓 + request = new LingXingRequest(); + request.type = 3; + resUrl = await GetStr("/erp/sc/data/local_inventory/warehouse", request); + if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); + + res = await _httpClientService.PostAsync(resUrl.Data, JsonConvert.SerializeObject(request), null); + if (res.Code != 0) return Result>.ReFailure(ResultCodes.LingXingDataError); + + list.AddRange(JsonConvert.DeserializeObject>(res.Data.ToString())); + + //设置缓存 _memoryCache.Set("lingxing_stock", list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromMinutes(DateTimeUtil.GetTotalMinutesTimeSpan())));