调整监测金蝶删单

src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs

@@ -285,6 +285,18 @@ namespace WMS.Web.Repositories.DependencyInjection
                 //.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5]))
                 .WithDescription("MaterialsQuartzJobTriggerDecs"));
                 #endregion
+
+                #region  监测金蝶删单
+                var jobKey_erpdelete = new JobKey("ErpDeleteQuartzJob", options.QuartzJobValue);
+                q.AddJob<ErpDeleteQuartzJob>(jobKey_erpdelete, j => j.WithDescription("ErpDeleteQuartzJob"));
+                q.AddTrigger(t => t
+                .WithIdentity("ErpDeleteQuartzJobTrigger")
+                .ForJob(jobKey_erpdelete)
+                .StartNow()
+                .WithCronSchedule(options.JobStartErpDelete)
+                //.WithCronSchedule(CronScheduleBuilder.DailyAtHourAndMinute(options.JobStartHour[5], options.JobStartMinute[5]))
+                .WithDescription("ErpDeleteQuartzJobTriggerDecs"));
+                #endregion
             });
             //.net core核心托管-添加Quartz服务器
             Services.AddQuartzServer(options =>

src/WMS.Web.Repositories/InStockTaskRepositories.cs

@@ -402,7 +402,7 @@ namespace WMS.Web.Repositories
                     //非采购：可入库数量=应入库数量-收货数量；
                     AvailableQty = s.AccruedQty - s.ReceiveQty,
                     //v1.0.7 待上架数量显示来源单的应入库数量-实入库数量的值
-                    WaitShelfQty = s.AccruedQty-s.RealityQty,
+                    WaitShelfQty = s.AccruedQty - s.RealityQty,
                     Remark = s.Remark,
                     ErpDetailId = s.ErpDetailId
                 }).Where(x => x.AvailableQty > 0).ToListAsync();
@@ -829,11 +829,13 @@ namespace WMS.Web.Repositories
             return (list, total);
         }
 
-        public async Task<List<InStockTask>> GetEntityList(DateTime begin)
+        public async Task<List<InStockTask>> GetEntityListByStatus()
         {
             var res = await _context.InStockTask
                .Include(s => s.Details)
-               .Where(f => f.WmsUpdateTime >= begin)
+               .Where(f => f.Status == InstockStatus.Wait
+               || f.Status == InstockStatus.Part
+               || f.Status == InstockStatus.WaitInStock)
                .ToListAsync();
 
             return res;

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -567,11 +567,11 @@ namespace WMS.Web.Repositories
             return entitys.Clone();
         }
 
-        public async Task<List<OutStockTask>> GetEntityList(DateTime begin)
+        public async Task<List<OutStockTask>> GetEntityListByStatus()
         {
             var res = await _context.OutStockTask
                 .Include(s => s.Details).ThenInclude(s => s.ErpDetails)
-                .Where(f => f.WmsUpdateTime >= begin)
+                .Where(f => f.Status==OutStockStatus.Wait || f.Status == OutStockStatus.Part)
                 .ToListAsync();
 
             return res.Clone();