From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
index 29e4db3..b1563e0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
@@ -130,7 +130,6 @@
updatepart.NO = TextEditNo.Text;
updatepart.Code = TextEditProductCode.Text;
updatepart.SeriesID = _series.ID;
- var propList = _propList.Where(x => x.TagName == "Prop").ToList(); //鎵惧埌鎵�鏈夌殑棰濆灞炴��
foreach (var item in _propList)
{
if (_allPropList != null)
@@ -177,10 +176,10 @@
}
var pumpMainBll = new BLL.AssetsPumpMain();
await pumpMainBll.Update(_pumpMain);
- _propList.Remove(_propList.Find(x => x.TagName == "Basic_Flow"));
- _propList.Remove(_propList.Find(x => x.TagName == "Basic_Head"));
- _propList.Remove(_propList.Find(x => x.TagName == "Basic_Power"));
- _propList.Remove(_propList.Find(x => x.TagName == "Basic_Speed"));
+ _allPropList.Remove(_allPropList.Find(x => x.TagName == "Basic_Flow"));
+ _allPropList.Remove(_allPropList.Find(x => x.TagName == "Basic_Head"));
+ _allPropList.Remove(_allPropList.Find(x => x.TagName == "Basic_Power"));
+ _allPropList.Remove(_allPropList.Find(x => x.TagName == "Basic_Speed"));
if (await _bll.UpdateEx(updatepart, _allPropList))
{
vm.Reset(updatepart);
--
Gitblit v1.9.3