diff --git a/API/Wood.Service/Controllers/CheryRecurringJobBaseController.cs b/API/Wood.Service/Controllers/CheryRecurringJobBaseController.cs index 9e39ff9..0cb1110 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobBaseController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobBaseController.cs @@ -30,6 +30,10 @@ namespace TaskManager.Controllers protected string appSecret = "48edc4425647425d87f806a1ba492580"; protected readonly HttpClient _httpClient; protected readonly JobDbContext _jobDbContext; + + public virtual int PageSizeOut { set; get; } = 50; + public virtual int PageSizeIn { set; get; } = 50; + protected string Client { set; get; } = "Chery"; protected string Path { set; get; } = "/v2/get/supplierProPlaning"; protected string Url { set; get; } = "/v2/get/supplierProPlaning"; diff --git a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs index 20b8c83..f831091 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs @@ -151,7 +151,7 @@ namespace TaskManager.Controllers return; } var sublist = _jobDbContext.TaskSub.Where(p => taskName.Contains(p.TaskName) && p.WriteState == false && p.Subscriber == client ).ToList(); - int pageSize = 1000; + int pageSize = ; if (!sublist.Any()) { foreach (var sub in sublist) diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs index a696bd3..633f6ea 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs @@ -139,6 +139,9 @@ namespace TaskManager.Controllers for (currentPage = 2; currentPage <= totalPages; currentPage++) { PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, IsForce = false }; + + + Console.WriteLine($"正在请求第 {currentPage} 页..."); PagedResponse pageResponse = await GetPageAsync(pageinput); if (pageResponse?.Data.Rows != null && pageResponse.Data.Rows.Count > 0) @@ -241,7 +244,7 @@ namespace TaskManager.Controllers for (currentPage = 2; currentPage <= totalPages; currentPage++) { PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, IsForce = true }; - Console.WriteLine($"正在请求第 {currentPage} 页..."); + //Console.WriteLine($"正在请求第 {currentPage} 页..."); PagedResponse pageResponse = await GetPageAsync(pageinput); if (pageResponse?.Data.Rows != null && pageResponse.Data.Rows.Count > 0) { diff --git a/API/Wood.Service/Controllers/CherySupplierConMmrpService.cs b/API/Wood.Service/Controllers/CherySupplierConMmrpService.cs index d01c45f..aa9b8ac 100644 --- a/API/Wood.Service/Controllers/CherySupplierConMmrpService.cs +++ b/API/Wood.Service/Controllers/CherySupplierConMmrpService.cs @@ -50,8 +50,9 @@ namespace TaskManager.Controllers }); - using (var transaction = await _jobDbContext.Database.BeginTransactionAsync()) + using (var transaction = await _jobDbContext.Database.BeginTransactionAsync(System.Data.IsolationLevel.ReadUncommitted)) { + var tran = transaction.GetDbTransaction(); try { diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index dfbd424..d0ed4b2 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -39,25 +39,20 @@ namespace Wood.Service.Controllers // return result.Value; //} - [HttpGet] + [HttpPost] public async Task GetDetail([FromBody] RequestInputBase requestInputBase) { var taskid = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TaskId").Value; var tablename = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName").Value; - switch (tablename) { case "SUPPLIER_PRO_MATERIAL_STOCK": - var stockservice = _builder.GetRequiredService(); var stocktask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); requestInputBase.Condition.Filters.Remove(stocktask); var stockresult = await stockservice.GetDataPaged(requestInputBase); return Ok(stockresult.Value); - - - case "SUPPLIER_PRO_SCHEDULING": var schedservice = _builder.GetRequiredService(); @@ -127,49 +122,49 @@ namespace Wood.Service.Controllers requestInputBase.Condition.Filters.Remove(flawtask); var flawresult = await flawservice.GetDataPaged(requestInputBase); return Ok(flawresult.Value); + + case "SUPPLIER_PRO_ENVIRONMENT": + var envservice = _builder.GetRequiredService(); + var envtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(envtask); + var envresult = await envservice.GetDataPaged(requestInputBase); + return Ok(envresult.Value); + + case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE": + var rateservice = _builder.GetRequiredService(); + var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(ratetask); + var rateresult = await rateservice.GetDataPaged(requestInputBase); + return Ok(rateresult.Value); + + case "SUPPLIER_PRO_OEE_TIME_DETAILS": + var detailservice = _builder.GetRequiredService(); + var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(detailtask); + var detailresult = await detailservice.GetDataPaged(requestInputBase); + return Ok(detailresult.Value); + + case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 + var materialservice = _builder.GetRequiredService(); + var materialtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(materialtask); + var materialresult = await materialservice.GetDataPaged(requestInputBase); + return Ok(materialresult.Value); + + case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 + var eqservice = _builder.GetRequiredService(); + var eqtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(eqtask); + var eqresult = await eqservice.GetDataPaged(requestInputBase); + return Ok(eqresult.Value); - //case "SUPPLIER_PRO_ENVIRONMENT": - // var dataservice = _builder.GetRequiredService(); - // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - // requestInputBase.Condition.Filters.Remove(datatask); - // var dataresult = await dataservice.GetDataPaged(requestInputBase); - // return Ok(dataresult.Value); - - //case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE": - // var rateservice = _builder.GetRequiredService<>(); - // var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - // requestInputBase.Condition.Filters.Remove(datatask); - // var tateresult = await dataservice.GetDataPaged(requestInputBase); - // return Ok(dataresult.Value); - // break; - //case "SUPPLIER_PRO_OEE_TIME_DETAILS": - // var detailservice = _builder.GetRequiredService<>(); - // var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - // requestInputBase.Condition.Filters.Remove(datatask); - // var detailresult = await dataservice.GetDataPaged(requestInputBase); - // return Ok(dataresult.Value); - // break; - //case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据 - // var dataservice = _builder.GetRequiredService<>(); - // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - // requestInputBase.Condition.Filters.Remove(datatask); - // var dataresult = await dataservice.GetDataPaged(requestInputBase); - // return Ok(dataresult.Value); - // break; - //case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备 - // var dataservice = _builder.GetRequiredService(); - // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - // requestInputBase.Condition.Filters.Remove(datatask); - // var dataresult = await dataservice.GetDataPaged(requestInputBase); - // return Ok(dataresult.Value); - // break; - //case "SUPPLIER_PRO_PROCESS"://工艺 - // var dataservice = _builder.GetRequiredService(); - // var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); - // requestInputBase.Condition.Filters.Remove(datatask); - // var dataresult = await dataservice.GetDataPaged(requestInputBase); - // return Ok(dataresult.Value); - // break; + case "SUPPLIER_PRO_PROCESS"://工艺 + var processservice = _builder.GetRequiredService(); + var processtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(processtask); + var processresult = await processservice.GetDataPaged(requestInputBase); + return Ok(processresult.Value); +