重写模具保养

EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipMaintainRecordQueryOutput.cs

@@ -9,6 +9,10 @@ namespace Tnb.EquipMgr.Entities.Dto
         public string? create_time { get; set; }
         public string? equip_id { get; set; }
         public string? equip_id_id { get; set; }
+        
+        public string? mold_id { get; set; }
+        public string? mold_id_id { get; set; }
+        
         public string? execute_time { get; set; }
         public string? execute_user_id { get; set; }
         public string? repeat_remark { get; set; }

EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipQueryInput.cs

@@ -3,6 +3,8 @@ namespace Tnb.EquipMgr.Entities.Dto
     public class EquipQueryInput
     {
         public string equip_id { get; set; } = string.Empty;
+        
+        public string mold_id { get; set; } = string.Empty;
 
         /// <summary>
         /// 当前页码:pageIndex.

EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolMoldMaintainPlanRunListOutput.cs

@@ -0,0 +1,17 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class ToolMoldMaintainPlanRunListOutput
+    {
+        public string id { get; set; }
+        public string plan_code { get; set; }
+        public string mode { get; set; }
+        public string status { get; set; }
+        public string create_id { get; set; }
+        public string create_time { get; set; }
+        public string plan_start_date { get; set; }
+        public string plan_end_date { get; set; }
+        public string remark { get; set; }
+        public string starter_id { get; set; }
+        public string act_start_date { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolMoldMaintainRecordListOutput.cs

@@ -0,0 +1,27 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class ToolMoldMaintainRecordListOutput
+    {
+        public string id { get; set; }
+        public string mold_id { get; set; }
+        public string mold_id_id { get; set; }
+        public string status { get; set; }
+        public string result { get; set; }
+        public string result_remark { get; set; }
+        public string repeat_result { get; set; }
+        public string repeat_remark { get; set; }
+        public string create_time { get; set; }
+        public string execute_time { get; set; }
+        public string repeat_user_id { get; set; }
+        public string repeat_user_id_id { get; set; }
+        public string execute_user_id { get; set; }
+        public string execute_user_id_id { get; set; }
+        public string repeat_time { get; set; }
+        public string last_execute_time { get; set; }
+
+        public DateTime? date_repeat_time { get; set; }
+        public DateTime? date_create_time { get; set; }
+        public DateTime? date_execute_time { get; set; }
+        public DateTime? date_last_execute_time { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolMoldMaintainRecordRepeatOutput.cs

@@ -0,0 +1,9 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class ToolMoldMaintainRecordRepeatOutput
+    {
+        public ToolMoldMaintainRecordH? model { get; set; }
+
+        public List<ToolMoldMaintainRecordD>? details { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/ToolTemPublishInput.cs

@@ -0,0 +1,9 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class ToolTemPublishInput
+    {
+        public string? id { get; set; }
+
+        public string[]? moldIds { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMaintainItem.cs

@@ -0,0 +1,77 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities
+{
+    /// <summary>
+    /// 设备保养项目
+    /// </summary>
+    [SugarTable("tool_maintain_item")]
+    public class ToolMaintainItem: BaseEntity<string>
+    {
+        public ToolMaintainItem()
+        {
+            id = SnowflakeIdHelper.NextId();
+        }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? create_time { get; set; }
+    
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string? create_id { get; set; }
+    
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? modify_time { get; set; }
+    
+        /// <summary>
+        /// 修改用户
+        /// </summary>
+        public string? modify_id { get; set; }
+    
+        /// <summary>
+        /// 项目编码
+        /// </summary>
+        public string? code { get; set; }
+    
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string? name { get; set; }
+    
+        /// <summary>
+        /// 保养类型
+        /// </summary>
+        public string? maintain_type { get; set; }
+    
+        /// <summary>
+        /// 保养内容
+        /// </summary>
+        public string? maintain_content { get; set; }
+    
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string? descrip { get; set; }
+    
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? remark { get; set; }
+    
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int? ordinal { get; set; }
+    
+        /// <summary>
+        /// 所属组织
+        /// </summary>
+        public string? org_id { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMaintainTemD.cs

@@ -0,0 +1,27 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 模具保养模板子表
+/// </summary>
+[SugarTable("tool_maintain_tem_d")]
+public partial class ToolMaintainTemD : BaseEntity<string>
+{
+    public ToolMaintainTemD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 模具保养模板主表id
+    /// </summary>
+    public string maintain_tem_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 模具保养项id
+    /// </summary>
+    public string maintain_item_id { get; set; } = string.Empty;
+
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMaintainTemH.cs

@@ -0,0 +1,135 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 模具保养模板主表
+/// </summary>
+[SugarTable("tool_maintain_tem_h")]
+public partial class ToolMaintainTemH : BaseEntity<string>
+{
+    public ToolMaintainTemH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 设备类型id
+    /// </summary>
+    public string? equip_type_id { get; set; }
+
+    /// <summary>
+    /// 编码
+    /// </summary>
+    public string code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 周期
+    /// </summary>
+    public int plan_cycle { get; set; }
+
+    /// <summary>
+    /// 周期方式 1 单次 2 循环
+    /// </summary>
+    public string? plan_cycle_unit { get; set; }
+
+    /// <summary>
+    /// 计划执行通知提前量
+    /// </summary>
+    public int? plan_run_notice { get; set; }
+
+    /// <summary>
+    /// 计划执行通知提前量单位 1 小时 2 天 3 周
+    /// </summary>
+    public string? plan_run_notice_unit { get; set; }
+
+    /// <summary>
+    /// 执行滞后推送时间
+    /// </summary>
+    public int? plan_delay { get; set; }
+
+    /// <summary>
+    /// 执行滞后推送时间单位 1 小时 2 天 3 周
+    /// </summary>
+    public string? plan_delay_unit { get; set; }
+
+    /// <summary>
+    /// 启用时间
+    /// </summary>
+    public DateTime start_time { get; set; } = DateTime.Now;
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public int is_start { get; set; }
+
+    /// <summary>
+    /// 是否复核
+    /// </summary>
+    public int is_repeat { get; set; }
+
+    /// <summary>
+    /// 复核岗位id
+    /// </summary>
+    public string repeat_post_info_user_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int? ordinal { get; set; }
+
+    /// <summary>
+    /// 不合格推送 0 不推送 1 推送
+    /// </summary>
+    public int is_send { get; set; }
+
+    /// <summary>
+    /// 推送人id
+    /// </summary>
+    public string? send_post_id { get; set; }
+
+    /// <summary>
+    /// 责任岗位id
+    /// </summary>
+    public string send_post_info_user_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+   public string? duty_user_id { get; set; }
+   public string? repeat_user_id { get; set; }
+
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMaintainTemMoldD.cs

@@ -0,0 +1,27 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 模具保养模具模板子表
+/// </summary>
+[SugarTable("tool_maintain_tem_mold_d")]
+public partial class ToolMaintainTemMoldD : BaseEntity<string>
+{
+    public ToolMaintainTemMoldD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 模具保养模具模板主表id
+    /// </summary>
+    public string maintain_tem_mold_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 模具保养项id
+    /// </summary>
+    public string maintain_item_id { get; set; } = string.Empty;
+
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMaintainTemMoldH.cs

@@ -0,0 +1,140 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 模具保养模具模板主表
+/// </summary>
+[SugarTable("tool_maintain_tem_mold_h")]
+public partial class ToolMaintainTemMoldH : BaseEntity<string>
+{
+    public ToolMaintainTemMoldH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime create_time { get; set; } = DateTime.Now;
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 模具保养模板表id
+    /// </summary>
+    public string? maintain_tem_id { get; set; }
+
+    /// <summary>
+    /// 模具id
+    /// </summary>
+    public string? mold_id { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int ordinal { get; set; }
+
+    /// <summary>
+    /// 编码
+    /// </summary>
+    public string code { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 周期
+    /// </summary>
+    public int plan_cycle { get; set; }
+
+    /// <summary>
+    /// 周期方式 1 单次 2 循环
+    /// </summary>
+    public string? plan_cycle_unit { get; set; }
+
+    /// <summary>
+    /// 计划执行通知提前量
+    /// </summary>
+    public int? plan_run_notice { get; set; }
+
+    /// <summary>
+    /// 计划执行通知提前量单位 1 小时 2 天 3 周
+    /// </summary>
+    public string? plan_run_notice_unit { get; set; }
+
+    /// <summary>
+    /// 执行滞后推送时间
+    /// </summary>
+    public int? plan_delay { get; set; }
+
+    /// <summary>
+    /// 执行滞后推送时间单位 1 小时 2 天 3 周
+    /// </summary>
+    public string? plan_delay_unit { get; set; }
+
+    /// <summary>
+    /// 启用时间
+    /// </summary>
+    public DateTime start_time { get; set; } = DateTime.Now;
+
+    /// <summary>
+    /// 是否启用
+    /// </summary>
+    public string? is_start { get; set; }
+
+    /// <summary>
+    /// 是否复核
+    /// </summary>
+    public string? is_repeat { get; set; }
+
+    /// <summary>
+    /// 复核岗位id
+    /// </summary>
+    public string repeat_post_info_user_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 不合格推送 0 不推送 1 推送
+    /// </summary>
+    public int is_send { get; set; }
+
+    /// <summary>
+    /// 推送人id
+    /// </summary>
+    public string? send_post_id { get; set; }
+
+    /// <summary>
+    /// 责任岗位id
+    /// </summary>
+    public string send_post_info_user_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+    public string? duty_user_id { get; set; }
+    public string? repeat_user_id { get; set; }
+
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainPlan.cs

@@ -39,6 +39,21 @@ namespace Tnb.EquipMgr.Entities
         /// 计划完成时间
         /// </summary>
         public DateTime? plan_end_date { get; set; }
+        
+        /// <summary>
+        /// 实际开始时间
+        /// </summary>
+        public DateTime? act_start_date { get; set; }
+        
+        /// <summary>
+        /// 开始人
+        /// </summary>
+        public string starter_id { get; set; }
+
+        /// <summary>
+        /// 实际结束时间
+        /// </summary>
+        public DateTime? act_end_date { get; set; }
 
         /// <summary>
         /// 备注

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRecordD.cs

@@ -0,0 +1,92 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 模具保养执行记录子表
+/// </summary>
+[SugarTable("tool_mold_maintain_record_d")]
+public partial class ToolMoldMaintainRecordD : BaseEntity<string>
+{
+    public ToolMoldMaintainRecordD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 模具保养执行记录id
+    /// </summary>
+    public string maintain_record_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 模具保养检项id
+    /// </summary>
+    public string maintain_item_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 编码
+    /// </summary>
+    public string? code { get; set; }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string? name { get; set; }
+
+    /// <summary>
+    /// 结果 1 通过 2 不通过
+    /// </summary>
+    public string? result { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public long ordinal { get; set; }
+
+    /// <summary>
+    /// 模具保养模具模板id
+    /// </summary>
+    public string? maintain_tem_mold_id { get; set; }
+
+    /// <summary>
+    /// 是否通过 
+    /// </summary>
+    public string? is_pass { get; set; }
+
+    /// <summary>
+    /// 保养项描述
+    /// </summary>
+    public string? descrip { get; set; }
+
+    /// <summary>
+    /// 保养类型
+    /// </summary>
+    public string maintain_type { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 保养内容
+    /// </summary>
+    public string? maintain_content { get; set; }
+
+    /// <summary>
+    /// 保养结果描述
+    /// </summary>
+    public string? maintain_descrip { get; set; }
+
+    /// <summary>
+    /// 复核 1 通过 2 不通过
+    /// </summary>
+    public string? repeat_result { get; set; }
+
+    /// <summary>
+    /// 复核结果描述
+    /// </summary>
+    public string? repeat_descrip { get; set; }
+
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/ToolMoldMaintainRecordH.cs

@@ -0,0 +1,172 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 模具保养执行记录主表
+/// </summary>
+[SugarTable("tool_mold_maintain_record_h")]
+public partial class ToolMoldMaintainRecordH : BaseEntity<string>
+{
+    public ToolMoldMaintainRecordH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 模具id
+    /// </summary>
+    public string mold_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 模具保养模具模板id
+    /// </summary>
+    public string maintain_tem_mold_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 结果1 合格2不合格
+    /// </summary>
+    public string? result { get; set; }
+
+    /// <summary>
+    /// 点巡检结果备注
+    /// </summary>
+    public string? result_remark { get; set; }
+
+    /// <summary>
+    /// 执行时间
+    /// </summary>
+    public DateTime? execute_time { get; set; }
+
+    /// <summary>
+    /// 状态 1待执行 2 待复核 3 已完成
+    /// </summary>
+    public string? status { get; set; }
+
+    /// <summary>
+    /// 执行人id
+    /// </summary>
+    public string? execute_user_id { get; set; }
+
+    /// <summary>
+    /// 模具类型id
+    /// </summary>
+    public string? equip_type_id { get; set; }
+
+    /// <summary>
+    /// 不合格推送
+    /// </summary>
+    public int? is_send { get; set; }
+
+    /// <summary>
+    /// 推送时间
+    /// </summary>
+    public DateTime? send_date_time { get; set; }
+
+    /// <summary>
+    /// 推送人id
+    /// </summary>
+    public string? send_id { get; set; }
+
+    /// <summary>
+    /// 编码
+    /// </summary>
+    public string? code { get; set; }
+
+    /// <summary>
+    /// 计划执行通知提前量
+    /// </summary>
+    public int? plan_run_notice { get; set; }
+
+    /// <summary>
+    /// 计划执行通知提前量单位 1 小时 2 天 3 周
+    /// </summary>
+    public string? plan_run_notice_unit { get; set; }
+
+    /// <summary>
+    /// 执行滞后推送时间
+    /// </summary>
+    public int? plan_delay { get; set; }
+
+    /// <summary>
+    /// 执行滞后推送时间单位 1 小时 2 天 3 周
+    /// </summary>
+    public string? plan_delay_unit { get; set; }
+
+    /// <summary>
+    /// 复核岗位id
+    /// </summary>
+    public string? repeat_post_info_user_id { get; set; }
+
+    /// <summary>
+    /// 责任岗位id
+    /// </summary>
+    public string? send_post_info_user_id { get; set; }
+
+    /// <summary>
+    /// 是否复核
+    /// </summary>
+    public string? is_repeat { get; set; }
+
+    /// <summary>
+    /// 复核时间
+    /// </summary>
+    public DateTime? repeat_time { get; set; }
+
+    /// <summary>
+    /// 复核备注
+    /// </summary>
+    public string? repeat_remark { get; set; }
+
+    /// <summary>
+    /// 复核人id
+    /// </summary>
+    public string? repeat_user_id { get; set; }
+
+    /// <summary>
+    /// 仅用于关联表字段查询用不存储数据
+    /// </summary>
+    public string? query_info { get; set; }
+
+    /// <summary>
+    /// 附件
+    /// </summary>
+    public string? attachment { get; set; }
+
+    /// <summary>
+    /// 复核结果
+    /// </summary>
+    public string? repeat_result { get; set; }
+
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+    /// <summary>
+    /// 复核附件
+    /// </summary>
+    public string? fhattachment { get; set; }
+
+}