diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 5961b44..815c543 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -121,123 +121,123 @@ namespace TaskManager.Controllers _context.TaskSub.Add(task); _context.SaveChanges(); await Task.Delay(TimeSpan.FromSeconds(2)); - + var hangfireid = string.Empty; switch (taskName) { case "来料检验数据": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"materialstock", x => x.CustomInvokeAsync(taskName, client,taskId ), TimeSpan.FromSeconds(1) ); break; case "排产数据": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"scheduling", x => x.CustomInvokeAsync(taskName, client, taskId), TimeSpan.FromSeconds(1) ); break; case "供应商基础信息": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"info", x => x.CustomInvokeAsync(taskName, client), TimeSpan.FromSeconds(1) ); break; case "人员资质信息": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"employee", x => x.CustomInvokeAsync(taskName, client), TimeSpan.FromSeconds(1) ); break; case "BOM主数据": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"bom", x => x.CustomInvokeAsync(taskName, client, taskId), TimeSpan.FromSeconds(1) ); break; case "过程控制项质量数据": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"cps", x => x.CustomInvokeAsync(taskName, client, taskId), TimeSpan.FromSeconds(1) ); break; case "生产过程数据": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"data", x => x.CustomInvokeAsync(taskName, client, taskId), TimeSpan.FromSeconds(1) ); break; case "产品一次合格率": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( // "firstpassyield", x => x.CustomInvokeAsync(taskName, client, taskId), TimeSpan.FromSeconds(1) ); break; case "工位一次合格率": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"stationfirstpassyield", x => x.CustomInvokeAsync(taskName, client, taskId), TimeSpan.FromSeconds(1) ); break; case "缺陷业务数据": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"flaw", x => x.CustomInvokeAsync(taskName, client, taskId), TimeSpan.FromSeconds(1) ); break; case "环境业务数据": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"environment", x => x.CustomInvokeAsync(taskName, client), TimeSpan.FromSeconds(1) ); break; case "设备OEE达成率": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"oeeachievementrate", x => x.CustomInvokeAsync(taskName, client), TimeSpan.FromSeconds(1) ); break; case "OEE时间明细": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"oeetimedetails", x => x.CustomInvokeAsync(taskName, client), TimeSpan.FromSeconds(1) ); break; case "物料主数据": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"maaterialdata", // 注意:这里可能存在拼写错误,原始代码中也有 x => x.CustomInvokeAsync(taskName, client,taskId), TimeSpan.FromSeconds(1) ); break; case "附件类数据": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( // "attachmentdata", x => x.CustomInvokeAsync(taskName, client), TimeSpan.FromSeconds(1) ); break; case "工艺装备": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( //"processequipment", x => x.CustomInvokeAsync(taskName, client), TimeSpan.FromSeconds(1) ); break; case "工艺": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( // "process", x => x.CustomInvokeAsync(taskName, client, taskId), TimeSpan.FromSeconds(1) @@ -245,26 +245,29 @@ namespace TaskManager.Controllers break; case "供应商共享库存-上午": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( // "process", x => x.CustomInvokeAsync(taskName, client,taskId), TimeSpan.FromSeconds(1) ); break; case "供应商共享库存-下午": - BackgroundJob.Schedule( + hangfireid = BackgroundJob.Schedule( // "process", x => x.CustomInvokeAsync(taskName, client,taskId), TimeSpan.FromSeconds(1) ); break; - - - - - - + + } + var taskupdate =await _context.TaskSub.FirstOrDefaultAsync(p => p.TaskId==taskId); + if (taskupdate != null) + { + taskupdate.Remark = hangfireid; + _context.Update(taskupdate); + _context.SaveChanges(); } + return new JsonResult(new diff --git a/API/Wood.Service/Datas/SupplierEmployeeDtService.cs b/API/Wood.Service/Datas/SupplierEmployeeDtService.cs index 25c85b0..1b205c4 100644 --- a/API/Wood.Service/Datas/SupplierEmployeeDtService.cs +++ b/API/Wood.Service/Datas/SupplierEmployeeDtService.cs @@ -97,6 +97,7 @@ namespace Wood.Service.Datas foreach (var empDtObj in entityLst) { empDtObj.SupplierCode = VendCode; + empDtObj.ReadState = true; SUPPLIER_EMPLOYEE empObj = new SUPPLIER_EMPLOYEE(); empObj.InjectFrom(empDtObj); empObj.ReadState = true; diff --git a/API/Wood.Service/Datas/SupplierInfoDtService.cs b/API/Wood.Service/Datas/SupplierInfoDtService.cs index 64f7ffc..ed1af9b 100644 --- a/API/Wood.Service/Datas/SupplierInfoDtService.cs +++ b/API/Wood.Service/Datas/SupplierInfoDtService.cs @@ -97,6 +97,8 @@ namespace Wood.Service.Datas foreach (var empDtObj in entityLst) { empDtObj.SupplierCode = VendCode; + empDtObj.ReadState = true; + SUPPLIER_INFO empObj = new SUPPLIER_INFO(); empObj.InjectFrom(empDtObj); empObj.TaskId = taskSubObj.TaskId; diff --git a/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs b/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs index 7021931..1413aac 100644 --- a/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs +++ b/API/Wood.Service/Datas/SupplierProProcessEquipmentDtService.cs @@ -98,6 +98,8 @@ namespace Wood.Service.Datas foreach (var empDtObj in entityLst) { empDtObj.SupplierCode = VendCode; + empDtObj.ReadState = true; + SUPPLIER_PRO_PROCESS_EQUIPMENT empObj = new SUPPLIER_PRO_PROCESS_EQUIPMENT(); empObj.InjectFrom(empDtObj); empObj.TaskId = taskSubObj.TaskId;