From feaaaf9d5eee7034b253aa804f123bfb16e79b28 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 13:19:50 +0800
Subject: [PATCH] 修改首页列表显示
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/02-main/EditAssetsPackageMainDlg.cs | 31 ++++++++++++++++++++-----------
1 files changed, 20 insertions(+), 11 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..a4fb47a 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
{
@@ -26,12 +25,13 @@
_allBindingList = new List<PumpAccountViewModel>();
if (pumpList != null)
{
- var nameCountGroups = pumpList
- .GroupBy(item => item.PumpMainID)
- .Select(group => new { Name = group.Key, Count = group.Count() });
- foreach (var group in nameCountGroups)
+ /* var nameCountGroups = pumpList
+ .GroupBy(item => item.PumpMainID)
+ .Select(group => new { Name = group.Key, Count = group.Count() });
+ */
+ foreach (var group in pumpList)
{
- _allBindingList.Add(new PumpAccountViewModel(group.Name, group.Count));
+ _allBindingList.Add(new PumpAccountViewModel(group.PumpMainID));
}
}
this.pumpAccountViewModelBindingSource.DataSource = _allBindingList;
@@ -45,7 +45,7 @@
this.textEditCatalog.EditValue = _EquipmentVmo.CatalogID;
this.textEditName.Text = _EquipmentVmo.Name;
this.textEditNo.Text = _EquipmentVmo.NO;
- this.textEditEquipmentCount.Text = _EquipmentVmo.EquipmentCount.ToString();
+ this.textEditUseCount.Text = _EquipmentVmo.PumpTotal.ToString();
this.textEditDescription.Text = _EquipmentVmo.Description;
}
@@ -72,10 +72,19 @@
this.dxErrorProvider1.SetError(this.textEditName, "蹇呭～椤�");
return false;
}
- if (string.IsNullOrEmpty(textEditEquipmentCount.Text.Trim()))
+ if (string.IsNullOrEmpty(textEditUseCount.Text.Trim()))
{
- this.dxErrorProvider1.SetError(this.textEditEquipmentCount, "蹇呭～椤�");
+ this.dxErrorProvider1.SetError(this.textEditUseCount, "蹇呭～椤�");
return false;
+ }
+ if (_allBindingList != null)
+ {
+ int.TryParse(textEditUseCount.Text, out int UseCount);
+ if (UseCount < _allBindingList.Count)
+ {
+ TipFormHelper.ShowError("浣跨敤鏁伴噺澶т簬娉垫暟閲�");
+ return false;
+ }
}
return true;
@@ -89,9 +98,9 @@
_EquipmentVmo.Description = textEditDescription.Text.Trim();
_EquipmentVmo.Name = textEditName.Text.Trim();
_EquipmentVmo.NO = textEditNo.Text.Trim();
- if (int.TryParse(this.textEditEquipmentCount.Text, out int equipmentCount))
+ if (int.TryParse(this.textEditUseCount.Text, out int equipmentCount))
{
- _EquipmentVmo.UseCount = equipmentCount;
+ _EquipmentVmo.PumpUseCount = equipmentCount;
}
if (long.TryParse(textEditCatalog.EditValue?.ToString() ?? "", out long catalogID))
{
--
Gitblit v1.9.3