From 94040ba63dc5d4ed584a0e99d9ef2e7150ecbe1e Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Mon, 4 Nov 2024 16:06:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=98=9F=E6=B5=B7=E5=A4=96=E4=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 276926 -> 276926 bytes .../Dto/LingXing/LingXingRequest.cs | 5 +++++ .../Services/Public/LingXingService.cs | 17 ++++++++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index ef3222e1a00db412260917043c264e13abeb8e90..fc3f0c8a2f8629df326301a2e231ba9496b6cd30 100644 GIT binary patch delta 29446 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 AZvX%Q delta 28791 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 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())));