From ce9752fd657c6689ea64929eb962146e2730624e Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 28 三月 2025 14:07:54 +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 | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 bc922d1..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
@@ -25,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;
@@ -44,7 +45,7 @@
this.textEditCatalog.EditValue = _EquipmentVmo.CatalogID;
this.textEditName.Text = _EquipmentVmo.Name;
this.textEditNo.Text = _EquipmentVmo.NO;
- this.textEditEquipmentCount.Text = _EquipmentVmo.PumpTotal.ToString();
+ this.textEditUseCount.Text = _EquipmentVmo.PumpTotal.ToString();
this.textEditDescription.Text = _EquipmentVmo.Description;
}
@@ -71,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;
@@ -88,7 +98,7 @@
_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.PumpUseCount = equipmentCount;
}
--
Gitblit v1.9.3