diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 5050fef4..efe74924 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.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, "请求聚水潭数据失败"); } }