From 02c14c9c57dbde72d9c771bd8b0fab1cd023047d Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期一, 13 一月 2025 09:09:22 +0800
Subject: [PATCH] 上下游纵断面分析

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/PackageViewModel.cs |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 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 379ae83..939984e 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
@@ -1,6 +1,4 @@
-锘縰sing System.ComponentModel;
-
-namespace HStation.WinFrmUI.Assets
+锘縩amespace HStation.WinFrmUI.Assets
 {
     public class PackageViewModel
     {
@@ -8,15 +6,16 @@
         {
         }
 
-        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.EquipmentCount;
-            this.UseCount = rhs.UseCount;
+            this.EquipmentCount = rhs.PumpTotal;
+            this.UseCount = rhs.PumpUseCount;
             this.SortCode = rhs.SortCode;
             this.Description = rhs.Description;
         }
@@ -28,14 +27,14 @@
             this.NO = rhs.NO;
             this.CatalogID = rhs.CatalogID;
             this.SeriesID = rhs.SeriesID;
-            this.EquipmentCount = rhs.EquipmentCount;
-            this.UseCount = rhs.UseCount;
+            this.EquipmentCount = rhs.PumpTotal;
+            this.UseCount = rhs.PumpUseCount;
             this.SortCode = rhs.SortCode;
             this.Description = rhs.Description;
         }
 
         /// <summary>
-        /// ID
+        /// UserID
         /// </summary>
         public long ID { get; set; }
 
@@ -68,6 +67,13 @@
         public long CatalogID { get; set; }
 
         /// <summary>
+        /// 鍘傚晢
+        /// </summary>
+        [DisplayName(" 鍘傚晢")]
+        [Browsable(true)]
+        public string Manufacturer { get; set; }
+
+        /// <summary>
         /// 璁惧鍨嬪彿
         /// </summary>
         [DisplayName(" 璁惧鍨嬪彿")]

--
Gitblit v1.9.3