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

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

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TaskManager.Contracts.Dtos._01_09
+{
+    internal class Class1
+    {
+    }
+}

API/TaskManager.Contracts/Dtos/10_17/Class1.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TaskManager.Contracts.Dtos._10_17
+{
+    internal class Class1
+    {
+    }
+}

API/TaskManager.Contracts/TaskManager.Contracts.csproj

@@ -10,9 +10,4 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Dtos\01_09\" />
-    <Folder Include="Dtos\10_17\" />
-  </ItemGroup>
-
 </Project>

API/TaskManager.Entity/Entitys/01_09/SupplierProCps.cs

@@ -174,17 +174,17 @@ namespace TaskManager.Entity
         /// <summary>
         /// CC项 , 是传Y，否传N
         /// </summary>
-        public string Cc { get; set; }
+        public bool Cc { get; set; }
 
         /// <summary>
         /// SC项 , 是传Y，否传N
         /// </summary>
-        public string Sc { get; set; }
+        public bool Sc { get; set; }
 
         /// <summary>
         /// SPC , 是传Y，否传N
         /// </summary>
-        public string Spc { get; set; }
+        public bool Spc { get; set; }
 
         /// <summary>
         /// 控制项标准值

API/TaskManager.Entity/Entitys/01_09/SupplierProData.cs

@@ -0,0 +1,234 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TaskManager.Entity
+{
+    /// <summary>
+    /// 生产过程数据
+    /// </summary>
+    public class SupplierProData
+    {
+        /// <summary>
+        /// 供应商代码
+        /// </summary>
+        public string SupplierCode { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
+
+        /// <summary>
+        /// 工厂代码
+        /// </summary>
+        public string PlantId { get; set; }
+
+        /// <summary>
+        /// 工厂名称
+        /// </summary>
+        public string PlantName { get; set; }
+
+        /// <summary>
+        /// 车间代码
+        /// </summary>
+        public string WorkshopId { get; set; }
+
+        /// <summary>
+        /// 车间名称
+        /// </summary>
+        public string WorkshopName { get; set; }
+
+        /// <summary>
+        /// 产线代码
+        /// </summary>
+        public string ProductionLineId { get; set; }
+
+        /// <summary>
+        /// 产线名称
+        /// </summary>
+        public string ProductionLineName { get; set; }
+
+        /// <summary>
+        /// 工位代码
+        /// </summary>
+        public string StationId { get; set; }
+
+        /// <summary>
+        /// 工位名称
+        /// </summary>
+        public string StationName { get; set; }
+
+        /// <summary>
+        /// 工位人员编号
+        /// </summary>
+        public string EmpCode { get; set; }
+
+        /// <summary>
+        /// 工位人员姓名
+        /// </summary>
+        public string EmpName { get; set; }
+
+        /// <summary>
+        /// 供应商总成零件名称
+        /// </summary>
+        public string VendorProductName { get; set; }
+
+        /// <summary>
+        /// 供应商总成零件号
+        /// </summary>
+        public string VendorProductNo { get; set; }
+
+        /// <summary>
+        /// 供应商总成批次号
+        /// </summary>
+        public string VendorProductBatch { get; set; }
+
+        /// <summary>
+        /// 供应商总成SN码
+        /// </summary>
+        public string VendorProductSn { get; set; }
+
+        /// <summary>
+        /// 子件编码
+        /// </summary>
+        public string SubProdNo { get; set; }
+
+        /// <summary>
+        /// 子件名称
+        /// </summary>
+        public string SubProdName { get; set; }
+
+        /// <summary>
+        /// 子件批次号
+        /// </summary>
+        public string SubBatchNo { get; set; }
+
+        /// <summary>
+        /// 子件分包号
+        /// </summary>
+        public string ChildPackageInfo { get; set; }
+
+        /// <summary>
+        /// 子件扣料数量
+        /// </summary>
+        public decimal SubProdNum { get; set; }
+
+        /// <summary>
+        /// 子件SN码
+        /// </summary>
+        public string SubProdSn { get; set; }
+
+        /// <summary>
+        /// 子件物料来源
+        /// </summary>
+        public string ChildSource { get; set; }
+
+        /// <summary>
+        /// 分供方代码
+        /// </summary>
+        public string SubSupplierCode { get; set; }
+
+        /// <summary>
+        /// 分供方名称（原注释“分分供方”可能为笔误，此处按“分供方”处理）
+        /// </summary>
+        public string SubSupplierName { get; set; }
+
+        /// <summary>
+        /// 奇瑞零件号
+        /// </summary>
+        public string CheryProductNo { get; set; }
+
+        /// <summary>
+        /// 奇瑞零件名称
+        /// </summary>
+        public string CheryProductName { get; set; }
+
+        /// <summary>
+        /// 奇瑞SN码
+        /// </summary>
+        public string CheryProductSn { get; set; }
+
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string ManufactureNo { get; set; }
+
+        /// <summary>
+        /// 生产批次号
+        /// </summary>
+        public string ProductBatchNo { get; set; }
+
+        /// <summary>
+        /// 班次(白班，晚班，中班)
+        /// </summary>
+        public string WorkShift { get; set; }
+
+        /// <summary>
+        /// 进工位的时间,格式(yyyy-MM-dd HH:mm:ss)
+        /// </summary>
+        public DateTime MaterialInputTime { get; set; }
+
+        /// <summary>
+        /// 出工位的时间,格式(yyyy-MM-dd HH:mm:ss)
+        /// </summary>
+        public DateTime MaterialOutputTime { get; set; }
+
+        /// <summary>
+        /// 装配设备编号（原注释“vendorFieldNum”可能为“设备编号”，此处按业务逻辑命名）
+        /// </summary>
+        public string VendorFieldNum { get; set; }
+
+        /// <summary>
+        /// 装配设备名称
+        /// </summary>
+        public string VendorFieldName { get; set; }
+
+        /// <summary>
+        /// 设备判定的质量状态（合格与否，NG不合适 OK合适）
+        /// </summary>
+        public string InstrumentQualityStatus { get; set; }
+
+        /// <summary>
+        /// 人工判定的质量状态（合格与否，NG不合适 OK合适）
+        /// </summary>
+        public string ManualQualityStatus { get; set; }
+
+        /// <summary>
+        /// 最终质量状态（合格与否，NG不合适 OK合适）
+        /// </summary>
+        public string FinalQualityStatus { get; set; }
+
+        /// <summary>
+        /// 采集时间,格式(yyyy-MM-dd HH:mm:ss)
+        /// </summary>
+        public DateTime CollectTime { get; set; }
+
+        /// <summary>
+        /// 子件绑定扫码时间,格式(yyyy-MM-dd HH:mm:ss)
+        /// </summary>
+        public DateTime DateTime { get; set; }
+
+        /// <summary>
+        /// 父件硬件版本号
+        /// </summary>
+        public string ParentHardwareRevision { get; set; }
+
+        /// <summary>
+        /// 父件软件版本号
+        /// </summary>
+        public string ParentSoftwareRevision { get; set; }
+
+        /// <summary>
+        /// 子件硬件版本号
+        /// </summary>
+        public string ChildHardwareRevision { get; set; }
+
+        /// <summary>
+        /// 子件软件版本号
+        /// </summary>
+        public string ChildSoftwareRevision { get; set; }
+    }
+}

API/TaskManager.Entity/Entitys/01_09/SupplierProFirstPassyield.cs

@@ -0,0 +1,124 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TaskManager.Entity
+{
+    /// <summary>
+    /// 产品一次合格率
+    /// </summary>
+    public class SupplierProFirstPassyield
+    {
+        /// <summary>
+        /// 供应商代码
+        /// </summary>
+        public string SupplierCode { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
+
+        /// <summary>
+        /// 供应商总成零件号
+        /// </summary>
+        public string VendorProductNo { get; set; }
+
+        /// <summary>
+        /// 供应商总成零件名称
+        /// </summary>
+        public string VendorProductName { get; set; }
+
+        /// <summary>
+        /// 工厂代码
+        /// </summary>
+        public string PlantId { get; set; }
+
+        /// <summary>
+        /// 工厂名称
+        /// </summary>
+        public string PlantName { get; set; }
+
+        /// <summary>
+        /// 车间代码
+        /// </summary>
+        public string WorkshopId { get; set; }
+
+        /// <summary>
+        /// 车间名称
+        /// </summary>
+        public string WorkshopName { get; set; }
+
+        /// <summary>
+        /// 产线代码
+        /// </summary>
+        public string ProductionLineId { get; set; }
+
+        /// <summary>
+        /// 产线名称
+        /// </summary>
+        public string ProductionLineName { get; set; }
+
+        /// <summary>
+        /// 奇瑞零件号
+        /// </summary>
+        public string CheryProductNo { get; set; }
+
+        /// <summary>
+        /// 奇瑞零件名称
+        /// </summary>
+        public string CheryProductName { get; set; }
+
+        /// <summary>
+        /// 生产工单号
+        /// </summary>
+        public string ManufactureNo { get; set; }
+
+        /// <summary>
+        /// 生产批次号
+        /// </summary>
+        public string ProductBatchNo { get; set; }
+
+        /// <summary>
+        /// 批次计划数量：每个批次号对应的计划数量
+        /// </summary>
+        public decimal WorkOrderNumber { get; set; }
+
+        /// <summary>
+        /// 不合格数
+        /// </summary>
+        public decimal DefectiveNumber { get; set; }
+
+        /// <summary>
+        /// 合格数：当班次合格数汇总
+        /// </summary>
+        public decimal AcceptableNumber { get; set; }
+
+        /// <summary>
+        /// 一次合格率实际值
+        /// </summary>
+        public decimal OncePassRateRealValue { get; set; }
+
+        /// <summary>
+        /// 一次合格率目标值
+        /// </summary>
+        public decimal OncePassRateTagValue { get; set; }
+
+        /// <summary>
+        /// 班次（白班，晚班，中班）
+        /// </summary>
+        public string WorkShift { get; set; }
+
+        /// <summary>
+        /// 生产日期，格式(yyyy-MM-dd HH:mm:ss)
+        /// </summary>
+        public DateTime StatisticalTime { get; set; }
+
+        /// <summary>
+        /// 值统计时间，格式(yyyy-MM-dd HH:mm:ss)
+        /// </summary>
+        public DateTime DateTime { get; set; }
+    }
+}

API/TaskManager.Entity/Entitys/01_09/SupplierProStationFirstPassyield.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TaskManager.Entity.Entitys._01_09
+{
+    /// <summary>
+    /// 工位一次合格率
+    /// </summary>
+    public class SupplierProStationFirstPassyield
+    {
+        /// <summary>
+        /// 供应商代码
+        /// </summary>
+        public string SupplierCode { get; set; }
+
+        /// <summary>
+        /// 供应商名称
+        /// </summary>
+        public string SupplierName { get; set; }
+
+        /// <summary>
+        /// 工厂代码
+        /// </summary>
+        public string PlantId { get; set; }
+
+        /// <summary>
+        /// 工厂名称
+        /// </summary>
+        public string PlantName { get; set; }
+
+        /// <summary>
+        /// 车间代码
+        /// </summary>
+        public string WorkshopId { get; set; }
+
+        /// <summary>
+        /// 车间名称
+        /// </summary>
+        public string WorkshopName { get; set; }
+
+        /// <summary>
+        /// 产线代码
+        /// </summary>
+        public string ProductionLineId { get; set; }
+
+        /// <summary>
+        /// 产线名称
+        /// </summary>
+        public string ProductionLineName { get; set; }
+
+        /// <summary>
+        /// 工位代码
+        /// </summary>
+        public string StationId { get; set; }
+
+        /// <summary>
+        /// 工位名称
+        /// </summary>
+        public string StationName { get; set; }
+
+        /// <summary>
+        /// 奇瑞零件号
+        /// </summary>
+        public string CheryProductNo { get; set; }
+
+        /// <summary>
+        /// 奇瑞零件名称
+        /// </summary>
+        public string CheryProductName { get; set; }
+
+        /// <summary>
+        /// 供应商总成零件号
+        /// </summary>
+        public string VendorProductNo { get; set; }
+
+        /// <summary>
+        /// 供应商总成零件名称
+        /// </summary>
+        public string VendorProductName { get; set; }
+
+        /// <summary>
+        /// 生产批次号
+        /// </summary>
+        public string ProductBatchNo { get; set; }
+
+        /// <summary>
+        /// 生产工单号（跟排产工单号关联）
+        /// </summary>
+        public string ManufactureNo { get; set; }
+
+        /// <summary>
+        /// 批次计划数量
+        /// </summary>
+        public decimal WorkOrderNumber { get; set; }
+
+        /// <summary>
+        /// 不合格数
+        /// </summary>
+        public decimal DefectiveNumber { get; set; }
+
+        /// <summary>
+        /// 合格数
+        /// </summary>
+        public decimal AcceptableNumber { get; set; }
+
+        /// <summary>
+        /// 一次合格率实际值（使用小数表示，如 0.9601 表示 96.01%，整数位最多10位，小数位最多3位）
+        /// </summary>
+        public decimal OncePassRateRealValue { get; set; }
+
+        /// <summary>
+        /// 一次合格率目标值（使用小数表示，如 0.96 表示 96.00%，整数位最多10位，小数位最多3位）
+        /// </summary>
+        public decimal OncePassRateTagValue { get; set; }
+
+        /// <summary>
+        /// 班次（白班，晚班，中班）
+        /// </summary>
+        public string WorkShift { get; set; }
+
+        /// <summary>
+        /// 生产日期，格式：yyyy-MM-dd HH:mm:ss
+        /// </summary>
+        public DateTime StatisticalTime { get; set; }
+
+        /// <summary>
+        /// 值统计时间，格式：yyyy-MM-dd HH:mm:ss
+        /// </summary>
+        public DateTime DateTime { get; set; }
+    }
+}

API/TaskManager.EntityFramework/Repository/Repository.cs

@@ -14,9 +14,6 @@ using Wood.Util;
 namespace TaskManager.EntityFramework.Repository
 {
 
-    
-
-
     public class Repository<TEntity> : IRepository<TEntity>
     where TEntity : BaseEntity
     {

API/Wood.Service/Controllers/RecurringJobBaseController.cs

@@ -127,7 +127,7 @@ namespace TaskManager.Controllers
         {
             await _logger.AddInfo($"{TaskName}结束执行作业{uid}", TaskName);
         }
-        [HttpGet]
+        [NonAction]
         public async Task ExecuteAsync(string url, string path, string taskName)
         {
             var str = DateTime.Now.ToLongTimeString();

API/Wood.Service/Controllers/RecurringJobOutPageController.cs

@@ -24,7 +24,7 @@ namespace TaskManager.Controllers
         {
             _repository = repository;
         }
-
+        [NonAction]
         public async Task<List<ToutputDetial>> FetchAllDataAsync(string inputdate)
         {
             var allData = new List<ToutputDetial>();
@@ -196,7 +196,7 @@ namespace TaskManager.Controllers
             }
 
         }
-        [HttpGet("Test")]
+        [NonAction]
         public async Task TestAsync(string url, string path, string taskName, string inputdate)
         {
             Url = url;

API/Wood.Service/Controllers/SUPPLIER_DEL_STATE_Service.cs

@@ -1,16 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    //看板配送单
-    public class SUPPLIER_DEL_STATE_Service : RecurringJobOutPageController<SUPPLIER_DEL_STATE, SUPPLIER_DEL_STATE_DETAIL_DTO>
-    {
-        public SUPPLIER_DEL_STATE_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_DEL_STATE> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_INV_DATA_Service.cs

@@ -1,16 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    //奇瑞RDC共享库存
-    public class SUPPLIER_INV_DATA_Service : RecurringJobOutPageController<SUPPLIER_INV_DATA, SUPPLIER_INV_DATA_DETAIL_DTO>
-    {
-        public SUPPLIER_INV_DATA_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_INV_DATA> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_MRP_DATE_Service.cs

@@ -1,16 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    //日物料需求计划
-    public class SUPPLIER_MRP_DATE_Service : RecurringJobOutPageController<SUPPLIER_MRP_DATE, SUPPLIER_MRP_DATE_DETAIL_DTO>
-    {
-        public SUPPLIER_MRP_DATE_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_DATE> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_MRP_MONTH_Service.cs

@@ -1,15 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_MRP_MONTH_Service : RecurringJobOutPageController<SUPPLIER_MRP_MONTH, SUPPLIER_MRP_MONTH_DETAIL_DTO>
-    {
-        public SUPPLIER_MRP_MONTH_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_MONTH> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_MRP_Service.cs

@@ -1,16 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    //日MRP状态监控
-    public class SUPPLIER_MRP_Service : RecurringJobOutPageController<SUPPLIER_MRP_STATE, SUPPLIER_MRP_STATE_DETIAL_DTO>
-    {
-        public SUPPLIER_MRP_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_STATE> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_MRP_WARNING_Service.cs

@@ -1,16 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-
-
-namespace TaskManager.Controllers
-{
-    //日MRP预警推移
-    public class SUPPLIER_MRP_WARNING_Service : RecurringJobOutPageController<SUPPLIER_MRP_WARNING, SUPPLIER_MRP_WARNING_DETAIL_DTO>
-    {
-        public SUPPLIER_MRP_WARNING_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_WARNING> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_PO_Service.cs

@@ -1,15 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-
-
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_PO_Service : RecurringJobOutPageController<SUPPLIER_PO, SUPPLIER_PO_DETAIL_DTO>
-    {
-        public SUPPLIER_PO_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PO> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_PRO_CSCHEDUL_Service.cs

@@ -1,15 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-
-
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_PRO_CSCHEDUL_Service : RecurringJobOutPageController<SUPPLIER_PRO_CSCHEDUL, SUPPLIER_PRO_CSCHEDUL_DETAIL_DTO>
-    {
-        public SUPPLIER_PRO_CSCHEDUL_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_CSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_PRO_HSCHEDUL_Service.cs

@@ -1,15 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    //过焊装未过总装
-    public class SUPPLIER_PRO_HSCHEDUL_Service : RecurringJobOutPageController<SUPPLIER_PRO_HSCHEDUL, SUPPLIER_PRO_HSCHEDUL_DETAIL_DTO>
-    {
-        public SUPPLIER_PRO_HSCHEDUL_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_HSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_CONTROLLER.cs

@@ -1,6 +0,0 @@
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD_CONTROLLER
-    {
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_PRO_TSCHEDUL_Service.cs

@@ -1,15 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    //过涂装未过总装
-    public class SUPPLIER_PRO_TSCHEDUL_Service : RecurringJobOutPageController<SUPPLIER_PRO_TSCHEDUL, SUPPLIER_PRO_TSCHEDUL_DETAIL_DTO>
-    {
-        public SUPPLIER_PRO_TSCHEDUL_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_TSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_RETURN_Service.cs

@@ -1,15 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    //退货单
-    public class SUPPLIER_RETURN_Service : RecurringJobOutPageController<SUPPLIER_RETURN, SUPPLIER_RETURN_DETAIL_DTO>
-    {
-        public SUPPLIER_RETURN_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_RETURN> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_SA_WEEK_Service.cs

@@ -1,17 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    /// <summary>
-    /// 计划协议
-    /// </summary>
-    public class SUPPLIER_SA_WEEK_Service : RecurringJobOutPageController<SUPPLIER_SA_WEEK, SUPPLIER_SA_WEEK_DETAIL_DTO>
-    {
-        public SUPPLIER_SA_WEEK_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_SA_WEEK> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SUPPLIER_SINV_DATA_Service.cs

@@ -1,14 +0,0 @@
-using TaskManager.Contracts.Dtos;
-using TaskManager.Controllers;
-using TaskManager.Entity;
-using TaskManager.EntityFramework;
-
-namespace TaskManager.Controllers
-{
-    public class SUPPLIER_SINV_DATA_Service : RecurringJobOutPageController<SUPPLIER_SINV_DATA, SUPPLIER_SINV_DATA_DETAIL_DTO>
-    {
-        public SUPPLIER_SINV_DATA_Service(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_SINV_DATA> repository) : base(httpClient, jobDbContext, log, repository)
-        {
-        }
-    }
-}

API/Wood.Service/Controllers/SupplierDelStateService.cs

@@ -0,0 +1,16 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    //看板配送单
+    public class SupplierDelStateService : RecurringJobOutPageController<SUPPLIER_DEL_STATE, SUPPLIER_DEL_STATE_DETAIL_DTO>
+    {
+        public SupplierDelStateService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_DEL_STATE> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierInvDataService.cs

@@ -0,0 +1,16 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+
+namespace TaskManager.Controllers
+{
+    //奇瑞RDC共享库存
+    public class SupplierInvDataService : RecurringJobOutPageController<SUPPLIER_INV_DATA, SUPPLIER_INV_DATA_DETAIL_DTO>
+    {
+        public SupplierInvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_INV_DATA> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierMrpDataService.cs

@@ -0,0 +1,16 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    //日物料需求计划
+    public class SupplierMrpDataService : RecurringJobOutPageController<SUPPLIER_MRP_DATE, SUPPLIER_MRP_DATE_DETAIL_DTO>
+    {
+        public SupplierMrpDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_DATE> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierMrpMonthService.cs

@@ -0,0 +1,15 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    public class SupplierMrpMonthService : RecurringJobOutPageController<SUPPLIER_MRP_MONTH, SUPPLIER_MRP_MONTH_DETAIL_DTO>
+    {
+        public SupplierMrpMonthService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_MONTH> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierMrpService.cs

@@ -0,0 +1,16 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    //日MRP状态监控
+    public class SupplierMrpService : RecurringJobOutPageController<SUPPLIER_MRP_STATE, SUPPLIER_MRP_STATE_DETIAL_DTO>
+    {
+        public SupplierMrpService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_STATE> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierMrpWarningService.cs

@@ -0,0 +1,16 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+
+namespace TaskManager.Controllers
+{
+    //日MRP预警推移
+    public class SupplierMrpWarningService : RecurringJobOutPageController<SUPPLIER_MRP_WARNING, SUPPLIER_MRP_WARNING_DETAIL_DTO>
+    {
+        public SupplierMrpWarningService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_MRP_WARNING> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierPoService.cs

@@ -0,0 +1,15 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+
+namespace TaskManager.Controllers
+{
+    public class SupplierPoService : RecurringJobOutPageController<SUPPLIER_PO, SUPPLIER_PO_DETAIL_DTO>
+    {
+        public SupplierPoService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PO> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierPorHSCHEDULService.cs

@@ -0,0 +1,15 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    //过焊装未过总装
+    public class SupplierPorHSCHEDULService : RecurringJobOutPageController<SUPPLIER_PRO_HSCHEDUL, SUPPLIER_PRO_HSCHEDUL_DETAIL_DTO>
+    {
+        public SupplierPorHSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_HSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierProCSCHEDULService.cs

@@ -0,0 +1,15 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+
+namespace TaskManager.Controllers
+{
+    public class SupplierProCSCHEDULService : RecurringJobOutPageController<SUPPLIER_PRO_CSCHEDUL, SUPPLIER_PRO_CSCHEDUL_DETAIL_DTO>
+    {
+        public SupplierProCSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_CSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierProStationFirstPassYieldService.cs

@@ -0,0 +1,6 @@
+namespace TaskManager.Controllers
+{
+    public class SupplierProStationFirstPassYieldService
+    {
+    }
+}

API/Wood.Service/Controllers/SupplierReturnService.cs

@@ -0,0 +1,15 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    //退货单
+    public class SupplierReturnService : RecurringJobOutPageController<SUPPLIER_RETURN, SUPPLIER_RETURN_DETAIL_DTO>
+    {
+        public SupplierReturnService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_RETURN> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierSaWeekService.cs

@@ -0,0 +1,17 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    /// <summary>
+    /// 计划协议
+    /// </summary>
+    public class SupplierSaWeekService : RecurringJobOutPageController<SUPPLIER_SA_WEEK, SUPPLIER_SA_WEEK_DETAIL_DTO>
+    {
+        public SupplierSaWeekService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_SA_WEEK> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/SupplierSinvDataService.cs

@@ -0,0 +1,14 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    public class SupplierSinvDataService : RecurringJobOutPageController<SUPPLIER_SINV_DATA, SUPPLIER_SINV_DATA_DETAIL_DTO>
+    {
+        public SupplierSinvDataService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_SINV_DATA> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}

API/Wood.Service/Controllers/TaskConifgureController.cs

@@ -254,7 +254,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "M+6月物料需求计划1":
-                            RecurringJob.AddOrUpdate<SUPPLIER_MRP_MONTH_Service>(
+                            RecurringJob.AddOrUpdate<SupplierMrpMonthService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -270,7 +270,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "M+6月物料需求计划2":
-                            RecurringJob.AddOrUpdate<SUPPLIER_MRP_MONTH_Service>(
+                            RecurringJob.AddOrUpdate<SupplierMrpMonthService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -278,7 +278,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "日物料需求计划":
-                            RecurringJob.AddOrUpdate<SUPPLIER_MRP_DATE_Service>(
+                            RecurringJob.AddOrUpdate<SupplierMrpDataService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -286,7 +286,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "计划协议":
-                            RecurringJob.AddOrUpdate<SUPPLIER_SA_WEEK_Service>(
+                            RecurringJob.AddOrUpdate<SupplierSaWeekService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -294,7 +294,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "采购订单":
-                            RecurringJob.AddOrUpdate<SUPPLIER_PO_Service>(
+                            RecurringJob.AddOrUpdate<SupplierPoService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -302,7 +302,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "过焊装未过总装":
-                            RecurringJob.AddOrUpdate<SUPPLIER_PRO_HSCHEDUL_Service>(
+                            RecurringJob.AddOrUpdate<SupplierPorHSCHEDULService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -310,7 +310,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "过涂装未过总装":
-                            RecurringJob.AddOrUpdate<SUPPLIER_PRO_TSCHEDUL_Service>(
+                            RecurringJob.AddOrUpdate<supplierProTSCHEDULService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -318,7 +318,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "排序供货":
-                            RecurringJob.AddOrUpdate<SUPPLIER_PRO_CSCHEDUL_Service>(
+                            RecurringJob.AddOrUpdate<SupplierProCSCHEDULService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -326,7 +326,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "看板配送单":
-                            RecurringJob.AddOrUpdate<SUPPLIER_DEL_STATE_Service>(
+                            RecurringJob.AddOrUpdate<SupplierDelStateService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -334,7 +334,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "退货单":
-                            RecurringJob.AddOrUpdate<SUPPLIER_RETURN_Service>(
+                            RecurringJob.AddOrUpdate<SupplierReturnService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -342,7 +342,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "奇瑞RDC共享库存":
-                            RecurringJob.AddOrUpdate<SUPPLIER_INV_DATA_Service>(
+                            RecurringJob.AddOrUpdate<SupplierInvDataService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -350,7 +350,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "日MRP状态监控":
-                            RecurringJob.AddOrUpdate<SUPPLIER_MRP_Service>(
+                            RecurringJob.AddOrUpdate<SupplierMrpDataService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -358,7 +358,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "日MRP预警推移":
-                            RecurringJob.AddOrUpdate<SUPPLIER_MRP_WARNING_Service>(
+                            RecurringJob.AddOrUpdate<SupplierMrpWarningService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -391,7 +391,7 @@ namespace TaskManager.Controllers
                             break;
                         case "供应商共享库存-上午":
 
-                            RecurringJob.AddOrUpdate<SUPPLIER_SINV_DATA_Service>(
+                            RecurringJob.AddOrUpdate<SupplierSinvDataService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,
@@ -399,7 +399,7 @@ namespace TaskManager.Controllers
                             );
                             break;
                         case "供应商共享库存-晚上":
-                            RecurringJob.AddOrUpdate<SUPPLIER_SINV_DATA_Service>(
+                            RecurringJob.AddOrUpdate<SupplierSinvDataService>(
                                 task.TaskName,
                                 x => ((IDoExecute)x).ExecuteAsync(url, path, task.TaskName),
                                 task.Corn,

API/Wood.Service/Controllers/supplierProTSCHEDULService.cs

@@ -0,0 +1,15 @@
+using TaskManager.Contracts.Dtos;
+using TaskManager.Controllers;
+using TaskManager.Entity;
+using TaskManager.EntityFramework;
+
+namespace TaskManager.Controllers
+{
+    //过涂装未过总装
+    public class supplierProTSCHEDULService : RecurringJobOutPageController<SUPPLIER_PRO_TSCHEDUL, SUPPLIER_PRO_TSCHEDUL_DETAIL_DTO>
+    {
+        public supplierProTSCHEDULService(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<SUPPLIER_PRO_TSCHEDUL> repository) : base(httpClient, jobDbContext, log, repository)
+        {
+        }
+    }
+}