Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/QRAPI

API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs

@@ -81,7 +81,7 @@ namespace TaskManager.Controllers
             var readedcount = _jobDbContext.Set<T>().Where(p => p.RequestDate == inputdate).Count();
             if (readedcount == 0)//第一次请求用false,接口人胡启名要求
             {
-                PagedResponse<ToutputDetial> firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date, IsForce = false});
+                PagedResponse<ToutputDetial> firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date,PageSize=200, IsForce = false});
 
                 if (firstResponse == null || firstResponse.Code != 200)
                 {
@@ -139,9 +139,7 @@ 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<ToutputDetial> pageResponse = await GetPageAsync(pageinput);
@@ -191,7 +189,7 @@ namespace TaskManager.Controllers
             else
             {
 
-                PagedResponse<ToutputDetial> firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date, IsForce = true });
+                PagedResponse<ToutputDetial> firstResponse = await GetPageAsync(new PAGE_DTO() { Date = date, PageSize = 200, IsForce = true });
                 if (firstResponse == null || firstResponse.Code != 200)
                 {
                     await _logger.AddInfo("首次请求失败，无法获取分页信息。", TaskName);
@@ -244,7 +242,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<ToutputDetial> pageResponse = await GetPageAsync(pageinput);
                         if (pageResponse?.Data.Rows != null && pageResponse.Data.Rows.Count > 0)

API/Wood.Service/Controllers/TaskSubService.cs

@@ -179,6 +179,26 @@ namespace Wood.Service.Controllers
                     var processresult = await processservice.GetTaskDataPaged(requestInputBase);
                     return Ok(processresult);
 
+                case "SUPPLIER_CON_MMRP"://M+6月物料需求计划风险确认
+                    var mmrpservice = _builder.GetRequiredService<CherySupplierConMmrpService>();
+                    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<CherySupplierConDateService>();
+                    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<CherySupplierConPoService>();
+                    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);