From 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 16:23:42 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs
index 87e301e..bc922d1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs
@@ -1,5 +1,4 @@
锘縰sing DevExpress.XtraEditors.Controls;
-using DevExpress.XtraEditors.Repository;
namespace HStation.WinFrmUI.Assets
{
@@ -45,7 +44,7 @@
this.textEditCatalog.EditValue = _EquipmentVmo.CatalogID;
this.textEditName.Text = _EquipmentVmo.Name;
this.textEditNo.Text = _EquipmentVmo.NO;
- this.textEditEquipmentCount.Text = _EquipmentVmo.EquipmentCount.ToString();
+ this.textEditEquipmentCount.Text = _EquipmentVmo.PumpTotal.ToString();
this.textEditDescription.Text = _EquipmentVmo.Description;
}
@@ -91,7 +90,7 @@
_EquipmentVmo.NO = textEditNo.Text.Trim();
if (int.TryParse(this.textEditEquipmentCount.Text, out int equipmentCount))
{
- _EquipmentVmo.UseCount = equipmentCount;
+ _EquipmentVmo.PumpUseCount = equipmentCount;
}
if (long.TryParse(textEditCatalog.EditValue?.ToString() ?? "", out long catalogID))
{
--
Gitblit v1.9.3