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

API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_BOM_DTO.cs

@@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos
     /// <summary>
     /// BOM主数据
     /// </summary>
-    public class SUPPLIER_BOM_DTO : BaseEntityDto
+    public class SUPPLIER_BOM_DTO 
     {
         /// <summary>
         /// 供应商代码

API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_EMPLOYEE_DTO.cs

@@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos
     /// <summary>
     /// 人员资质信息
     /// </summary>
-    public class SUPPLIER_EMPLOYEE_DTO : BaseEntityDto
+    public class SUPPLIER_EMPLOYEE_DTO 
     {
         /// <summary>
         /// 供应商代码

API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_INFO_DTO.cs

@@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos
     /// <summary>
     /// 供应商基础信息
     /// </summary>
-    public class SUPPLIER_INFO_DTO : BaseEntityDto
+    public class SUPPLIER_INFO_DTO 
     {
         /// <summary>
         /// 供应商代码

API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_CPS_DTO.cs

@@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos
     /// <summary>
     /// 过程控制项质量数据
     /// </summary>
-    public class SUPPLIER_PRO_CPS_DTO : BaseEntityDto
+    public class SUPPLIER_PRO_CPS_DTO 
     {
         /// <summary>
         /// 供应商代码

API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_DATA_DTO.cs

@@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos
     /// <summary>
     /// 生产过程数据
     /// </summary>
-    public class SUPPLIER_PRO_DATA_DTO : BaseEntityDto
+    public class SUPPLIER_PRO_DATA_DTO 
     {
         /// <summary>
         /// 供应商代码

API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_DTO.cs

@@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos
     /// <summary>
     /// 产品一次合格率
     /// </summary>
-    public class SUPPLIER_PRO_FIRST_PASSYIELD_DTO : BaseEntityDto
+    public class SUPPLIER_PRO_FIRST_PASSYIELD_DTO 
     {
         /// <summary>
         /// 供应商代码

API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs

@@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos
     /// <summary>
     /// 来料检验数据
     /// </summary>
-    public class SUPPLIER_PRO_MATERIAL_STOCK_DTO : BaseEntityDto
+    public class SUPPLIER_PRO_MATERIAL_STOCK_DTO 
     {
         /// <summary>
         /// 供应商代码

API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs

@@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos
     /// <summary>
     /// 排产数据
     /// </summary>
-    public class SUPPLIER_PRO_SCHEDULING_DTO : BaseEntityDto
+    public class SUPPLIER_PRO_SCHEDULING_DTO 
     {
         /// <summary>
         /// 供应商代码

API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs

@@ -10,7 +10,7 @@ namespace TaskManager.Contracts.Dtos
     /// <summary>
     /// 工位一次合格率
     /// </summary>
-    public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO : BaseEntityDto
+    public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO 
     {
         /// <summary>
         /// 供应商代码

API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

@@ -36,6 +36,10 @@ namespace TaskManager.Controllers
 
 
 
+
+
+
+
         /// <summary>
         /// 手工发送调用接口
         /// </summary>

API/Wood.Service/Controllers/CherySupplierBomService.cs

@@ -1,5 +1,6 @@
 using TaskManager.Contracts.Dtos;
 using TaskManager.Entity;
+using TaskManager.Entity.Entitys;
 using TaskManager.EntityFramework;
 
 namespace TaskManager.Controllers

API/Wood.Service/Controllers/TaskConifgureController.cs

@@ -22,7 +22,9 @@ namespace TaskManager.Controllers
 {
     //[ApiController]
     //[Route("[controller]")]
-
+    /// <summary>
+    /// 任务设置服务
+    /// </summary>
     [AllowAnonymous]
     public class TaskConifgureController :NormalBaseController<TaskConifgure>
     {
@@ -267,8 +269,6 @@ namespace TaskManager.Controllers
                 var path = task.Api;
                 var client = task.Client;
 
-
-
                 switch (task.TaskName)
                 {
                     case "来料检验数据":

API/Wood.Service/Controllers/TaskSubService.cs

@@ -1,18 +1,208 @@
-using System;
+using Hangfire;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Configuration;
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
 using TaskManager.Entity;
 using TaskManager.EntityFramework;
+using TaskManager.EntityFramework.Repository;
+using Wood.Util.Filters;
+using Z.EntityFramework.Plus;
 
 namespace Wood.Service.Controllers
 {
     public class TaskSubService : NormalBaseController<TaskSub>
     {
+
+
+
         public TaskSubService(JobDbContext context, IServiceProvider builder, IConfiguration configuration, IRepository<TaskSub> repository) : base(context, builder, configuration, repository)
         {
         }
+
+
+        //private async Task<PagedResult<T>> GetDataPagedAsync<T,TService,TDTO>(RequestInputBase input) 
+        //    where T : BaseEntity,new()
+        //    where TService :CheryRecurringJobInputPageController<T,TDTO> ,new()
+        //    where TDTO : class ,new()
+        //{
+        //    var service = _builder.GetRequiredService<TService>();
+        //    var task = input.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+        //    input.Condition.Filters.Remove(task);
+        //    var result = await service.GetDataPaged(input);
+        //    return result.Value;
+        //}
+
+        [HttpGet]
+        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":
+
+
+
+                    //_builder.GetRequiredService(requestInputBase);
+
+
+                    break;
+                case "SUPPLIER_PRO_SCHEDULING":
+                    //RecurringJob.AddOrUpdate<>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_INFO":
+                    //RecurringJob.AddOrUpdate<>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_EMPLOYEE"://人员资质信息
+                    //RecurringJob.AddOrUpdate<SUPPLIER_EMPLOYEE_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_BOM"://BOM主数据
+
+                    var bomservice = _builder.GetRequiredService<CherySupplierBomService>();
+                    var bomtask = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                    requestInputBase.Condition.Filters.Remove(bomtask);
+                    var bomresult = await bomservice.GetDataPaged(requestInputBase);
+                    return Ok(bomresult.Value);
+
+
+                case "SUPPLIER_PRO_CPS"://过程控制项质量数据
+                                        //var service = _builder.GetRequiredService<CherySupplierBomService>();
+                                        //var task = requestInputBase.Condition.Filters.FirstOrDefault(p => p.Column == "TableName");
+                                        //requestInputBase.Condition.Filters.Remove(task);
+                                        //var result = await service.GetDataPaged(requestInputBase);
+                                        //return Ok(result.Value);
+
+
+
+
+
+
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_CPS_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_DATA":
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_DATA_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_FIRST_PASSYIELD":
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_FIRST_PASSYIELD_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_STATION_FIRST_PASSYIELD":
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_STATION_FIRST_PASSYIELD_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_FLAW":
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_FLAW_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_ENVIRONMENT":
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_ENVIRONMENT_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE":
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_OEE_TIME_DETAILS":
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_OEE_TIME_DETAILS_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_MATERIAL_DATA"://物料主数据
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_MATERIAL_DATA_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_PROCESS_EQUIPMENT":// 工艺装备
+
+                    //RecurringJob.AddOrUpdate<SUPPLIER_PRO_PROCESS_EQUIPMENT_CONTROLLER>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+                case "SUPPLIER_PRO_PROCESS"://工艺
+                    //RecurringJob.AddOrUpdate<>(
+                    //    task.TaskName,
+                    //    x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
+                    //    task.Corn,
+                    //    TimeZoneInfo.Local
+                    //);
+                    break;
+
+
+
+            }
+            return Ok();
+        }
+
     }
+
+
+
+
+
+
+    
 }