From a922680bda405ee980219f0344f871f860cd849d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=20=E8=B5=B5?= <89237069@qq.com> Date: Thu, 29 May 2025 17:28:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/TaskManager.Entity/Entity.cs | 364 +++++++++--------- API/Wood.Admin.WebApi/Startup.cs | 56 ++- .../Controllers/TaskConifgureController.cs | 10 +- 3 files changed, 240 insertions(+), 190 deletions(-) diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index 86efa2d..7985552 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -27,38 +27,38 @@ namespace TaskManager.Entity /// API路径 /// [ExporterHeader(DisplayName = "API路径")] - public string Api { get; set; } + public string? Api { get; set; } /// /// 任务周期设置 /// [ExporterHeader(DisplayName = "任务周期设置")] - public string Corn { get; set; } + public string? Corn { get; set; } /// /// 模块 /// [ExporterHeader(IsIgnore = true)] - public string Module { get; set; } + public string? Module { get; set; } /// /// 备注 /// [ExporterHeader(DisplayName = "备注")] - public string Remark { get; set; } + public string? Remark { get; set; } /// /// 表名 /// [ExporterHeader(IsIgnore =true)] - public string TableName { get; set; } + public string? TableName { get; set; } /// /// 任务名称 /// [ExporterHeader(DisplayName = "任务名称")] - public string TaskName { get; set; } + public string? TaskName { get; set; } /// /// 全路径 /// [ExporterHeader(DisplayName = "全路径")] - public string Url { get; set; } + public string? Url { get; set; } /// /// 是否自动执行 /// @@ -75,17 +75,17 @@ namespace TaskManager.Entity /// 详细描述 /// [ExporterHeader(DisplayName = "信息")] - public string Info { get; set; } + public string? Info { get; set; } /// /// 日志类型 /// [ExporterHeader(DisplayName = "日志类型")] - public string Type { get; set; } + public string? Type { get; set; } /// /// 任务名称 /// [ExporterHeader(DisplayName = "任务名")] - public string TaskName { get; set; } + public string? TaskName { get; set; } /// /// 任务名称 @@ -101,7 +101,7 @@ namespace TaskManager.Entity /// 备注 /// [ExporterHeader(DisplayName = "备注")] - public string Remark { get; set; } + public string? Remark { get; set; } } public class BaseEntity @@ -119,7 +119,7 @@ namespace TaskManager.Entity [ExporterHeader(IsIgnore = true)] public DateTime CreationTime { get; set; } [ExporterHeader(IsIgnore = true)] - public string Remark { get; set; } + public string? Remark { get; set; } [ExporterHeader(IsIgnore = true)] public Guid TaskId { get; set; } } @@ -129,11 +129,11 @@ namespace TaskManager.Entity /// /// 请求发出日期 /// - public string RequestDate { get; set; } + public string? RequestDate { get; set; } /// /// 同步ID /// - public string Id { get; set; } + public string? Id { get; set; } @@ -187,7 +187,7 @@ namespace TaskManager.Entity /// 站点标识（多站点部署时标识所属站点，如：Site1、Site2） /// [ExporterHeader(DisplayName = "站点")] - public string? Site { get; set; } + public string Site { get; set; } [ExporterHeader(DisplayName = "创建用户")] /// /// 从那个内部系统创建系统 @@ -226,21 +226,21 @@ namespace TaskManager.Entity /// 主键ID /// [JsonPropertyName("id")] - public string Id { get; set; } + public string? Id { get; set; } /// /// 需求发布版次:唯一版次ID /// [JsonPropertyName("releaseEdition")] [MaxLength(50)] - public string ReleaseEdition { get; set; } = string.Empty; + public string? ReleaseEdition { get; set; } = string.Empty; /// /// 车型 /// [JsonPropertyName("models")] [MaxLength(50)] - public string Models { get; set; } = string.Empty; + public string? Models { get; set; } = string.Empty; /// @@ -248,21 +248,21 @@ namespace TaskManager.Entity /// [JsonPropertyName("type")] [MaxLength(50)] - public string Type { get; set; } = string.Empty; + public string? Type { get; set; } = string.Empty; /// /// 动力总成 /// [JsonPropertyName("assembly")] [MaxLength(50)] - public string Assembly { get; set; } = string.Empty; + public string? Assembly { get; set; } = string.Empty; /// /// 版型 /// [JsonPropertyName("pattern")] [MaxLength(50)] - public string Pattern { get; set; } = string.Empty; + public string? Pattern { get; set; } = string.Empty; /// @@ -270,14 +270,14 @@ namespace TaskManager.Entity /// [JsonPropertyName("materialCode")] [MaxLength(50)] - public string MaterialCode { get; set; } = string.Empty; + public string? MaterialCode { get; set; } = string.Empty; /// /// 起始月份-格式：yyyy-MM /// [JsonPropertyName("startMonth")] [MaxLength(50)] - public string StartMonth { get; set; } = string.Empty; + public string? StartMonth { get; set; } = string.Empty; /// /// 数量1 @@ -320,14 +320,14 @@ namespace TaskManager.Entity /// [JsonPropertyName("plant")] [MaxLength(50)] - public string Plant { get; set; } = string.Empty; + public string? Plant { get; set; } = string.Empty; /// /// 创建人 /// [JsonPropertyName("createByUser")] [MaxLength(50)] - public string CreateByUser { get; set; } = string.Empty; + public string? CreateByUser { get; set; } = string.Empty; /// /// 创建时间 @@ -340,7 +340,7 @@ namespace TaskManager.Entity /// [JsonPropertyName("updateByUser")] [MaxLength(50)] - public string UpdateByUser { get; set; } = string.Empty; + public string? UpdateByUser { get; set; } = string.Empty; /// /// 修改时间 @@ -362,10 +362,10 @@ namespace TaskManager.Entity [JsonProperty("omterior")] // 可能是拼写错误，保留原始名称 - public string Omterior { get; set; } = String.Empty; + public string? Omterior { get; set; } = String.Empty; [JsonProperty("salseDepartment")] // 可能是拼写错误，保留原始名称 - public string SalseDepartment { get; set; } = String.Empty; + public string? SalseDepartment { get; set; } = String.Empty; } @@ -383,42 +383,42 @@ namespace TaskManager.Entity /// [JsonPropertyName("releaseEdition")] [MaxLength(50)] - public string ReleaseEdition { get; set; } = string.Empty; + public string? ReleaseEdition { get; set; } = string.Empty; /// /// 零件号:奇瑞零件号 /// [JsonPropertyName("materialCode")] [MaxLength(50)] - public string MaterialCode { get; set; } = string.Empty; + public string? MaterialCode { get; set; } = string.Empty; /// /// 零件名称 /// [JsonPropertyName("materialDescription")] [MaxLength(50)] - public string MaterialDescription { get; set; } = string.Empty; + public string? MaterialDescription { get; set; } = string.Empty; /// /// 工厂代码 /// [JsonPropertyName("plantId")] [MaxLength(50)] - public string PlantId { get; set; } = string.Empty; + public string? PlantId { get; set; } = string.Empty; /// /// 工厂名称 /// [JsonPropertyName("plantName")] [MaxLength(50)] - public string PlantName { get; set; } = string.Empty; + public string? PlantName { get; set; } = string.Empty; /// /// 起始月份-格式：yyyy-MM /// [JsonPropertyName("startMonth")] [MaxLength(50)] - public string StartMonth { get; set; } = string.Empty; + public string? StartMonth { get; set; } = string.Empty; /// /// 需求数量1 @@ -497,14 +497,14 @@ namespace TaskManager.Entity /// [JsonPropertyName("isUpdate")] [MaxLength(50)] - public string IsUpdate { get; set; } = string.Empty; + public string? IsUpdate { get; set; } = string.Empty; /// /// 创建人 /// [JsonPropertyName("createByUser")] [MaxLength(50)] - public string CreateByUser { get; set; } = string.Empty; + public string? CreateByUser { get; set; } = string.Empty; /// /// 创建时间 @@ -517,7 +517,7 @@ namespace TaskManager.Entity /// [JsonPropertyName("updateByUser")] [MaxLength(50)] - public string UpdateByUser { get; set; } = string.Empty; + public string? UpdateByUser { get; set; } = string.Empty; /// /// 修改时间 @@ -545,15 +545,15 @@ namespace TaskManager.Entity /// //public class SUPPLIER_CON_MMRP : BaseEntity //{ - // public string SupplierCode { get; set; } - // public string ReleaseEdition { get; set; } - // public string MaterialCode { get; set; } - // public string PlantId { get; set; } - // public string FeedbackResults { get; set; } - // public string VentureType { get; set; } - // public string VentureSpecific { get; set; } - // public string Measures { get; set; } - // public string StartMonth { get; set; } + // public string? SupplierCode { get; set; } + // public string? ReleaseEdition { get; set; } + // public string? MaterialCode { get; set; } + // public string? PlantId { get; set; } + // public string? FeedbackResults { get; set; } + // public string? VentureType { get; set; } + // public string? VentureSpecific { get; set; } + // public string? Measures { get; set; } + // public string? StartMonth { get; set; } // public int QuantityMeet1 { get; set; } // public int QuantityMeet2 { get; set; } // public int QuantityMeet3 { get; set; } @@ -581,35 +581,35 @@ namespace TaskManager.Entity /// 字符串长度限制：50 字节 /// [StringLength(50)] // 使用数据注解限制长度（需引用 System.ComponentModel.DataAnnotations） - public string ReleaseEdition { get; set; } = string.Empty; + public string? ReleaseEdition { get; set; } = string.Empty; /// /// 奇瑞零件号 /// 字符串长度限制：50 字节 /// [StringLength(50)] - public string MaterialCode { get; set; } = string.Empty; + public string? MaterialCode { get; set; } = string.Empty; /// /// 零件名称 /// 字符串长度限制：50 字节 /// [StringLength(50)] - public string MaterialDescription { get; set; } = string.Empty; + public string? MaterialDescription { get; set; } = string.Empty; /// /// 工厂代码 /// 字符串长度限制：50 字节 /// [StringLength(50)] - public string PlantId { get; set; } = string.Empty; + public string? PlantId { get; set; } = string.Empty; /// /// 工厂名称 /// 字符串长度限制：50 字节 /// [StringLength(50)] - public string PlantName { get; set; } = string.Empty; + public string? PlantName { get; set; } = string.Empty; /// /// 需求起始日期（格式：yyyy-MM-dd） @@ -664,13 +664,13 @@ namespace TaskManager.Entity /// /// 数据变更标识（1=更新需求，0=未变更） /// - public string IsUpdate { get; set; } = string.Empty; + public string? IsUpdate { get; set; } = string.Empty; /// /// 创建人（字符串长度默认 50 字节） /// [StringLength(50)] - public string CreateByUser { get; set; } = string.Empty; + public string? CreateByUser { get; set; } = string.Empty; /// /// 创建时间（自动填充当前时间） @@ -681,7 +681,7 @@ namespace TaskManager.Entity /// 修改人（字符串长度默认 50 字节） /// [StringLength(50)] - public string UpdateByUser { get; set; } = string.Empty; + public string? UpdateByUser { get; set; } = string.Empty; /// /// 修改时间（自动更新为最后修改时间） @@ -705,15 +705,15 @@ namespace TaskManager.Entity /// //public class SUPPLIER_CON_DATE : BaseEntity //{ - // public string SupplierCode { get; set; } - // public string ReleaseEdition { get; set; } - // public string MaterialCode { get; set; } - // public string PlantId { get; set; } - // public string FeedbackResults { get; set; } - // public string VentureType { get; set; } - // public string VentureSpecific { get; set; } - // public string Measures { get; set; } - // public string StartDate { get; set; } + // public string? SupplierCode { get; set; } + // public string? ReleaseEdition { get; set; } + // public string? MaterialCode { get; set; } + // public string? PlantId { get; set; } + // public string? FeedbackResults { get; set; } + // public string? VentureType { get; set; } + // public string? VentureSpecific { get; set; } + // public string? Measures { get; set; } + // public string? StartDate { get; set; } // // QuantityMeet from 1 to 31 // public int QuantityMeet1 { get; set; } @@ -759,37 +759,37 @@ namespace TaskManager.Entity /// 计划协议号 /// [MaxLength(50)] - public string ScheduleAgreement { get; set; } = ""; + public string? ScheduleAgreement { get; set; } = ""; /// /// 行项目号 /// [MaxLength(50)] - public string SerialNumber { get; set; } = ""; + public string? SerialNumber { get; set; } = ""; /// /// 零件号:奇瑞零件号 /// [MaxLength(50)] - public string MaterialCode { get; set; } = ""; + public string? MaterialCode { get; set; } = ""; /// /// 零件名称 /// [MaxLength(50)] - public string MaterialDescription { get; set; } = ""; + public string? MaterialDescription { get; set; } = ""; /// /// 采购组 /// [MaxLength(50)] - public string PurchasingGroup { get; set; } = ""; + public string? PurchasingGroup { get; set; } = ""; /// /// 工厂代码 /// [MaxLength(50)] - public string PlantId { get; set; } = ""; + public string? PlantId { get; set; } = ""; /// /// 需求数量 @@ -806,7 +806,7 @@ namespace TaskManager.Entity /// 创建人 /// [MaxLength(50)] - public string CreateByUser { get; set; } = ""; + public string? CreateByUser { get; set; } = ""; /// /// 创建时间 @@ -818,7 +818,7 @@ namespace TaskManager.Entity /// 修改人 /// [MaxLength(50)] - public string UpdateByUser { get; set; } = ""; + public string? UpdateByUser { get; set; } = ""; /// /// 修改时间 @@ -850,28 +850,28 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "采购订单号")] - public string PurchaseOrder { get; set; } + public string? PurchaseOrder { get; set; } /// /// 行项目号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "行项目号")] - public string SerialNumber { get; set; } + public string? SerialNumber { get; set; } /// /// 工厂代码 /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂代码")] - public string PlantId { get; set; } + public string? PlantId { get; set; } /// /// 工厂名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂名称")] - public string PlantName { get; set; } + public string? PlantName { get; set; } /// /// 凭证日期-格式：yyyy-MM-dd @@ -884,28 +884,28 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "需方联系人")] - public string Purchaser { get; set; } + public string? Purchaser { get; set; } /// /// 供方联系人 /// [MaxLength(50)] [ExporterHeader(DisplayName = "供方联系人")] - public string Supplier { get; set; } + public string? Supplier { get; set; } /// /// 物料编码 /// [MaxLength(50)] [ExporterHeader(DisplayName = "物料编码")] - public string MaterialCode { get; set; } + public string? MaterialCode { get; set; } /// /// 物料描述 /// [MaxLength(50)] [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDescription { get; set; } + public string? MaterialDescription { get; set; } /// /// 需求数量 @@ -918,7 +918,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "物料单位")] - public string MaterialUnit { get; set; } + public string? MaterialUnit { get; set; } /// /// 交货日期-格式：yyyy-MM-dd @@ -931,7 +931,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "交货地点")] - public string DeliveryPlace { get; set; } + public string? DeliveryPlace { get; set; } /// /// 到货数量 @@ -944,42 +944,42 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "备注")] - public string Note { get; set; } + public string? Note { get; set; } /// /// 项目类别文本 /// [MaxLength(50)] [ExporterHeader(DisplayName = "项目类别")] - public string ItemType { get; set; } + public string? ItemType { get; set; } /// /// 国际贸易条件 /// [MaxLength(50)] [ExporterHeader(DisplayName = "贸易条件")] - public string TradeTerms { get; set; } + public string? TradeTerms { get; set; } /// /// 出口国家 /// [MaxLength(50)] [ExporterHeader(DisplayName = "出口国家")] - public string Country { get; set; } + public string? Country { get; set; } /// /// 批次 /// [MaxLength(50)] [ExporterHeader(DisplayName = "批次")] - public string Batch { get; set; } + public string? Batch { get; set; } /// /// 创建人 /// [MaxLength(50)] [ExporterHeader(DisplayName = "创建人")] - public string CreateByUser { get; set; } + public string? CreateByUser { get; set; } /// /// 创建时间 @@ -992,7 +992,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "修改人")] - public string UpdateByUser { get; set; } + public string? UpdateByUser { get; set; } /// /// 修改时间 @@ -1021,14 +1021,14 @@ namespace TaskManager.Entity /// //public class SUPPLIER_CON_PO : BaseEntity //{ - // public string SupplierCode { get; set; } - // public string PurchaseOrder { get; set; } - // public string SerialNumber { get; set; } + // public string? SupplierCode { get; set; } + // public string? PurchaseOrder { get; set; } + // public string? SerialNumber { get; set; } // public int QuantityMeet { get; set; } - // public string FeedbackResults { get; set; } - // public string VentureType { get; set; } - // public string VentureSpecific { get; set; } - // public string Measures { get; set; } + // public string? FeedbackResults { get; set; } + // public string? VentureType { get; set; } + // public string? VentureSpecific { get; set; } + // public string? Measures { get; set; } //} @@ -1046,49 +1046,49 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "车型")] - public string Models { get; set; } + public string? Models { get; set; } /// /// VIN /// [MaxLength(50)] [ExporterHeader(DisplayName = "VIN")] - public string Vin { get; set; } + public string? Vin { get; set; } /// /// 产线代码 /// [MaxLength(50)] [ExporterHeader(DisplayName = "产线代码")] - public string ProductionLineId { get; set; } + public string? ProductionLineId { get; set; } /// /// 产线名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "产线名称")] - public string ProductionLineName { get; set; } + public string? ProductionLineName { get; set; } /// /// 物料编码 /// [MaxLength(50)] [ExporterHeader(DisplayName = "物料编码")] - public string MaterialCode { get; set; } + public string? MaterialCode { get; set; } /// /// 物料描述 /// [MaxLength(50)] [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDescription { get; set; } + public string? MaterialDescription { get; set; } /// /// 生产备注(报工类型) /// [MaxLength(50)] [ExporterHeader(DisplayName = "报工类型")] - public string ProductionType { get; set; } + public string? ProductionType { get; set; } /// /// 上线日期时间-格式：yyyy-MM-dd HH:mm:ss @@ -1101,7 +1101,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "创建人")] - public string CreateByUser { get; set; } + public string? CreateByUser { get; set; } /// /// 创建时间 @@ -1114,7 +1114,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "修改人")] - public string UpdateByUser { get; set; } + public string? UpdateByUser { get; set; } /// /// 修改时间 @@ -1151,42 +1151,42 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "车型")] - public string Models { get; set; } + public string? Models { get; set; } /// /// VIN /// [MaxLength(50)] [ExporterHeader(DisplayName = "VIN")] - public string Vin { get; set; } + public string? Vin { get; set; } /// /// 产线代码 /// [MaxLength(50)] [ExporterHeader(DisplayName = "产线代码")] - public string ProductionLineId { get; set; } + public string? ProductionLineId { get; set; } /// /// 产线名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "产线名称")] - public string ProductionLineName { get; set; } + public string? ProductionLineName { get; set; } /// /// 物料编码 /// [MaxLength(50)] [ExporterHeader(DisplayName = "物料编码")] - public string MaterialCode { get; set; } + public string? MaterialCode { get; set; } /// /// 物料描述 /// [MaxLength(50)] [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDescription { get; set; } + public string? MaterialDescription { get; set; } /// /// 上线日期时间-格式：yyyy-MM-dd HH:mm:ss @@ -1199,7 +1199,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "总装车间")] - public string FinalWorkshop { get; set; } + public string? FinalWorkshop { get; set; } /// /// 总装上线日期时间-格式：yyyy-MM-dd HH:mm:ss @@ -1212,7 +1212,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "创建人")] - public string CreateByUser { get; set; } + public string? CreateByUser { get; set; } /// /// 创建时间 @@ -1225,7 +1225,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "修改人")] - public string UpdateByUser { get; set; } + public string? UpdateByUser { get; set; } /// /// 修改时间 @@ -1262,42 +1262,42 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "车型")] - public string Models { get; set; } + public string? Models { get; set; } /// /// VIN码 /// [MaxLength(50)] [ExporterHeader(DisplayName = "VIN码")] - public string Vin { get; set; } + public string? Vin { get; set; } /// /// 产线编号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "产线编号")] - public string ProductionLineId { get; set; } + public string? ProductionLineId { get; set; } /// /// 产线名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "产线名称")] - public string ProductionLineName { get; set; } + public string? ProductionLineName { get; set; } /// /// 物料编码 /// [MaxLength(50)] [ExporterHeader(DisplayName = "物料编码")] - public string MaterialCode { get; set; } + public string? MaterialCode { get; set; } /// /// 物料描述 /// [MaxLength(50)] [ExporterHeader(DisplayName = "物料描述")] - public string MaterialDescription { get; set; } + public string? MaterialDescription { get; set; } /// /// 排序日期 @@ -1310,7 +1310,7 @@ namespace TaskManager.Entity /// [MaxLength(8)] // HH:mm:ss 固定8位 [ExporterHeader(DisplayName = "排序时间")] - public string SortTime { get; set; } + public string? SortTime { get; set; } /// /// 上线日期 @@ -1323,42 +1323,42 @@ namespace TaskManager.Entity /// [MaxLength(8)] // HH:mm:ss 固定8位 [ExporterHeader(DisplayName = "上线时间")] - public string OnLineTime { get; set; } + public string? OnLineTime { get; set; } /// /// 车型类别 /// [MaxLength(50)] [ExporterHeader(DisplayName = "车型类别")] - public string ModelCategory { get; set; } + public string? ModelCategory { get; set; } /// /// 动力总成物料号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "动力总成物料号")] - public string AssemblyMaterialCode { get; set; } + public string? AssemblyMaterialCode { get; set; } /// /// 发动机物料号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "发动机物料号")] - public string MotorMaterialCode { get; set; } + public string? MotorMaterialCode { get; set; } /// /// 工厂 /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂")] - public string Plant { get; set; } + public string? Plant { get; set; } /// /// 创建人 /// [MaxLength(50)] [ExporterHeader(DisplayName = "创建人")] - public string CreateByUser { get; set; } + public string? CreateByUser { get; set; } /// /// 创建时间 @@ -1371,7 +1371,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "修改人")] - public string UpdateByUser { get; set; } + public string? UpdateByUser { get; set; } /// /// 修改时间 @@ -1405,49 +1405,49 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "配送单号")] - public string DeliveryNumber { get; set; } + public string? DeliveryNumber { get; set; } /// /// 行项目号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "行项目号")] - public string SerialNumber { get; set; } + public string? SerialNumber { get; set; } /// /// 配送单状态 /// [MaxLength(50)] [ExporterHeader(DisplayName = "配送单状态")] - public string SerialSrate { get; set; } + public string? SerialSrate { get; set; } /// /// 零件号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件号")] - public string MaterialCode { get; set; } + public string? MaterialCode { get; set; } /// /// 零件名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件名称")] - public string MaterialDescription { get; set; } + public string? MaterialDescription { get; set; } /// /// 工厂代码 /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂代码")] - public string PlantId { get; set; } + public string? PlantId { get; set; } /// /// 收货道口 /// [MaxLength(50)] [ExporterHeader(DisplayName = "收货道口")] - public string ReceivingCrossings { get; set; } + public string? ReceivingCrossings { get; set; } /// /// 数量 @@ -1484,7 +1484,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "创建人")] - public string CreateByUser { get; set; } + public string? CreateByUser { get; set; } /// /// 创建时间 @@ -1497,7 +1497,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "修改人")] - public string UpdateByUser { get; set; } + public string? UpdateByUser { get; set; } /// /// 修改时间 @@ -1534,28 +1534,28 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "退货单号")] - public string ReturnNumber { get; set; } + public string? ReturnNumber { get; set; } /// /// 行项目号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "行项目号")] - public string SerialNumber { get; set; } + public string? SerialNumber { get; set; } /// /// 退货单状态 /// [MaxLength(50)] [ExporterHeader(DisplayName = "退货单状态")] - public string SerialSrate { get; set; } + public string? SerialSrate { get; set; } /// /// 取货地 /// [MaxLength(50)] [ExporterHeader(DisplayName = "取货地")] - public string PickUpLocation { get; set; } + public string? PickUpLocation { get; set; } /// /// 需求取货时间 @@ -1568,35 +1568,35 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "取货道口")] - public string PickUpCrossings { get; set; } + public string? PickUpCrossings { get; set; } /// /// 反馈信息 /// [MaxLength(50)] [ExporterHeader(DisplayName = "反馈信息")] - public string Feedback { get; set; } + public string? Feedback { get; set; } /// /// 工厂 /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂")] - public string Plant { get; set; } + public string? Plant { get; set; } /// /// 零件号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件号")] - public string MaterialCode { get; set; } + public string? MaterialCode { get; set; } /// /// 零件名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件名称")] - public string MaterialDescription { get; set; } + public string? MaterialDescription { get; set; } /// /// 数量 @@ -1609,35 +1609,35 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "退货类型")] - public string ReturnType { get; set; } + public string? ReturnType { get; set; } /// /// 批次号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "批次号")] - public string LotNumber { get; set; } + public string? LotNumber { get; set; } /// /// 判定人 /// [MaxLength(50)] [ExporterHeader(DisplayName = "判定人")] - public string Judge { get; set; } + public string? Judge { get; set; } /// /// 退货原因 /// [MaxLength(50)] [ExporterHeader(DisplayName = "退货原因")] - public string ReturnReason { get; set; } + public string? ReturnReason { get; set; } /// /// 创建人 /// [MaxLength(50)] [ExporterHeader(DisplayName = "创建人")] - public string CreateByUser { get; set; } + public string? CreateByUser { get; set; } /// /// 创建时间 @@ -1650,7 +1650,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "修改人")] - public string UpdateByUser { get; set; } + public string? UpdateByUser { get; set; } /// /// 修改时间 @@ -1688,28 +1688,28 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂代码")] - public string PlantId { get; set; } + public string? PlantId { get; set; } /// /// 工厂名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂名称")] - public string PlantName { get; set; } + public string? PlantName { get; set; } /// /// 零件号 /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件号")] - public string MaterialCode { get; set; } + public string? MaterialCode { get; set; } /// /// 零件名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件名称")] - public string MaterialDescription { get; set; } + public string? MaterialDescription { get; set; } /// /// 当前库存数量 @@ -1722,7 +1722,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "库存状态")] - public string StockState { get; set; } + public string? StockState { get; set; } /// /// 更新时间 @@ -1735,7 +1735,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "创建人")] - public string CreateByUser { get; set; } + public string? CreateByUser { get; set; } /// /// 创建时间 @@ -1748,7 +1748,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "修改人")] - public string UpdateByUser { get; set; } + public string? UpdateByUser { get; set; } /// /// 修改时间 @@ -1775,19 +1775,19 @@ namespace TaskManager.Entity /// //public class SUPPLIER_SINV_DATA : CherryReadBaseEntity //{ - // public string SupplierCode { get; set; } - // public string SupplierName { get; set; } - // public string MaterialCode { get; set; } - // public string MaterialDescription { get; set; } - // public string MaterialType { get; set; } + // public string? SupplierCode { get; set; } + // public string? SupplierName { get; set; } + // public string? MaterialCode { get; set; } + // public string? MaterialDescription { get; set; } + // public string? MaterialType { get; set; } // public int QuantityCurrent { get; set; } // public int QuantityPlan { get; set; } - // public string InventoryStatus { get; set; } + // public string? InventoryStatus { get; set; } // public int SafetyStock { get; set; } - // public string ProductionCycle { get; set; } - // public string DataUpdateTime { get; set; } - // public string SupplierBatch { get; set; } - // public string SupplieryxqDate { get; set; } + // public string? ProductionCycle { get; set; } + // public string? DataUpdateTime { get; set; } + // public string? SupplierBatch { get; set; } + // public string? SupplieryxqDate { get; set; } //} /// @@ -1801,49 +1801,49 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂代码")] - public string PlantId { get; set; } + public string? PlantId { get; set; } /// /// 工厂名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂名称")] - public string PlantName { get; set; } + public string? PlantName { get; set; } /// /// 需求状态 /// [MaxLength(50)] [ExporterHeader(DisplayName = "需求状态")] - public string DemandSrate { get; set; } + public string? DemandSrate { get; set; } /// /// 需求类型 /// [MaxLength(50)] [ExporterHeader(DisplayName = "需求类型")] - public string DemandType { get; set; } + public string? DemandType { get; set; } /// /// 零件号（奇瑞零件号） /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件号")] - public string MaterialCode { get; set; } + public string? MaterialCode { get; set; } /// /// 零件名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件名称")] - public string MaterialDescription { get; set; } + public string? MaterialDescription { get; set; } /// /// 集货标识 /// [MaxLength(50)] [ExporterHeader(DisplayName = "集货标识")] - public string SummarySign { get; set; } + public string? SummarySign { get; set; } /// /// 需求日期 @@ -1922,7 +1922,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "创建人")] - public string CreateByUser { get; set; } + public string? CreateByUser { get; set; } /// /// 创建时间 @@ -1935,7 +1935,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "修改人")] - public string UpdateByUser { get; set; } + public string? UpdateByUser { get; set; } /// /// 修改时间 @@ -1974,21 +1974,21 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "工厂代码")] - public string PlantId { get; set; } + public string? PlantId { get; set; } /// /// 零件号（奇瑞零件号） /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件号")] - public string MaterialCode { get; set; } + public string? MaterialCode { get; set; } /// /// 零件名称 /// [MaxLength(50)] [ExporterHeader(DisplayName = "零件名称")] - public string MaterialDescription { get; set; } + public string? MaterialDescription { get; set; } /// /// 当前库存 @@ -2037,7 +2037,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "创建人")] - public string CreateByUser { get; set; } + public string? CreateByUser { get; set; } /// /// 创建时间 @@ -2049,7 +2049,7 @@ namespace TaskManager.Entity /// [MaxLength(50)] [ExporterHeader(DisplayName = "修改人")] - public string UpdateByUser { get; set; } + public string? UpdateByUser { get; set; } /// /// 修改时间 diff --git a/API/Wood.Admin.WebApi/Startup.cs b/API/Wood.Admin.WebApi/Startup.cs index ded3a76..4d4e5bd 100644 --- a/API/Wood.Admin.WebApi/Startup.cs +++ b/API/Wood.Admin.WebApi/Startup.cs @@ -73,9 +73,57 @@ namespace Wood.Admin.WebApi services.AddHttpClient(); services.AddScoped(); - services.AddScoped(); + services.AddScoped(); + // 注册所有需要通过 GetRequiredService 获取的服务 + + // 1. 整车月度生产计划相关 + services.AddScoped(); + + // 2. M+6月物料需求计划相关 + services.AddScoped(); + + // 3. 日物料需求计划相关 + services.AddScoped(); + + // 4. 计划协议相关 + services.AddScoped(); + + // 5. 采购订单相关 + services.AddScoped(); + + // 6. 过焊装未过总装相关 + services.AddScoped(); + + // 7. 过涂装未过总装相关 + services.AddScoped(); // 注意类型名是否包含大小写问题（如驼峰命名） + + // 8. 排序供货相关 + services.AddScoped(); + + // 9. 看板配送单相关 + services.AddScoped(); + + // 10. 退货单相关 + services.AddScoped(); + + // 11. 奇瑞RDC共享库存相关 + services.AddScoped(); + + // 12. 日MRP预警推移相关 + services.AddScoped(); + + // 13. 供应商共享库存相关 + services.AddScoped(); + + // 14. 风险确认相关服务（如果类型名正确） + + + + + + // 配置 DbContext 使用 SQL Server 连接字符串 services.AddDbContext(options => options.UseSqlServer(GlobalContext.SystemConfig.CustomerDb)); @@ -268,9 +316,11 @@ namespace Wood.Admin.WebApi options.OperationFilter(); #endregion }); - //var s = services.BuildServiceProvider().GetRequiredService(); - // s.TaskAllAsync("2025-05-29"); + services.AddControllers(); + var s = services.BuildServiceProvider().GetRequiredService(); + + s.TaskAllAsync("2025-05-29"); diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index 238c54e..63451ee 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -113,12 +113,12 @@ namespace TaskManager.Controllers switch (task.TaskName) { - case "整车月度生产计划1": + //case "整车月度生产计划1": - // 添加的代码块 - var controller1 = _builder.GetRequiredService(); - await controller1.TestAsync(url, path, taskname, "2025-05-29"); - break; + // // 添加的代码块 + // var controller1 = _builder.GetRequiredService(); + // await controller1.TestAsync(url, path, taskname, "2025-05-29"); + // break; case "M+6月物料需求计划1":