From 723aadf2b576735a93f40b2229ec2d1c61f2f6f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Fri, 6 Jun 2025 14:18:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/CheryRecurringJobOutPageController.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs index 633f6ea..bdc884c 100644 --- a/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs +++ b/API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs @@ -80,7 +80,7 @@ namespace TaskManager.Controllers var readedcount = _jobDbContext.Set().Where(p => p.RequestDate == inputdate).Count(); if (readedcount == 0)//第一次请求用false,接口人胡启名要求 { - PagedResponse firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date, IsForce = false}); + PagedResponse firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date,PageSize=200, IsForce = false}); if (firstResponse == null || firstResponse.Code != 200) { @@ -138,10 +138,8 @@ namespace TaskManager.Controllers // 循环请求剩余页面 for (currentPage = 2; currentPage <= totalPages; currentPage++) { - PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, IsForce = false }; + PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, PageSize = 200, IsForce = false }; - - Console.WriteLine($"正在请求第 {currentPage} 页..."); PagedResponse pageResponse = await GetPageAsync(pageinput); if (pageResponse?.Data.Rows != null && pageResponse.Data.Rows.Count > 0) @@ -190,7 +188,7 @@ namespace TaskManager.Controllers else { - PagedResponse firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date, IsForce = true }); + PagedResponse firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date, PageSize = 200, IsForce = true }); if (firstResponse == null || firstResponse.Code != 200) { await _logger.AddInfo("首次请求失败，无法获取分页信息。", TaskName); @@ -243,7 +241,7 @@ namespace TaskManager.Controllers // 循环请求剩余页面 for (currentPage = 2; currentPage <= totalPages; currentPage++) { - PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, IsForce = true }; + PAGE_DTO pageinput = new PAGE_DTO() { Date = date, PageNum = currentPage, PageSize = 200, IsForce = true }; //Console.WriteLine($"正在请求第 {currentPage} 页..."); PagedResponse pageResponse = await GetPageAsync(pageinput); if (pageResponse?.Data.Rows != null && pageResponse.Data.Rows.Count > 0) From 6acf3b11e2296fe24ec05c40b2199539b6869d9e Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Fri, 6 Jun 2025 14:22:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TaskSubService.cs | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/API/Wood.Service/Controllers/TaskSubService.cs b/API/Wood.Service/Controllers/TaskSubService.cs index dc20c97..8568892 100644 --- a/API/Wood.Service/Controllers/TaskSubService.cs +++ b/API/Wood.Service/Controllers/TaskSubService.cs @@ -178,7 +178,27 @@ namespace Wood.Service.Controllers requestInputBase.Condition.Filters.Remove(processtask); var processresult = await processservice.GetTaskDataPaged(requestInputBase); return Ok(processresult); - + + case "SUPPLIER_CON_MMRP"://M+6月物料需求计划风险确认 + var mmrpservice = _builder.GetRequiredService(); + var mmrptask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(mmrptask); + var mmrpresult = await mmrpservice.GetTaskDataPaged(requestInputBase); + return Ok(mmrpresult); + + case "SUPPLIER_CON_DATE"://日物料需求计划风险确认 + var con_dateservice = _builder.GetRequiredService(); + var con_datetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(con_datetask); + var con_dateresult = await con_dateservice.GetTaskDataPaged(requestInputBase); + return Ok(con_dateresult); + + case "SUPPLIER_CON_PO"://采购订单风险确认 + var con_poservice = _builder.GetRequiredService(); + var con_potask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName"); + requestInputBase.Condition.Filters.Remove(con_potask); + var con_poresult = await con_poservice.GetTaskDataPaged(requestInputBase); + return Ok(con_poresult);