diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index 31723912..2d8d064f 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/appsettings.json b/src/WMS.Web.Api/appsettings.json index 2cf62c82..a87d8d73 100644 --- a/src/WMS.Web.Api/appsettings.json +++ b/src/WMS.Web.Api/appsettings.json @@ -101,6 +101,7 @@ "JobStartExpreSend": "0 0 12,16,20 * * ?", "JobStartExpreMaterial": "0 30 23 * * ?", "JobStartErpDelete": "0 5 * * * ?", + "JobStartProductInventory": "0 0/30 * * * ?", //a.是否启用集群:键和值 "JobStoreClusteredKey": "quartz.jobStore.clustered", "JobStoreClusteredValue": true, diff --git a/src/WMS.Web.Domain/Options/QuartzJobOptions.cs b/src/WMS.Web.Domain/Options/QuartzJobOptions.cs index cb2c89ef..20ec9889 100644 --- a/src/WMS.Web.Domain/Options/QuartzJobOptions.cs +++ b/src/WMS.Web.Domain/Options/QuartzJobOptions.cs @@ -103,6 +103,11 @@ namespace WMS.Web.Domain.Options /// 监测金蝶删单 /// public string JobStartErpDelete { get; set; } + /// + /// 成品仓库即时库存 + /// + public string JobStartProductInventory { get; set; } + /// /// 是否启用集群:键 /// diff --git a/src/WMS.Web.Domain/Services/ProductInventoryService.cs b/src/WMS.Web.Domain/Services/ProductInventoryService.cs index 45bdb651..9c1da60d 100644 --- a/src/WMS.Web.Domain/Services/ProductInventoryService.cs +++ b/src/WMS.Web.Domain/Services/ProductInventoryService.cs @@ -62,6 +62,7 @@ namespace WMS.Web.Domain.Services { //获取单点配置 var r = await _basicsRepositories.GetUcStockByHeadOfficeAsync("", 1); + //r = r.Where(w => w.Code.Equals("CK001")).ToList(); var codes = r.Where(w => w.ManagementSystem == 1 || w.ManagementSystem == 4).Select(s => (s.Code, s.ErpOrgCode)).ToList(); if (codes.Count() <= 0) return Result.ReSuccess(); @@ -69,6 +70,7 @@ namespace WMS.Web.Domain.Services var str = string.Join(",", codes.Select(s => s.Code).ToList()); var res = await _erpInventoryService.GetInventory(str); + _logger.LogInformation($"拉去金蝶数据结果:{res.IsSuccess} {res.Message} {res.Data.Count()}"); if (!res.IsSuccess) return res; //过滤掉不符合要求的组织和仓库组合 List listOld = new List(); diff --git a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs index 217939c5..0279e877 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs @@ -310,7 +310,7 @@ namespace WMS.Web.Repositories.DependencyInjection .WithIdentity("InventoryQuartzJobTrigger") .ForJob(jobKey_Inventory) .StartNow() - .WithCronSchedule(options.JobStartExpre) + .WithCronSchedule(options.JobStartProductInventory) //.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5])) .WithDescription("InventoryQuartzJobTriggerDecs")); #endregion