Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

EquipMgr/Tnb.EquipMgr.Entities/Consts/RepairApplyStatus.cs

@@ -0,0 +1,58 @@
+namespace Tnb.EquipMgr
+{
+    /// <summary>
+    /// 设备维修状态
+    /// </summary>
+    public static class RepairApplyStatus
+    {
+        /// <summary>
+        /// 待执行
+        /// </summary>
+        public const string TOBEEXECUTED = "1";
+        /// <summary>
+        /// 待接收
+        /// </summary>
+        public const string TOBERECEIVED = "2";
+        /// <summary>
+        /// 已接收
+        /// </summary>
+        public const string RECEIVED = "3";
+        /// <summary>
+        /// 拒绝
+        /// </summary>
+        public const string REFUSE = "4";
+        /// <summary>
+        /// 已维修
+        /// </summary>
+        public const string REPAIRED = "5";
+        /// <summary>
+        /// 已完成
+        /// </summary>
+        public const string COMPLETED = "6";
+        /// <summary>
+        /// 外修申请待审批
+        /// </summary>
+        public const string OUTAPPLYAPPROVE = "7";
+        /// <summary>
+        /// 审批通过
+        /// </summary>
+        public const string APPROVEPASS = "8";
+        /// <summary>
+        /// 审批拒绝
+        /// </summary>
+        public const string APPROVENOTPASS = "9";
+        /// <summary>
+        /// 已关闭
+        /// </summary>
+        public const string CLOSE = "10";
+        /// <summary>
+        /// 已作废
+        /// </summary>
+        public const string REPEAL = "11";
+        /// <summary>
+        /// 申请外修
+        /// </summary>
+        public const string TOBEOUTAPPLY = "12";
+
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Consts/RepairOutApplyStatus.cs

@@ -0,0 +1,21 @@
+namespace Tnb.EquipMgr
+{
+    /// <summary>
+    /// 设备维修状态
+    /// </summary>
+    public static class RepairOutApplyStatus
+    {
+        /// <summary>
+        /// 待审批
+        /// </summary>
+        public const string TOBEAPPROVE = "1";
+        /// <summary>
+        /// 退回
+        /// </summary>
+        public const string BACK = "2";
+        /// <summary>
+        /// 通过
+        /// </summary>
+        public const string PASS = "3";
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairApplyRegisterInput.cs

@@ -0,0 +1,52 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class RepairApplyRegisterInput
+    {
+        public string id { get; set; }
+        
+        /// <summary>
+        /// 故障ID
+        /// </summary>
+        public string fault_id { get; set; }
+        
+        /// <summary>
+        /// 是否完成
+        /// </summary>
+        public string? is_complete { get; set; }
+        
+        /// <summary>
+        /// 完成时间
+        /// </summary>
+        public DateTime? complete_time { get; set; }
+        
+        /// <summary>
+        /// 维修耗时
+        /// </summary>
+        public string? repair_take_time { get; set; }
+        
+        /// <summary>
+        /// 是否停机
+        /// </summary>
+        public int? is_halt { get; set; }
+
+        /// <summary>
+        /// 停机时长
+        /// </summary>
+        public string? halt_take_time { get; set; }
+        
+        /// <summary>
+        /// 维修描述
+        /// </summary>
+        public string? repair_description { get; set; }
+        
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public string? attachment { get; set; }
+        
+        /// <summary>
+        /// 是否外修
+        /// </summary>
+        public int? is_out_apply { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairDelayInput.cs

@@ -0,0 +1,17 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class RepairDelayInput
+    {
+        public string repair_apply_id { get; set; }
+        
+        public string equip_id { get; set; }
+        
+        public string repair_request_sender_id { get; set; }
+        
+        public string repair_sender_id { get; set; }
+        
+        public DateTime expected_time { get; set; }
+        
+        public string delay_reason { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/RepairOutApplyInput.cs

@@ -0,0 +1,15 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class RepairOutApplyInput
+    {
+        public string id { get; set; }
+        public string repair_apply_id { get; set; }
+        public string equip_id { get; set; }
+        public string? supplier_id { get; set; }
+        public decimal? estimated_cost { get; set; }
+        public string? construction_period_requirement { get; set; }
+        public string out_apply_reason { get; set; }
+        public string? remark { get; set; }
+        
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairDelay.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Linq;
+using System.Text;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities
+{
+    ///<summary>
+    ///设备延期
+    ///</summary>
+    [SugarTable("eqp_repair_delay")]
+    public partial class EqpRepairDelay
+    {
+        public EqpRepairDelay()
+        {
+        }
+
+        /// <summary>
+        /// Desc:主键
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true)]
+        public string id { get; set; } = SnowflakeIdHelper.NextId();
+
+        /// <summary>
+        /// Desc:设备id
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string equip_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// Desc:报修id
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string? repair_apply_id { get; set; }
+
+        /// <summary>
+        /// Desc:报修抄送人员id
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string? repair_request_sender_id { get; set; }
+
+        /// <summary>
+        /// Desc:维修抄送人员id
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string? repair_sender_id { get; set; }
+
+        /// <summary>
+        /// Desc:预期维修时间
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public DateTime expected_time { get; set; }
+
+        /// <summary>
+        /// Desc:延期原因
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string delay_reason { get; set; }
+
+        /// <summary>
+        /// Desc:创建用户
+        /// Default:NULL::character varying
+        /// Nullable:True
+        /// </summary>           
+        public string? create_id { get; set; }
+
+        /// <summary>
+        /// Desc:创建时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? create_time { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpRepairOutApply.cs

@@ -0,0 +1,117 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 设备外修申请表
+/// </summary>
+[SugarTable("eqp_repair_out_apply")]
+public partial class EqpRepairOutApply : BaseEntity<string>
+{
+    public EqpRepairOutApply()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 设备id
+    /// </summary>
+    public string equip_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 报修id
+    /// </summary>
+    public string repair_apply_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 供应商
+    /// </summary>
+    public string? supplier_id { get; set; }
+
+    /// <summary>
+    /// 预估费用
+    /// </summary>
+    public decimal? estimated_cost { get; set; }
+
+    /// <summary>
+    /// 费用
+    /// </summary>
+    public decimal? cost { get; set; }
+
+    /// <summary>
+    /// 工期要求
+    /// </summary>
+    public string? construction_period_requirement { get; set; }
+
+    /// <summary>
+    /// 外修理由
+    /// </summary>
+    public string? out_apply_reason { get; set; }
+
+    /// <summary>
+    /// 外修备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 审批状态 0待审批 1 退回 2 通过
+    /// </summary>
+    public string? approve_status { get; set; }
+
+    /// <summary>
+    /// 修复时间
+    /// </summary>
+    public DateTime? repair_time { get; set; }
+
+    /// <summary>
+    /// 维修耗时
+    /// </summary>
+    public decimal? repair_take_time { get; set; }
+
+    /// <summary>
+    /// 维修备注
+    /// </summary>
+    public string? repair_remark { get; set; }
+
+    /// <summary>
+    /// 登记备注
+    /// </summary>
+    public string? register_remark { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 审批人id
+    /// </summary>
+    public string? approve_id { get; set; }
+
+    /// <summary>
+    /// 审批时间
+    /// </summary>
+    public DateTime? approve_time { get; set; }
+
+    /// <summary>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+}