From b4f69a8e94be4007f568c4ae6d43c3cf92e21391 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 10:07:15 +0800 Subject: [PATCH 1/3] =?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 | 182 +++++++++++++++++- .../Controllers/TaskConifgureController.cs | 40 +++- 2 files changed, 216 insertions(+), 6 deletions(-) diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index ab9ba3a..a9f79f1 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -21,18 +21,36 @@ namespace TaskManager.Entity [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long UId { get; set; } /// - /// 加密用API路径 + /// API路径 /// public string Api { get; set; } + /// + /// 任务周期设置 + /// public string Corn { get; set; } + /// + /// 模块 + /// public string Module { get; set; } + /// + /// 备注 + /// public string Remark { get; set; } + /// + /// 表名 + /// public string TableName { get; set; } + /// + /// 任务名称 + /// public string TaskName { get; set; } /// - /// 调用全路径 + /// 全路径 /// public string Url { get; set; } + /// + /// 是否自动执行 + /// public bool IsAuto { get; set; } } @@ -42,10 +60,25 @@ namespace TaskManager.Entity [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long UId { get; set; } + /// + /// 详细描述 + /// public string Info { get; set; } + /// + /// 日志类型 + /// public string Type { get; set; } + /// + /// 任务名称 + /// public string TaskName { get; set; } + /// + /// 创建时间 + /// public DateTime CreationTime { set; get; } + /// + /// 备注 + /// public string Remark { get; set; } } @@ -54,6 +87,9 @@ namespace TaskManager.Entity [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] public long UId { get; set; } + /// + /// 写状态 + /// public bool WriteState { get; set; } public bool ReadState { get; set; } @@ -74,7 +110,147 @@ namespace TaskManager.Entity } - + /// + /// 任务订阅实体类（对应数据库表 TEA_TASK_SUB） + /// + public class TaskSub:BaseEntity + { + + /// + /// 关联的数据表名称（如：订单表、用户表等，可为空） + /// + public string? TableName { get; set; } + + /// + /// 任务名称（用于业务层面标识任务，如：数据同步任务、报表生成任务） + /// + public string? TaskName { get; set; } + + /// + /// 数据总量（任务处理的数据条目数） + /// + public int DataCount { get; set; } + + /// + /// 发布给那个客户 + /// + public string? Subscriber { get; set; } + + /// + /// 失败次数（任务执行失败的累计次数） + /// + public int FailedCount { get; set; } + + /// + /// 失败详情（记录失败原因、异常堆栈等信息，支持长文本） + /// + public string? FailedInfo { get; set; } + + /// + /// 所属域（多租户场景下标识租户，如：租户A、租户B） + /// + public string? Domain { get; set; } + + /// + /// 站点标识（多站点部署时标识所属站点，如：Site1、Site2） + /// + public string? Site { get; set; } + + /// + /// 从那个内部系统创建系统 + /// + public string? CreateUser { get; set; } + + /// + /// 创建时间（任务创建的时间戳） + /// + public DateTime CreateTime { get; set; } + + /// + /// 备注信息（任务相关的补充说明，支持长文本） + /// + public string? Remark { get; set; } + + /// + /// 最后更新人（记录任务最后修改者） + /// + public string? UpdateUser { get; set; } + + /// + /// 最后更新时间（任务最后修改的时间戳，可为空） + /// + public DateTime? UpdateTime { get; set; } + } + + + + + + + + + /// + /// 来料检验数据 + /// + public class SUPPLIER_PRO_MATERIAL_STOCK:BaseEntity + { + } + + /// + /// 排产数据 + /// + public class SUPPLIER_PRO_SCHEDULING : BaseEntity + { + } + + /// + /// 供应商基础信息 + /// + public class SUPPLIER_INFO : BaseEntity + { + } + + /// + /// 人员资质信息 + /// + public class SUPPLIER_EMPLOYEE : BaseEntity + { + } + + /// + /// BOM主数据 + /// + public class SUPPLIER_BOM : BaseEntity + { + } + + /// + /// 过程控制项质量数据 + /// + public class SUPPLIER_PRO_CPS : BaseEntity + { + } + + /// + /// 生产过程数据 + /// + public class SUPPLIER_PRO_DATA : BaseEntity + { + } + + /// + /// 产品一次合格率 + /// + public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity + { + } + + /// + /// 工位一次合格率 + /// + //public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity + //{ + //} /// /// 缺陷业务数据 diff --git a/API/Wood.Service/Controllers/TaskConifgureController.cs b/API/Wood.Service/Controllers/TaskConifgureController.cs index a248b15..61d552c 100644 --- a/API/Wood.Service/Controllers/TaskConifgureController.cs +++ b/API/Wood.Service/Controllers/TaskConifgureController.cs @@ -84,6 +84,15 @@ namespace TaskManager.Controllers } + /// + /// 导出 + /// + /// 第几页 + /// 每页条数 + /// 排序列 + /// 是否升序 + /// 查询条件 + /// public async Task Export([FromQuery] int pageNumber = 1, [FromQuery] int pageSize = 10, @@ -138,7 +147,10 @@ namespace TaskManager.Controllers - + /// + /// 刷新任务 + /// + /// public async Task RefreshTaskConfig() { @@ -611,12 +623,21 @@ namespace TaskManager.Controllers } + /// + /// 获得所有揭露 + /// + /// [HttpGet] public async Task>> GetAll() { return await _repository.GetAllAsync() as List; } + /// + /// 通过UID获得实体 + /// + /// + /// [HttpGet("{id}")] public async Task> GetById(int id) { @@ -625,6 +646,11 @@ namespace TaskManager.Controllers return entity; } + /// + /// 创建实体 + /// + /// + /// [HttpPost] public async Task> Create(TaskConifgure entity) { @@ -632,7 +658,11 @@ namespace TaskManager.Controllers var createdEntity = await _repository.AddAsync(entity); return new JsonResult(new { Code = 200, Message = "创建成功!" }); } - + /// + /// 更新实体UID + /// + /// + /// [HttpPut("{id}")] public async Task Update(TaskConifgure entity) { @@ -646,7 +676,11 @@ namespace TaskManager.Controllers await _repository.UpdateAsync(entity); return new JsonResult(new { Code = 200, Message = "修改成功!" }); } - + /// + /// 删除实体通过UID + /// + /// + /// [HttpDelete("{id}")] public async Task Delete(int id) { From 85032367cb21eaeaf556b2dd1d8cf043febe7cfd Mon Sep 17 00:00:00 2001 From: zhouhongjun <565221961@qq.com> Date: Thu, 29 May 2025 10:35:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=B4=A8=E9=87=8F01=E5=88=B009DTO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs | 165 ++++++++++++++++++ .../Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs | 110 ++++++++++++ ...UPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs | 135 ++++++++++++++ 3 files changed, 410 insertions(+) create mode 100644 API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs create mode 100644 API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs create mode 100644 API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs new file mode 100644 index 0000000..bd68fc0 --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_MATERIAL_STOCK_DTO.cs @@ -0,0 +1,165 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskManager.Contracts.Dtos; + +namespace TaskManager.Contracts.Dtos +{ + /// + /// 来料检验数据 + /// + public class SUPPLIER_PRO_MATERIAL_STOCK_DTO : BaseEntityDto + { + /// + /// 供应商代码 + /// + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// 供应商子零件编号 + /// + public string SupplierSubCode { get; set; } + + /// + /// 供应商子零件名称 + /// + public string SupplierSubName { get; set; } + + /// + /// 分供方代码 + /// + public string SubSupplierCode { get; set; } + + /// + /// 分供方名称 + /// + public string SubSupplierName { get; set; } + + /// + /// 分供方地址，分供方发货地址：省市区（县），不用于详细地址 + /// + public string SubSupplierAddress { get; set; } + + /// + /// 分供方子件编码 + /// + public string ComponentCode { get; set; } + + /// + /// 分供方子件名称 + /// + public string ComponentName { get; set; } + + /// + /// 子件批次号 + /// + public string SubBatchNo { get; set; } + + /// + /// 子件批次数量 + /// + public decimal SubBatchNum { get; set; } + + /// + /// 子件SN码 + /// + public string SubBatchSn { get; set; } + + /// + /// 检验人员编号 + /// + public string EmpCode { get; set; } + + /// + /// 检验人员姓名 + /// + public string EmpName { get; set; } + + /// + /// 检测设备编号 + /// + public string DeviceCode { get; set; } + + /// + /// 检测设备名称 + /// + public string DeviceName { get; set; } + + /// + /// 参数名称/特性名称 + /// + public string FeatureName { get; set; } + + /// + /// 参数单位/特性单位 + /// + public string FeatureUnit { get; set; } + + /// + /// 参数/特性标准值 + /// + public string StandardValue { get; set; } + + /// + /// 参数/特性上限值 + /// + public string FeatureUpper { get; set; } + + /// + /// 参数/特性下限值 + /// + public string FeatureLower { get; set; } + + /// + /// 参数/特性实测值 + /// + public string FeatureValue { get; set; } + + /// + /// 来料检验单号 + /// + public string CheckNo { get; set; } + + /// + /// 批次的最终判定结果，OK合格/NG不合格 + /// + public string CheckResult { get; set; } + + /// + /// 检验时间，格式(yyyy-MM-dd HH:mm:ss) + /// + public string CheckTime { get; set; } + + /// + /// 控制项要求频率 + /// + public decimal SamplingRate { get; set; } + + /// + /// 上下限更新时间，格式(yyyy-MM-dd HH:mm:ss) + /// + public string LimitUpdateTime { get; set; } + + /// + /// 控制项描述 + /// + public string VendorFieldDesc { get; set; } + + /// + /// 控制项代码 + /// + public string VendorFieldCode { get; set; } + + /// + /// 库存有效日期，格式(yyyy-MM-dd HH:mm:ss) + /// + public string DeadLine { get; set; } + } +} diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs new file mode 100644 index 0000000..2dcfa1f --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_SCHEDULING_DTO.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskManager.Contracts.Dtos; + +namespace TaskManager.Contracts.Dtos +{ + /// + /// 排产数据 + /// + public class SUPPLIER_PRO_SCHEDULING_DTO : BaseEntityDto + { + /// + /// 供应商代码 + /// + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// 工厂代码 + /// + public string PlantId { get; set; } + + /// + /// 工厂名称 + /// + public string PlantName { get; set; } + + /// + /// 供应商总成零件号 + /// + public string VendorProductNo { get; set; } + + /// + /// 供应商总成零件名称 + /// + public string VendorProductName { get; set; } + + /// + /// 奇瑞零件号 + /// + public string CheryProductNo { get; set; } + + /// + /// 奇瑞零件名称 + /// + public string CheryProductName { get; set; } + + /// + /// 计划单号 + /// + public string PlanNo { get; set; } + + /// + /// 生产工单号 + /// + public string ManufactureNo { get; set; } + + /// + /// 生产批次号 + /// + public string ProductBatchNo { get; set; } + + /// + /// 批次计划数量 + /// + public decimal ManufactureNum { get; set; } + + /// + /// 批次投入数量 + /// + public decimal ManufactureInputNum { get; set; } + + /// + /// 批次产出数量 + /// + public decimal ManufactureOutputNum { get; set; } + + /// + /// 排产状态（0:未生产，1:生产中，2:已完工，3:已取消，4:已终止） + /// + public int PlanStatus { get; set; } + + /// + /// 计划开始时间（格式：yyyy-MM-dd HH:mm:ss） + /// + public string PlanBeginTime { get; set; } + + /// + /// 计划结束时间（格式：yyyy-MM-dd HH:mm:ss） + /// + public string PlanEndTime { get; set; } + + /// + /// 实际开始时间（格式：yyyy-MM-dd HH:mm:ss） + /// + public string ActualBeginTime { get; set; } + + /// + /// 实际结束时间（格式：yyyy-MM-dd HH:mm:ss） + /// + public string ActualEndTime { get; set; } + } +} diff --git a/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs new file mode 100644 index 0000000..62235a9 --- /dev/null +++ b/API/TaskManager.Contracts/Dtos/01_09/SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO.cs @@ -0,0 +1,135 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TaskManager.Contracts.Dtos; + +namespace TaskManager.Contracts.Dtos +{ + /// + /// 工位一次合格率 + /// + public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD_DTO : BaseEntityDto + { + /// + /// 供应商代码 + /// + public string SupplierCode { get; set; } + + /// + /// 供应商名称 + /// + public string SupplierName { get; set; } + + /// + /// 工厂代码 + /// + public string PlantId { get; set; } + + /// + /// 工厂名称 + /// + public string PlantName { get; set; } + + /// + /// 车间代码 + /// + public string WorkshopId { get; set; } + + /// + /// 车间名称 + /// + public string WorkshopName { get; set; } + + /// + /// 产线代码 + /// + public string ProductionLineId { get; set; } + + /// + /// 产线名称 + /// + public string ProductionLineName { get; set; } + + /// + /// 工位代码 + /// + public string StationId { get; set; } + + /// + /// 工位名称 + /// + public string StationName { get; set; } + + /// + /// 奇瑞零件号 + /// + public string CheryProductNo { get; set; } + + /// + /// 奇瑞零件名称 + /// + public string CheryProductName { get; set; } + + /// + /// 供应商总成零件号 + /// + public string VendorProductNo { get; set; } + + /// + /// 供应商总成零件名称 + /// + public string VendorProductName { get; set; } + + /// + /// 生产批次号 + /// + public string ProductBatchNo { get; set; } + + /// + /// 生产工单号（跟排产工单号关联） + /// + public string ManufactureNo { get; set; } + + /// + /// 批次计划数量 + /// + public decimal WorkOrderNumber { get; set; } + + /// + /// 不合格数 + /// + public decimal DefectiveNumber { get; set; } + + /// + /// 合格数 + /// + public decimal AcceptableNumber { get; set; } + + /// + /// 一次合格率实际值（使用小数表示，如 0.9601 表示 96.01%，整数位最多10位，小数位最多3位） + /// + public decimal OncePassRateRealValue { get; set; } + + /// + /// 一次合格率目标值（使用小数表示，如 0.96 表示 96.00%，整数位最多10位，小数位最多3位） + /// + public decimal OncePassRateTagValue { get; set; } + + /// + /// 班次（白班，晚班，中班） + /// + public string WorkShift { get; set; } + + /// + /// 生产日期，格式：yyyy-MM-dd HH:mm:ss + /// + public string StatisticalTime { get; set; } + + /// + /// 值统计时间，格式：yyyy-MM-dd HH:mm:ss + /// + public string DateTime { get; set; } + } +} From 816f17bf17a840c394595010de999bbd345619a2 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 10:40:08 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- API/TaskManager.Entity/Entity.cs | 143 +++--------------- .../TaskManager.Entity.csproj | 6 +- .../Repository/Repository.cs | 5 - 3 files changed, 21 insertions(+), 133 deletions(-) diff --git a/API/TaskManager.Entity/Entity.cs b/API/TaskManager.Entity/Entity.cs index a9f79f1..198a9f9 100644 --- a/API/TaskManager.Entity/Entity.cs +++ b/API/TaskManager.Entity/Entity.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +using Magicodes.ExporterAndImporter.Core; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; @@ -19,38 +20,48 @@ namespace TaskManager.Entity { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [ExporterHeader(IsIgnore = true)] public long UId { get; set; } /// /// API路径 /// + [ExporterHeader(DisplayName = "API路径")] public string Api { get; set; } /// /// 任务周期设置 /// + [ExporterHeader(DisplayName = "任务周期设置")] public string Corn { get; set; } /// /// 模块 /// + [ExporterHeader(IsIgnore = true)] public string Module { get; set; } + /// /// 备注 /// + [ExporterHeader(DisplayName = "备注")] public string Remark { get; set; } /// /// 表名 /// + [ExporterHeader(IsIgnore =true)] public string TableName { get; set; } /// /// 任务名称 /// + [ExporterHeader(DisplayName = "任务名称")] public string TaskName { get; set; } /// /// 全路径 /// + [ExporterHeader(DisplayName = "全路径")] public string Url { get; set; } /// /// 是否自动执行 /// + [ExporterHeader(DisplayName = "是否自动执行")] public bool IsAuto { get; set; } } @@ -86,17 +97,19 @@ namespace TaskManager.Entity { [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] + [ExporterHeader(IsIgnore=true)] public long UId { get; set; } /// /// 写状态 /// public bool WriteState { get; set; } + [ExporterHeader(IsIgnore = true)] public bool ReadState { get; set; } - + [ExporterHeader(IsIgnore = true)] public DateTime CreationTime { get; set; } - + [ExporterHeader(IsIgnore = true)] public string Remark { get; set; } - + [ExporterHeader(IsIgnore = true)] public Guid TaskId { get; set; } } @@ -115,7 +128,7 @@ namespace TaskManager.Entity /// public class TaskSub:BaseEntity { - + [ExporterHeader(DisplayName = "用户名")] /// /// 关联的数据表名称（如：订单表、用户表等，可为空） /// @@ -189,125 +202,7 @@ namespace TaskManager.Entity - /// - /// 来料检验数据 - /// - public class SUPPLIER_PRO_MATERIAL_STOCK:BaseEntity - { - } - - /// - /// 排产数据 - /// - public class SUPPLIER_PRO_SCHEDULING : BaseEntity - { - } - - /// - /// 供应商基础信息 - /// - public class SUPPLIER_INFO : BaseEntity - { - } - - /// - /// 人员资质信息 - /// - public class SUPPLIER_EMPLOYEE : BaseEntity - { - } - - /// - /// BOM主数据 - /// - public class SUPPLIER_BOM : BaseEntity - { - } - - /// - /// 过程控制项质量数据 - /// - public class SUPPLIER_PRO_CPS : BaseEntity - { - } - - /// - /// 生产过程数据 - /// - public class SUPPLIER_PRO_DATA : BaseEntity - { - } - - /// - /// 产品一次合格率 - /// - public class SUPPLIER_PRO_FIRST_PASSYIELD : BaseEntity - { - } - - /// - /// 工位一次合格率 - /// - //public class SUPPLIER_PRO_STATION_FIRST_PASSYIELD : BaseEntity - //{ - //} - - /// - /// 缺陷业务数据 - /// - public class SUPPLIER_PRO_FLAW : BaseEntity - { - } - - /// - /// 环境业务数据 - /// - public class SUPPLIER_PRO_ENVIRONMENT : BaseEntity - { - } - - /// - /// 设备OEE达成率 - /// - public class SUPPLIER_PRO_OEE_ACHIEVEMENT_RATE : BaseEntity - { - } - - /// - /// OEE时间明细 - /// - public class SUPPLIER_PRO_OEE_TIME_DETAILS : BaseEntity - { - } - - /// - /// 物料主数据 - /// - public class SUPPLIER_PRO_MATERIAL_DATA : BaseEntity - { - } - - /// - /// 附件类数据 - /// - public class SUPPLIER_PRO_ATTACHMENT_DATA : BaseEntity - { - } - - /// - /// 工艺装备 - /// - public class SUPPLIER_PRO_PROCESS_EQUIPMENT : BaseEntity - { - } - - /// - /// 工艺 - /// - public class SUPPLIER_PRO_PROCESS : BaseEntity - { - } - + /// /// 整车月度生产计划-2 /// diff --git a/API/TaskManager.Entity/TaskManager.Entity.csproj b/API/TaskManager.Entity/TaskManager.Entity.csproj index b11c8a0..90c35bc 100644 --- a/API/TaskManager.Entity/TaskManager.Entity.csproj +++ b/API/TaskManager.Entity/TaskManager.Entity.csproj @@ -7,11 +7,9 @@ + + - - - - diff --git a/API/TaskManager.EntityFramework/Repository/Repository.cs b/API/TaskManager.EntityFramework/Repository/Repository.cs index 3ced26d..c5a9b5f 100644 --- a/API/TaskManager.EntityFramework/Repository/Repository.cs +++ b/API/TaskManager.EntityFramework/Repository/Repository.cs @@ -90,11 +90,6 @@ namespace TaskManager.EntityFramework.Repository return await query.ToPagedListAsync(pagingParams); } - - - - - } public class PagedResult {