From 98674ceced4ac3aa393cddf6b0bb6700cd224af8 Mon Sep 17 00:00:00 2001 From: 18942506660 <18942506660@A18942506660> Date: Thu, 24 Oct 2024 09:54:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 275060 -> 275060 bytes src/WMS.Web.Api/Controllers/TestController.cs | 4 ++-- .../Services/Public/JuShuiTanService.cs | 15 ++++++++++++++- .../Services/Public/LingXingService.cs | 18 +++++++++++++++--- src/WMS.Web.Domain/Values/ResultCodes.cs | 1 + 5 files changed, 32 insertions(+), 6 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 5050fef474bae4820f7f0807a71d27039776d59c..efe74924d9db3e21306a29dd04c3d906505fcce0 100644 GIT binary patch delta 3308 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 diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 607bc7d5..1efb3d9e 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -121,10 +121,10 @@ namespace WMS.Web.Api.Controllers //var list = await _erpService.BillQueryForInventory(request); //var b33 = await _juShuiTanService.GetStock(); //var b = b33.Data.Where(w => w.Id == 10923342).FirstOrDefault(); - //await _juShuiTanService.GetTest(); + //await _juShuiTanService.GetTest(); //string codes = "AD"; //var b = await _erpInventoryService.GetInventory(codes); - //var bcd=await _productInventoryService.Refresh(); + var bcd=await _productInventoryService.JuShuiTan(); //LingXingResponse r = new LingXingResponse(); diff --git a/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs b/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs index ddf98708..5136f26e 100644 --- a/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs +++ b/src/WMS.Web.Domain/Services/Public/JuShuiTanService.cs @@ -18,6 +18,7 @@ using WMS.Web.Core.Help; using WMS.Web.Core.Internal.Results; using WMS.Web.Domain.IService.Public; using WMS.Web.Domain.Options; +using WMS.Web.Domain.Values; namespace WMS.Web.Domain.Services.Public { @@ -57,7 +58,10 @@ namespace WMS.Web.Domain.Services.Public JObject resData = JObject.Parse(resContent); if (Convert.ToInt32(resData["code"]) != 0) + { _logger.LogInformation($"聚水潭获取仓库失败:{resData["msg"].ToString()}"); + return Result>.ReFailure(ResultCodes.JuShuiTanDataError); + } string json = resData["data"]["datas"].ToString(); var datas = JsonConvert.DeserializeObject>(json); list.AddRange(datas); @@ -70,7 +74,10 @@ namespace WMS.Web.Domain.Services.Public resData = JObject.Parse(resContent); if (Convert.ToInt32(resData["code"]) != 0) + { _logger.LogInformation($"聚水潭获取仓库失败:{resData["msg"].ToString()}"); + return Result>.ReFailure(ResultCodes.JuShuiTanDataError); + } json = resData["data"]["datas"].ToString(); datas = JsonConvert.DeserializeObject>(json); list.AddRange(datas); @@ -90,13 +97,16 @@ namespace WMS.Web.Domain.Services.Public JuShuiTanInventoryRequst request = new JuShuiTanInventoryRequst(); request.wms_co_id = id;//10923342; request.page_size = 100; - request.modified_begin = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd HH:mm:ss"); + request.modified_begin = DateTime.Now.AddDays(-6).AddHours(-23).ToString("yyyy-MM-dd HH:mm:ss"); request.modified_end = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); var resContent = PostUrl("/open/inventory/query", JsonConvert.SerializeObject(request)); JObject resData = JObject.Parse(resContent); if (Convert.ToInt32(resData["code"]) != 0) + { _logger.LogInformation($"聚水潭获取即时库存失败:{resData["msg"].ToString()}"); + return Result>.ReFailure(ResultCodes.JuShuiTanDataError); + } string json = resData["data"]["inventorys"].ToString(); var datas = JsonConvert.DeserializeObject>(json); list.AddRange(datas); @@ -109,7 +119,10 @@ namespace WMS.Web.Domain.Services.Public resData = JObject.Parse(resContent); if (Convert.ToInt32(resData["code"]) != 0) + { _logger.LogInformation($"聚水潭获取即时库存失败:{resData["msg"].ToString()}"); + return Result>.ReFailure(ResultCodes.JuShuiTanDataError); + } json = resData["data"]["inventorys"].ToString(); datas = JsonConvert.DeserializeObject>(json); list.AddRange(datas); diff --git a/src/WMS.Web.Domain/Services/Public/LingXingService.cs b/src/WMS.Web.Domain/Services/Public/LingXingService.cs index 44876dcc..df6f5415 100644 --- a/src/WMS.Web.Domain/Services/Public/LingXingService.cs +++ b/src/WMS.Web.Domain/Services/Public/LingXingService.cs @@ -107,7 +107,11 @@ namespace WMS.Web.Domain.Services.Public if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); var res = await _httpClientService.GetAsync(resUrl.Data); - if (res.Code != 0) return Result>.ReFailure(ResultCodes.LingXingDataError); + if (res.Code != 0) + { + _logger.LogInformation($"领星获取数据失败{res.Message}"); + return Result>.ReFailure(ResultCodes.LingXingDataError); + } var list = JsonConvert.DeserializeObject>(res.Data.ToString()); //设置缓存 @@ -128,7 +132,11 @@ namespace WMS.Web.Domain.Services.Public if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); List list = new List(); var res = await _httpClientService.PostAsync(resUrl.Data, JsonConvert.SerializeObject(dto), null); - if (res.Code != 0) return Result>.ReFailure(ResultCodes.LingXingDataError); + if (res.Code != 0) + { + _logger.LogInformation($"领星获取数据失败{res.Message}"); + return Result>.ReFailure(ResultCodes.LingXingDataError); + } list.AddRange(JsonConvert.DeserializeObject>(res.Data.ToString())); int num = res.Total / 800; @@ -139,7 +147,11 @@ namespace WMS.Web.Domain.Services.Public resUrl = await GetStr("/erp/sc/routing/data/local_inventory/inventoryDetails", dto); if (!resUrl.IsSuccess) return Result>.ReFailure(ResultCodes.LingXingUrlError); res = await _httpClientService.PostAsync(resUrl.Data, JsonConvert.SerializeObject(dto), null); - if (res.Code != 0) return Result>.ReFailure(ResultCodes.LingXingDataError); + if (res.Code != 0) + { + _logger.LogInformation($"领星获取数据失败{res.Message}"); + return Result>.ReFailure(ResultCodes.LingXingDataError); + } list.AddRange(JsonConvert.DeserializeObject>(res.Data.ToString())); } return Result>.ReSuccess(list.Where(w => w.Product_Total > 0 && w.Product_Valid_Num > 0).ToList()); diff --git a/src/WMS.Web.Domain/Values/ResultCodes.cs b/src/WMS.Web.Domain/Values/ResultCodes.cs index 046d1bbe..6365ac6c 100644 --- a/src/WMS.Web.Domain/Values/ResultCodes.cs +++ b/src/WMS.Web.Domain/Values/ResultCodes.cs @@ -101,5 +101,6 @@ namespace WMS.Web.Domain.Values public static ValueTuple LingXingTokenError = (810001, "获取领星授权失败"); public static ValueTuple LingXingUrlError = (810002, "拼接领星请求参数失败"); public static ValueTuple LingXingDataError = (810003, "请求领星数据失败"); + public static ValueTuple JuShuiTanDataError = (810004, "请求聚水潭数据失败"); } }