From 39cf2411b59772d56ee731f229f09ff472889bad Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 22 九月 2022 15:12:04 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into hxb

---
 HDL_ON/Entity/FunctionList.cs |   39 ++++++++++++++++++++++++++++++---------
 1 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index cf3f154..398fb08 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -41,6 +41,26 @@
         public List<Function> Functions = new List<Function>();
 
         /// <summary>
+        /// 缁垮缓绉戞妧绯荤粺
+        /// 鎬绘帶鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public List<Function> GetAcstParentList()
+        {
+            return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);
+        }
+
+        /// <summary>
+        /// 缁垮缓绉戞妧绯荤粺
+        /// 瀛愭帶鍒楄〃
+        /// </summary>
+        /// <returns></returns>
+        public List<Function> GetAcstSubList()
+        {
+            return Functions.FindAll((obj) => obj.spk == SPK.AcstSub);
+        }
+
+        /// <summary>
         /// 绌鸿皟鍒楄〃
         /// </summary>
         /// <returns></returns>
@@ -106,16 +126,17 @@
         /// <summary>
         /// 鍏変紡鍒楄〃
         /// </summary>
-        public List<InverterInfo> InverterList
+        public List<Function> InverterList()
         {
-            get
-            {
-                return _inverterList;
-            }
-            set
-            {
-                _inverterList = value;
-            }
+            //get
+            //{
+            //    return _inverterList;
+            //}
+            //set
+            //{
+            //    _inverterList = value;
+            //}
+            return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
         }
         #region 瀹剁數鍒楄〃 electricals
         /// <summary>

--
Gitblit v1.8.0