Browse Source

修改基类和服务

master
赵新宇 4 days ago
parent
commit
6e4d8f7f4d
  1. 2
      API/TaskManager.Entity/11-18/SUPPLIER_CON_DATE.cs
  2. 2
      API/TaskManager.Entity/11-18/SUPPLIER_CON_DATE_LOGS.cs
  3. 2
      API/TaskManager.Entity/11-18/SUPPLIER_CON_MMRP.cs
  4. 2
      API/TaskManager.Entity/11-18/SUPPLIER_CON_MMRP_LOGS.cs
  5. 2
      API/TaskManager.Entity/11-18/SUPPLIER_CON_PO.cs
  6. 2
      API/TaskManager.Entity/11-18/SUPPLIER_CON_PO_LOGS.cs
  7. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_ATTACHMENT_DATA.cs
  8. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_ATTACHMENT_DATA_LOGS.cs
  9. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_ENVIRONMENT.cs
  10. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_ENVIRONMENT_LOGS.cs
  11. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_FLAW.cs
  12. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_FLAW_LOGS.cs
  13. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_MATERIAL_DATA.cs
  14. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_MATERIAL_DATA_LOGS.cs
  15. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE.cs
  16. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_LOGS.cs
  17. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_OEE_TIME_DETAILS.cs
  18. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_OEE_TIME_DETAILS_LOGS.cs
  19. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_PROCESS.cs
  20. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_PROCESS_EQUIPMENT.cs
  21. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_PROCESS_EQUIPMENT_LOGS.cs
  22. 2
      API/TaskManager.Entity/11-18/SUPPLIER_PRO_PROCESS_LOGS.cs
  23. 2
      API/TaskManager.Entity/11-18/SUPPLIER_SINV_DATA.cs
  24. 2
      API/TaskManager.Entity/11-18/SUPPLIER_SINV_DATA_LOGS.cs
  25. 46
      API/TaskManager.Entity/Entity.cs
  26. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs
  27. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM_LOGS.cs
  28. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs
  29. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE_LOGS.cs
  30. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs
  31. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO_LOGS.cs
  32. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs
  33. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS_LOGS.cs
  34. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs
  35. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA_LOGS.cs
  36. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs
  37. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_LOGS.cs
  38. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs
  39. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK_LOGS.cs
  40. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs
  41. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING_LOGS.cs
  42. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs
  43. 2
      API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_LOGS.cs
  44. 10261
      API/TaskManager.EntityFramework/Migrations/20250619005547_z202506190001.Designer.cs
  45. 1389
      API/TaskManager.EntityFramework/Migrations/20250619005547_z202506190001.cs
  46. 408
      API/TaskManager.EntityFramework/Migrations/JobDbContextModelSnapshot.cs
  47. 8
      API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs
  48. 12
      API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs
  49. 4
      API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs

2
API/TaskManager.Entity/11-18/SUPPLIER_CON_DATE.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 日物料需求计划风险确认
/// </summary>
public class SUPPLIER_CON_DATE : CherryConReadBaseEntity
public class SUPPLIER_CON_DATE : CherryWriteBaseEnity
{

2
API/TaskManager.Entity/11-18/SUPPLIER_CON_DATE_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 日物料需求计划风险确认
/// </summary>
public class SUPPLIER_CON_DATE_LOGS : CherryConReadBaseEntity
public class SUPPLIER_CON_DATE_LOGS : CherryWriteLogsBaseEnity
{

2
API/TaskManager.Entity/11-18/SUPPLIER_CON_MMRP.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// M+6月物料需求计划风险确认
/// </summary>
public class SUPPLIER_CON_MMRP : CherryConReadBaseEntity
public class SUPPLIER_CON_MMRP : CherryWriteBaseEnity
{
[ExporterHeader(DisplayName = "奇瑞Id")]

2
API/TaskManager.Entity/11-18/SUPPLIER_CON_MMRP_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// M+6月物料需求计划风险确认
/// </summary>
public class SUPPLIER_CON_MMRP_LOGS : CherryConReadBaseEntity
public class SUPPLIER_CON_MMRP_LOGS : CherryWriteLogsBaseEnity
{
[ExporterHeader(DisplayName = "奇瑞Id")]

2
API/TaskManager.Entity/11-18/SUPPLIER_CON_PO.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 采购订单风险确认
/// </summary>
public class SUPPLIER_CON_PO : CherryConReadBaseEntity
public class SUPPLIER_CON_PO : CherryWriteBaseEnity
{
/// <summary>

2
API/TaskManager.Entity/11-18/SUPPLIER_CON_PO_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 采购订单风险确认
/// </summary>
public class SUPPLIER_CON_PO_LOGS : CherryConReadBaseEntity
public class SUPPLIER_CON_PO_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_ATTACHMENT_DATA.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 附件类数据
/// </summary>
public class SUPPLIER_PRO_ATTACHMENT_DATA : BaseEntity
public class SUPPLIER_PRO_ATTACHMENT_DATA : CherryWriteBaseEnity
{
/// <summary>

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_ATTACHMENT_DATA_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 附件类数据
/// </summary>
public class SUPPLIER_PRO_ATTACHMENT_DATA_LOGS : BaseEntity
public class SUPPLIER_PRO_ATTACHMENT_DATA_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_ENVIRONMENT.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 环境业务数据
/// </summary>
public class SUPPLIER_PRO_ENVIRONMENT : BaseEntity
public class SUPPLIER_PRO_ENVIRONMENT : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_ENVIRONMENT_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 环境业务数据
/// </summary>
public class SUPPLIER_PRO_ENVIRONMENT_LOGS : BaseEntity
public class SUPPLIER_PRO_ENVIRONMENT_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_FLAW.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 缺陷业务数据
/// </summary>
public class SUPPLIER_PRO_FLAW : BaseEntity
public class SUPPLIER_PRO_FLAW : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_FLAW_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 缺陷业务数据
/// </summary>
public class SUPPLIER_PRO_FLAW_LOGS : BaseEntity
public class SUPPLIER_PRO_FLAW_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_MATERIAL_DATA.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 物料主数据
/// </summary>
public class SUPPLIER_PRO_MATERIAL_DATA : BaseEntity
public class SUPPLIER_PRO_MATERIAL_DATA : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_MATERIAL_DATA_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 物料主数据
/// </summary>
public class SUPPLIER_PRO_MATERIAL_DATA_LOGS : BaseEntity
public class SUPPLIER_PRO_MATERIAL_DATA_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 设备OEE达成率
/// </summary>
public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE : BaseEntity
public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 设备OEE达成率
/// </summary>
public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_LOGS : BaseEntity
public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_OEE_TIME_DETAILS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// OEE时间明细
/// </summary>
public class SUPPLIER_PRO_OEE_TIME_DETAILS : BaseEntity
public class SUPPLIER_PRO_OEE_TIME_DETAILS : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_OEE_TIME_DETAILS_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// OEE时间明细
/// </summary>
public class SUPPLIER_PRO_OEE_TIME_DETAILS_LOGS : BaseEntity
public class SUPPLIER_PRO_OEE_TIME_DETAILS_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_PROCESS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 工艺
/// </summary>
public class SUPPLIER_PRO_PROCESS : BaseEntity
public class SUPPLIER_PRO_PROCESS : CherryWriteBaseEnity
{
/// <summary>
/// 奇瑞零件号

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_PROCESS_EQUIPMENT.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 工艺装备
/// </summary>
public class SUPPLIER_PRO_PROCESS_EQUIPMENT : BaseEntity
public class SUPPLIER_PRO_PROCESS_EQUIPMENT : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_PROCESS_EQUIPMENT_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 工艺装备
/// </summary>
public class SUPPLIER_PRO_PROCESS_EQUIPMENT_LOGS : BaseEntity
public class SUPPLIER_PRO_PROCESS_EQUIPMENT_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_PRO_PROCESS_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity.Entitys
/// <summary>
/// 工艺
/// </summary>
public class SUPPLIER_PRO_PROCESS_LOGS : BaseEntity
public class SUPPLIER_PRO_PROCESS_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 奇瑞零件号

2
API/TaskManager.Entity/11-18/SUPPLIER_SINV_DATA.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity
/// <summary>
/// 供应商共享库存
/// </summary>
public class SUPPLIER_SINV_DATA : CherryReadBaseEntity
public class SUPPLIER_SINV_DATA : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/11-18/SUPPLIER_SINV_DATA_LOGS.cs

@ -5,7 +5,7 @@ namespace TaskManager.Entity
/// <summary>
/// 供应商共享库存
/// </summary>
public class SUPPLIER_SINV_DATA_LOGS : CherryReadBaseEntity
public class SUPPLIER_SINV_DATA_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

46
API/TaskManager.Entity/Entity.cs

@ -284,7 +284,10 @@ namespace TaskManager.Entity
public class CherryConReadBaseEntity : BaseEntity
{
[ExporterHeader(DisplayName = "请求发出日期")]
[MaxLength(30)]
public string? RequestDate { get; set; }
/// <summary>
/// 同步ID
/// </summary>
@ -294,6 +297,47 @@ namespace TaskManager.Entity
public string? Id { get; set; }
}
// [Index(nameof(Id), IsUnique = false)]
[Index(nameof(RequestDate), IsUnique = false)]
public class CherryWriteBaseEnity : BaseEntity
{
/// <summary>
/// 请求发出日期
/// </summary>
[ExporterHeader(DisplayName = "请求发出日期")]
[MaxLength(30)]
public string? RequestDate { get; set; }
/// <summary>
/// 同步ID
/// </summary>
[ExporterHeader(DisplayName = "奇瑞记录ID")]
[ImporterHeader(Name = "奇瑞记录ID")]
[MaxLength(50)]
public string? Id { get; set; }
/// <summary>
}
public class CherryWriteLogsBaseEnity : BaseEntity
{
/// <summary>
/// 请求发出日期
/// </summary>
[ExporterHeader(DisplayName = "请求发出日期")]
[MaxLength(30)]
public string? RequestDate { get; set; }
/// <summary>
/// 同步ID
/// </summary>
[ExporterHeader(DisplayName = "奇瑞记录ID")]
[ImporterHeader(Name = "奇瑞记录ID")]
[MaxLength(50)]
public string? Id { get; set; }
/// <summary>
}

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// BOM主数据
/// </summary>
public class SUPPLIER_BOM : BaseEntity
public class SUPPLIER_BOM : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_BOM_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// BOM主数据
/// </summary>
public class SUPPLIER_BOM_LOGS : BaseEntity
public class SUPPLIER_BOM_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 人员资质信息
/// </summary>
public class SUPPLIER_EMPLOYEE : BaseEntity
public class SUPPLIER_EMPLOYEE : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_EMPLOYEE_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 人员资质信息
/// </summary>
public class SUPPLIER_EMPLOYEE_LOGS : BaseEntity
public class SUPPLIER_EMPLOYEE_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 供应商基础信息
/// </summary>
public class SUPPLIER_INFO : BaseEntity
public class SUPPLIER_INFO : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_INFO_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 供应商基础信息
/// </summary>
public class SUPPLIER_INFO_LOGS : BaseEntity
public class SUPPLIER_INFO_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 过程控制项质量数据
/// </summary>
public class SUPPLIER_PRO_CPS : BaseEntity
public class SUPPLIER_PRO_CPS : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_CPS_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 过程控制项质量数据
/// </summary>
public class SUPPLIER_PRO_CPS_LOGS : BaseEntity
public class SUPPLIER_PRO_CPS_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 生产过程数据
/// </summary>
public class SUPPLIER_PRO_DATA : BaseEntity
public class SUPPLIER_PRO_DATA : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_DATA_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 生产过程数据
/// </summary>
public class SUPPLIER_PRO_DATA_LOGS : BaseEntity
public class SUPPLIER_PRO_DATA_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 产品一次合格率
/// </summary>
public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity
public class SUPPLIER_PRO_FIRST_PASSYIELD : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_FIRST_PASSYIELD_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 产品一次合格率
/// </summary>
public class SUPPLIER_PRO_FIRST_PASSYIELD_LOGS : BaseEntity
public class SUPPLIER_PRO_FIRST_PASSYIELD_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 来料检验数据
/// </summary>
public class SUPPLIER_PRO_MATERIAL_STOCK : BaseEntity
public class SUPPLIER_PRO_MATERIAL_STOCK : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_MATERIAL_STOCK_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 来料检验数据
/// </summary>
public class SUPPLIER_PRO_MATERIAL_STOCK_LOGS : BaseEntity
public class SUPPLIER_PRO_MATERIAL_STOCK_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 排产数据
/// </summary>
public class SUPPLIER_PRO_SCHEDULING : BaseEntity
public class SUPPLIER_PRO_SCHEDULING : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_SCHEDULING_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 排产数据
/// </summary>
public class SUPPLIER_PRO_SCHEDULING_LOGS : BaseEntity
public class SUPPLIER_PRO_SCHEDULING_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 工位一次合格率
/// </summary>
public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity
public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : CherryWriteBaseEnity
{
/// <summary>
/// 供应商代码

2
API/TaskManager.Entity/Entitys/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_LOGS.cs

@ -10,7 +10,7 @@ namespace TaskManager.Entity
/// <summary>
/// 工位一次合格率
/// </summary>
public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD_LOGS : BaseEntity
public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD_LOGS : CherryWriteLogsBaseEnity
{
/// <summary>
/// 供应商代码

10261
API/TaskManager.EntityFramework/Migrations/20250619005547_z202506190001.Designer.cs

File diff suppressed because it is too large

1389
API/TaskManager.EntityFramework/Migrations/20250619005547_z202506190001.cs

File diff suppressed because it is too large

408
API/TaskManager.EntityFramework/Migrations/JobDbContextModelSnapshot.cs

File diff suppressed because it is too large

8
API/Wood.Service/Controllers/CheryRecurringJobInputPageController.cs

@ -35,9 +35,9 @@ namespace TaskManager.Controllers
{
public class CheryRecurringJobInputPageController<T,TDTO,TLOGS> : RecurringJobBaseController
where T : BaseEntity ,new()
where T : CherryWriteBaseEnity ,new()
where TDTO:class,new()
where TLOGS:BaseEntity,new()
where TLOGS: CherryWriteLogsBaseEnity, new()
{
protected readonly IRepository<T> _repository;
@ -187,6 +187,7 @@ namespace TaskManager.Controllers
public async Task SyncTaskSubTable(string taskName, string client)
{
var version = DateTime.Now.ToString("yyyyMMdd");
var requestDate = DateTime.Now.ToString("yyyy-MM-dd");
if (string.IsNullOrEmpty(taskName) || string.IsNullOrEmpty(client))
{
await _logger.AddError("任务名称或客户端不能为空", taskName, Guid.NewGuid(), version);
@ -230,12 +231,15 @@ namespace TaskManager.Controllers
foreach (var itm in records)
{
itm.WriteState = true;
itm.RequestDate = requestDate;
}
var result = await PostPageAsync(pagedRequest, sub.TaskId, version);
if (result.code == 200)
{
await _logger.AddSuccess($"第 {i} 页奇瑞数据保存成功", TaskName, sub.TaskId, version);
_jobDbContext.BulkUpdate(records, options => options.UseTableLock = true);
sub.SyncedPageCount = i;
if (i == totalPages)
{

12
API/Wood.Service/Controllers/CheryRecurringJobInputPageExtendController.cs

@ -34,9 +34,10 @@ using static Dapper.SqlMapper;
namespace TaskManager.Controllers
{
public class CheryRecurringJobInputPageExtendController<T,TDTO,TLOGS> : RecurringJobBaseController
where T : BaseEntity ,new()
where TDTO:class,new()
public class CheryRecurringJobInputPageExtendController<T,TDTO,TLOGS> : RecurringJobBaseController
where T : CherryWriteBaseEnity, new()
where TDTO : class, new()
where TLOGS : CherryWriteLogsBaseEnity, new()
{
protected readonly IRepository<T> _repository;
public CheryRecurringJobInputPageExtendController(HttpClient httpClient, JobDbContext jobDbContext, LogController log, IRepository<T> repository) : base(httpClient, jobDbContext, log)
@ -188,6 +189,7 @@ namespace TaskManager.Controllers
var query = _jobDbContext.Database.GetDbConnection().Query<int>(str);
var total = query.FirstOrDefault();
var version = DateTime.Now.ToString("yyyyMMdd");
var requestDate = DateTime.Now.ToString("yyyy-MM-dd");
var pageSize = CPageSize;
int totalPages = (int)Math.Ceiling((double)total / pageSize);
@ -218,6 +220,7 @@ namespace TaskManager.Controllers
{
itm.WriteState = true;
itm.TaskId = taskId;
itm.RequestDate = requestDate;
}
var result = await PostPageAsync(pagedRequest, taskId, version);
if (result.code == 200)
@ -289,7 +292,8 @@ namespace TaskManager.Controllers
}
else
{
string inputjson = string.Empty;
if (TaskName == "日物料需求计划风险确认")//格式特殊处理
{

4
API/Wood.Service/Controllers/CheryRecurringJobOutPageController.cs

@ -154,6 +154,10 @@ namespace TaskManager.Controllers
if (pagefirstList.Any())
{
await InsertDataAsync(pagefirstList);
}
// 计算总页数
int totalPages = (int)Math.Ceiling((double)totalItems / pageSize);

Loading…
Cancel
Save