bug,设备迁移

EquipMgr/Tnb.EquipMgr.Entities/Consts/EquipmentLife.cs

@@ -21,5 +21,9 @@ namespace Tnb.EquipMgr
         /// 报废
         /// </summary>
         public const string SCRAP = "4";
+        /// <summary>
+        /// 未入场
+        /// </summary>
+        public const string NOTADMITTED = "4";
     }
 }

EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipWorkshopChangeInput.cs

@@ -0,0 +1,10 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class EquipWorkshopChangeInput
+    {
+        public string equip_id { get; set; } = string.Empty;
+        public string new_workshop_id { get; set; } = string.Empty;
+        public string? new_installation_location { get; set; }
+        public string? remark { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Dto/EquipWorkshopChangeQueryOutput.cs

@@ -0,0 +1,36 @@
+namespace Tnb.EquipMgr.Entities.Dto
+{
+    public class EquipWorkshopChangeQueryOutput
+    {
+        public string id { get; set; } = string.Empty;
+        /// <summary>
+        /// 旧车间id
+        /// </summary>
+        public string old_workshop_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 新车间id
+        /// </summary>
+        public string new_workshop_id { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 旧安装地点
+        /// </summary>
+        public string? old_installation_location { get; set; }
+
+        /// <summary>
+        /// 新安装地点
+        /// </summary>
+        public string? new_installation_location { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? remark { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string? create_time { get; set; }
+    }
+}

EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpEquipment.cs

@@ -187,5 +187,15 @@ public partial class EqpEquipment : BaseEntity<string>
     /// 工位编码
     /// </summary>
     public string? station_code { get; set; }
+    
+    /// <summary>
+    /// 质保开始时间
+    /// </summary>
+    public DateTime? warranty_start_time { get; set; }
+    
+    /// <summary>
+    /// 质保结束时间
+    /// </summary>
+    public DateTime? warranty_end_time { get; set; }
 
 }

EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpWorkshopChangeLog.cs

@@ -0,0 +1,72 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.EquipMgr.Entities;
+
+/// <summary>
+/// 设备使用车间变更记录
+/// </summary>
+[SugarTable("eqp_workshop_change_log")]
+public partial class EqpWorkshopChangeLog : BaseEntity<string>
+{
+    public EqpWorkshopChangeLog()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 设备id
+    /// </summary>
+    public string equip_id { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 旧车间id
+    /// </summary>
+    public string? old_workshop_id { get; set; }
+
+    /// <summary>
+    /// 新车间id
+    /// </summary>
+    public string? new_workshop_id { get; set; }
+
+    /// <summary>
+    /// 旧安装地点
+    /// </summary>
+    public string? old_installation_location { get; set; }
+
+    /// <summary>
+    /// 新安装地点
+    /// </summary>
+    public string? new_installation_location { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? 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>
+    /// 所属组织
+    /// </summary>
+    public string? org_id { get; set; }
+
+}