From 13e69c09c5ac97e0294d64617dfb934e34bb4264 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 02 十二月 2024 17:11:13 +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/06-PipeLine/AssetsPipeMain.cs |   79 +++++++++++++++++++++++----------------
 1 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/Service/HStation.Service.Assets.Core/02-model/06-PipeLine/AssetsPipeMain.cs b/Service/HStation.Service.Assets.Core/02-model/06-PipeLine/AssetsPipeMain.cs
index 0ab70ca..db4d1ba 100644
--- a/Service/HStation.Service.Assets.Core/02-model/06-PipeLine/AssetsPipeMain.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/06-PipeLine/AssetsPipeMain.cs
@@ -6,7 +6,7 @@
     /// 绠￠亾绠＄悊
     /// </summary>
     [SysType("assets_pipe_main")]
-    public class AssetsPipeMain : BaseModel, ISorter, System.ICloneable
+    public class AssetsPipeMain : BaseModel, ISorter, IFlags, IParas, ITagName, System.ICloneable
     {
         /// <summary>
         ///
@@ -14,37 +14,40 @@
         public AssetsPipeMain()
         { }
 
-        public AssetsPipeMain(AssetsPipeMain rhs)
+        public AssetsPipeMain(AssetsPipeMain rhs) : base(rhs)
         {
-            this.Caliber = rhs.Caliber;
-            this.ID = rhs.ID;
-            this.SeriesID = rhs.SeriesID;
             this.Name = rhs.Name;
-            this.MaterialName = rhs.MaterialName;
-            this.Manning = rhs.Manning;
-            this.Coefficient = rhs.Coefficient;
-            this.Darcy = rhs.Darcy;
+            this.SeriesID = rhs.SeriesID;
+            this.Caliber = rhs.Caliber;
+            this.Material = rhs.Material;
+            this.MinorLoss = rhs.MinorLoss;
             this.Hazen = rhs.Hazen;
-            this.SortCode = rhs.SortCode;
+            this.Darcy = rhs.Darcy;
+            this.Manning = rhs.Manning;
             this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
+            this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
+            this.Flags = rhs.Flags?.ToList();
+            this.TagName = rhs.TagName;
+            this.SortCode = rhs.SortCode;
             this.Description = rhs.Description;
         }
 
         public void Reset(AssetsPipeMain rhs)
         {
-            this.Caliber = rhs.Caliber;
             this.ID = rhs.ID;
-            this.SeriesID = rhs.SeriesID;
             this.Name = rhs.Name;
-            this.MaterialName = rhs.MaterialName;
-            this.Manning = rhs.Manning;
-            this.Coefficient = rhs.Coefficient;
-            this.Darcy = rhs.Darcy;
+            this.SeriesID = rhs.SeriesID;
+            this.Caliber = rhs.Caliber;
+            this.Material = rhs.Material;
+            this.MinorLoss = rhs.MinorLoss;
             this.Hazen = rhs.Hazen;
-            this.SortCode = rhs.SortCode;
+            this.Darcy = rhs.Darcy;
+            this.Manning = rhs.Manning;
             this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
+            this.Paras = rhs.Paras == null ? null : new Dictionary<string, string>(rhs.Paras);
+            this.Flags = rhs.Flags?.ToList();
+            this.TagName = rhs.TagName;
+            this.SortCode = rhs.SortCode;
             this.Description = rhs.Description;
         }
 
@@ -66,12 +69,32 @@
         /// <summary>
         /// 鏉愭枡
         /// </summary>
-        public string MaterialName { get; set; }
+        public string Material { get; set; }
+
+        /// <summary>
+        /// 璇嗗埆鍏抽敭瀛�
+        /// </summary>
+        public List<string> KeyWord { get; set; }
+
+        /// <summary>
+        /// 鍙傛暟
+        /// </summary>
+        public Dictionary<string, string> Paras { get; set; }
+
+        /// <summary>
+        /// 鏍囩
+        /// </summary>
+        public List<string> Flags { get; set; }
+
+        /// <summary>
+        /// 鏍囧織
+        /// </summary>
+        public string TagName { get; set; }
 
         /// <summary>
         /// 绯绘暟
         /// </summary>
-        public double? Coefficient { get; set; }
+        public double MinorLoss { get; set; }
 
         /// <summary>
         ///Hazen
@@ -89,16 +112,6 @@
         public double? Manning { get; set; }
 
         /// <summary>
-        /// 璇嗗埆鍏抽敭瀛�
-        /// </summary>
-        public string KeyWord { get; set; }
-
-        /// <summary>
-        /// 鏄惁榛樿
-        /// </summary>
-        public bool IsDefault { get; set; }
-
-        /// <summary>
         /// 鎺掑簭鐮�
         /// </summary>
         public int SortCode { get; set; }
@@ -111,9 +124,9 @@
         /// <summary>
         ///
         /// </summary>
-        public AssetsPumpGroupAndMainMap Clone()
+        public AssetsPumpGroupAndMainMapping Clone()
         {
-            return (AssetsPumpGroupAndMainMap)this.MemberwiseClone();
+            return (AssetsPumpGroupAndMainMapping)this.MemberwiseClone();
         }
 
         object ICloneable.Clone()

--
Gitblit v1.9.3