From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 11:18:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs b/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs
index d9edbab..ce5d528 100644
--- a/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/02-ElbowManage/ElbowMain.cs
@@ -1,20 +1,21 @@
-锘縰sing Yw.Model;
+锘縰sing HStation.Assets;
+using Yw.Model;
namespace HStation.Model
{
/// <summary>
/// 涓氬姟绔�
/// </summary>
- [SysType("elbow_main")]
- public class ElbowMain : BaseModel, ISorter, System.ICloneable
+ [SysType("assets_elbow_main")]
+ public class AssetsElbowMain : BaseModel, ISorter, System.ICloneable
{
/// <summary>
///
/// </summary>
- public ElbowMain()
+ public AssetsElbowMain()
{ }
- public ElbowMain(ElbowMain rhs)
+ public AssetsElbowMain(AssetsElbowMain rhs)
{
this.ID = rhs.ID;
this.SeriesID = rhs.SeriesID;
@@ -25,10 +26,12 @@
this.MaterialName = rhs.MaterialName;
this.SortCode = rhs.SortCode;
this.Name = rhs.Name;
+ this.Angle = rhs.Angle;
this.Description = rhs.Description;
+ this.ConnectionLength = rhs.ConnectionLength;
}
- public void Reset(ElbowMain rhs)
+ public void Reset(AssetsElbowMain rhs)
{
this.ID = rhs.ID;
this.SeriesID = rhs.SeriesID;
@@ -39,7 +42,9 @@
this.MaterialName = rhs.MaterialName;
this.SortCode = rhs.SortCode;
this.Name = rhs.Name;
+ this.Angle = rhs.Angle;
this.Description = rhs.Description;
+ this.ConnectionLength = rhs.ConnectionLength;
}
/// <summary>
@@ -56,6 +61,16 @@
/// 鍙ｅ緞
/// </summary>
public double? Caliber { get; set; }
+
+ /// <summary>
+ /// 绠¤矾杩炴帴闀垮害
+ /// </summary>
+ public eLengthType? ConnectionLength { get; set; }
+
+ /// <summary>
+ /// 瑙掑害
+ /// </summary>
+ public int? Angle { get; set; }
/// <summary>
/// 鏉愭枡
@@ -90,9 +105,9 @@
/// <summary>
///
/// </summary>
- public PumpGroupAndMainMap Clone()
+ public AssetsPumpGroupAndMainMap Clone()
{
- return (PumpGroupAndMainMap)this.MemberwiseClone();
+ return (AssetsPumpGroupAndMainMap)this.MemberwiseClone();
}
object ICloneable.Clone()
--
Gitblit v1.9.3