From 5c14c9686d2bd7c99fdd6cc6fc19404e6e4b8e4d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 29 十一月 2024 15:02:20 +0800
Subject: [PATCH] 增加用水当量和用水器具界面

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs
index 2077e9c..f92fe8e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs
@@ -8,14 +8,15 @@
         {
         }
 
-        public PackageViewModel(Vmo.AssetsPackageMainVmo rhs)
+        public PackageViewModel(Vmo.AssetsPackageMainVmo rhs, string manufacturer)
         {
             this.ID = rhs.ID;
             this.Name = rhs.Name;
+            this.Manufacturer = manufacturer;
             this.NO = rhs.NO;
             this.CatalogID = rhs.CatalogID;
             this.SeriesID = rhs.SeriesID;
-            this.EquipmentCount = rhs.PumpCount;
+            this.EquipmentCount = rhs.PumpTotal;
             this.UseCount = rhs.PumpUseCount;
             this.SortCode = rhs.SortCode;
             this.Description = rhs.Description;
@@ -28,7 +29,7 @@
             this.NO = rhs.NO;
             this.CatalogID = rhs.CatalogID;
             this.SeriesID = rhs.SeriesID;
-            this.EquipmentCount = rhs.PumpCount;
+            this.EquipmentCount = rhs.PumpTotal;
             this.UseCount = rhs.PumpUseCount;
             this.SortCode = rhs.SortCode;
             this.Description = rhs.Description;
@@ -68,6 +69,13 @@
         public long CatalogID { get; set; }
 
         /// <summary>
+        /// 鍘傚晢
+        /// </summary>
+        [DisplayName(" 鍘傚晢")]
+        [Browsable(true)]
+        public string Manufacturer { get; set; }
+
+        /// <summary>
         /// 璁惧鍨嬪彿
         /// </summary>
         [DisplayName(" 璁惧鍨嬪彿")]

--
Gitblit v1.9.3