diff --git a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRecord.cs b/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRecord.cs
deleted file mode 100644
index f2255567..00000000
--- a/EquipMgr/Tnb.EquipMgr.Entities/Entity/EqpOverhaulPlanRunRecord.cs
+++ /dev/null
@@ -1,252 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using JNPF.Common.Security;
-using SqlSugar;
-
-namespace Tnb.EquipMgr.Entities
-{
-    ///<summary>
-    ///TODO
-    ///</summary>
-    [SugarTable("eqp_overhaul_plan_run_record")]
-    public partial class EqpOverhaulPlanRunRecord
-    {
-           public EqpOverhaulPlanRunRecord(){
-
-
-           }
-           /// <summary>
-           /// Desc:创建时间
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public DateTime create_time {get;set;}
-
-           /// <summary>
-           /// Desc:创建用户
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? create_id {get;set;}
-
-           /// <summary>
-           /// Desc:修改时间
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public DateTime? modify_time {get;set;}
-
-           /// <summary>
-           /// Desc:修改用户
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? modify_id {get;set;}
-
-           /// <summary>
-           /// Desc:编号
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           [SugarColumn(IsPrimaryKey=true)]
-           public string id {get;set;} = SnowflakeIdHelper.NextId();
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? overhaul_plan_id {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? class {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? level {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public double? shutdown_cost {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public int is_complete {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public DateTime? recovery_time {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public double? repair_cost {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? reason {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? countermeasure {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public int is_use_spare_parts {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? remark {get;set;}
-
-           /// <summary>
-           /// Desc:排序
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public int ordinal {get;set;}
-
-           /// <summary>
-           /// Desc:是否启用
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public int enabled {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend01 {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend02 {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend03 {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend04 {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend05 {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend06 {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend07 {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend08 {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend09 {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? extend10 {get;set;}
-
-           /// <summary>
-           /// Desc:删除用户
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string? delete_id {get;set;}
-
-           /// <summary>
-           /// Desc:删除时间
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public DateTime? delete_time {get;set;}
-
-           /// <summary>
-           /// Desc:删除标志
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public short deleted {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? repair_cost_unit {get;set;}
-
-           /// <summary>
-           /// Desc:TODO
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public int? shutdown_cost_unit {get;set;}
-
-    }
-}
diff --git a/EquipMgr/Tnb.EquipMgr.Entities/EqpEquipment.cs b/EquipMgr/Tnb.EquipMgr.Entities/EqpEquipment.cs
deleted file mode 100644
index 2ddb8e7c..00000000
--- a/EquipMgr/Tnb.EquipMgr.Entities/EqpEquipment.cs
+++ /dev/null
@@ -1,265 +0,0 @@
-using System;
-using System.Linq;
-using System.Text;
-using SqlSugar;
-
-namespace Tnb.EquipMgr.Entities
-{
-    ///<summary>
-    ///设备登记
-    ///</summary>
-    [SugarTable("eqp_equipment")]
-    public partial class EqpEquipment
-    {
-           public EqpEquipment(){
-
-
-           }
-           /// <summary>
-           /// Desc:吨位
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public double tonnage {get;set;}
-
-           /// <summary>
-           /// Desc:编号
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           [SugarColumn(IsPrimaryKey=true)]
-           public string id {get;set;}
-
-           /// <summary>
-           /// Desc:设备代码
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public string code {get;set;}
-
-           /// <summary>
-           /// Desc:设备名称
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public string name {get;set;}
-
-           /// <summary>
-           /// Desc:设备类型id
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public string equip_type_id {get;set;}
-
-           /// <summary>
-           /// Desc:使用日期
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public DateTime? use_date {get;set;}
-
-           /// <summary>
-           /// Desc:验收日期
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public DateTime? accept_date {get;set;}
-
-           /// <summary>
-           /// Desc:创建时间
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public DateTime? create_time {get;set;}
-
-           /// <summary>
-           /// Desc:修改时间
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public DateTime? modify_time {get;set;}
-
-           /// <summary>
-           /// Desc:扩展字段
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string extras {get;set;}
-
-           /// <summary>
-           /// Desc:是否成套设备
-           /// Default:
-           /// Nullable:False
-           /// </summary>           
-           public string is_complete_set {get;set;}
-
-           /// <summary>
-           /// Desc:所属组织
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string org_id {get;set;}
-
-           /// <summary>
-           /// Desc:设备生产日期
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string product_date {get;set;}
-
-           /// <summary>
-           /// Desc:设备生产厂家
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string manufacturer {get;set;}
-
-           /// <summary>
-           /// Desc:使用部门id
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string use_department_id {get;set;}
-
-           /// <summary>
-           /// Desc:安装日期
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string install_date {get;set;}
-
-           /// <summary>
-           /// Desc:管理部门id
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string manage_department_id {get;set;}
-
-           /// <summary>
-           /// Desc:设备生命周期
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string life {get;set;}
-
-           /// <summary>
-           /// Desc:技改编码
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string techno_logy_code {get;set;}
-
-           /// <summary>
-           /// Desc:备注
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string remark {get;set;}
-
-           /// <summary>
-           /// Desc:时间戳
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string timestamp {get;set;}
-
-           /// <summary>
-           /// Desc:创建用户
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string create_id {get;set;}
-
-           /// <summary>
-           /// Desc:修改用户
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string modify_id {get;set;}
-
-           /// <summary>
-           /// Desc:供应商id
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string supplier_id {get;set;}
-
-           /// <summary>
-           /// Desc:出厂编码
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string factory_code {get;set;}
-
-           /// <summary>
-           /// Desc:合同/采购单号
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string contract_no {get;set;}
-
-           /// <summary>
-           /// Desc:维保电话
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string maintenance_phone {get;set;}
-
-           /// <summary>
-           /// Desc:规格型号
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string specification {get;set;}
-
-           /// <summary>
-           /// Desc:安装地点
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string installation_location {get;set;}
-
-           /// <summary>
-           /// Desc:DCS-ID
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string dcs_id {get;set;}
-
-           /// <summary>
-           /// Desc:技术参数
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string technology_parameter {get;set;}
-
-           /// <summary>
-           /// Desc:状态
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string status {get;set;}
-
-           /// <summary>
-           /// Desc:维保单位
-           /// Default:NULL::character varying
-           /// Nullable:True
-           /// </summary>           
-           public string maintenance_unit {get;set;}
-
-           /// <summary>
-           /// Desc:模具Id
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string mold_id {get;set;}
-
-           /// <summary>
-           /// Desc:设备机台号
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           public string eqp_machine_num {get;set;}
-
-    }
-}
diff --git a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/EquipmentListOutput.cs b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/EquipmentListOutput.cs
index 7b7f6228..124992f5 100644
--- a/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/EquipmentListOutput.cs
+++ b/ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/EquipmentListOutput.cs
@@ -34,7 +34,7 @@ namespace Tnb.ProductionMgr.Entities.Dto
         /// <summary>
         /// 吨位
         /// </summary>
-        public double tonnage { get; set; }
+        public decimal? tonnage { get; set; }
         /// <summary>
         /// 最早开始时间 
         /// </summary>