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

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";

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)

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<ToutputDetial> 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<ToutputDetial> pageResponse = await GetPageAsync(pageinput);
                         if (pageResponse?.Data.Rows != null && pageResponse.Data.Rows.Count > 0)
                         {

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
                 {

API/Wood.Service/Controllers/TaskSubService.cs

@@ -39,25 +39,20 @@ namespace Wood.Service.Controllers
         //    return result.Value;
         //}
 
-        [HttpGet]
+        [HttpPost]
         public async Task<ActionResult> 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<CherySupplierProSchedulingService>();
                     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<CherySupplierProSchedulingService>();
@@ -128,48 +123,48 @@ namespace Wood.Service.Controllers
                     var flawresult = await flawservice.GetDataPaged(requestInputBase);
                     return Ok(flawresult.Value);
 
-                //case "SUPPLIER_PRO_ENVIRONMENT":
+                case "SUPPLIER_PRO_ENVIRONMENT":
-                //    var dataservice = _builder.GetRequiredService<envir>();
+                    var envservice = _builder.GetRequiredService<CherySupplierProEnvironmentService>();
-                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                    var envtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                //    requestInputBase.Condition.Filters.Remove(datatask);
+                    requestInputBase.Condition.Filters.Remove(envtask);
-                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                    var envresult = await envservice.GetDataPaged(requestInputBase);
-                //    return Ok(dataresult.Value);
+                    return Ok(envresult.Value);
-              
+
-                //case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
+                case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
-                //    var rateservice = _builder.GetRequiredService<>();
+                    var rateservice = _builder.GetRequiredService<CherySupplierProOeeAchievementRateService>();
-                //    var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                    var ratetask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                //    requestInputBase.Condition.Filters.Remove(datatask);
+                    requestInputBase.Condition.Filters.Remove(ratetask);
-                //    var tateresult = await dataservice.GetDataPaged(requestInputBase);
+                    var rateresult = await rateservice.GetDataPaged(requestInputBase);
-                //    return Ok(dataresult.Value);
+                    return Ok(rateresult.Value);
-                //    break;
+
-                //case "SUPPLIER_PRO_OEE_TIME_DETAILS":
+                case "SUPPLIER_PRO_OEE_TIME_DETAILS":
-                //    var detailservice = _builder.GetRequiredService<>();
+                    var detailservice = _builder.GetRequiredService<CherySupplierProOeeTimeDetailsService>();
-                //    var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                    var detailtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                //    requestInputBase.Condition.Filters.Remove(datatask);
+                    requestInputBase.Condition.Filters.Remove(detailtask);
-                //    var detailresult = await dataservice.GetDataPaged(requestInputBase);
+                    var detailresult = await detailservice.GetDataPaged(requestInputBase);
-                //    return Ok(dataresult.Value);
+                    return Ok(detailresult.Value);
-                //    break;
+                
-                //case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
+                case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
-                //    var dataservice = _builder.GetRequiredService<>();
+                    var materialservice = _builder.GetRequiredService<CherySupplierProMaterialDataService>();
-                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                    var materialtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                //    requestInputBase.Condition.Filters.Remove(datatask);
+                    requestInputBase.Condition.Filters.Remove(materialtask);
-                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                    var materialresult = await materialservice.GetDataPaged(requestInputBase);
-                //    return Ok(dataresult.Value);
+                    return Ok(materialresult.Value);
-                //    break;
+               
-                //case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
+                case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
-                //    var dataservice = _builder.GetRequiredService<CherySupplierProDataService>();
+                    var eqservice = _builder.GetRequiredService<CherySupplierProProcessEquipmentService>();
-                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                    var eqtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                //    requestInputBase.Condition.Filters.Remove(datatask);
+                    requestInputBase.Condition.Filters.Remove(eqtask);
-                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                    var eqresult = await eqservice.GetDataPaged(requestInputBase);
-                //    return Ok(dataresult.Value);
+                    return Ok(eqresult.Value);
-                //    break;
+           
-                //case "SUPPLIER_PRO_PROCESS"://工艺
+                case "SUPPLIER_PRO_PROCESS"://工艺
-                //    var dataservice = _builder.GetRequiredService<CherySupplierProProcessService>();
+                    var processservice = _builder.GetRequiredService<CherySupplierProProcessService>();
-                //    var datatask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                    var processtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
-                //    requestInputBase.Condition.Filters.Remove(datatask);
+                    requestInputBase.Condition.Filters.Remove(processtask);
-                //    var dataresult = await dataservice.GetDataPaged(requestInputBase);
+                    var processresult = await processservice.GetDataPaged(requestInputBase);
-                //    return Ok(dataresult.Value);
+                    return Ok(processresult.Value);
-                //    break;
+