From a302d7d16e6bed80511cb49813d16829eb933560 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 18 十一月 2024 09:34:12 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs | 4 ++--
1 files changed, 2 insertions(+), 2 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 a613855..14114fe 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
@@ -53,14 +53,14 @@
};
_bll = new BLL.AssetsPumpPartMain();
var allpartlist = await _bll.GetByPumpMainID(AssetsPumpMain.ID); //鑾峰彇鎵�鏈変骇鍝�
- var series = await new BLL.AssetsPumpSeries().GetByID(AssetsPumpMain.PumpSeriesID); //鑾峰彇绯诲垪
+ var series = await new BLL.AssetsPumpSeries().GetByID(AssetsPumpMain.SeriesID); //鑾峰彇绯诲垪
_pumpPart = new Vmo.AssetsPumpPartMainVmo();
_series = series;
_pumpPart.SeriesID = _series.ID;
_catalogID = series.CatalogID;
_propList = new List<PropGroupChoiceViewModel>();
_partMapping = new Vmo.AssetsPumpMainAndPartMapVmo();
- _partMapping.PumpID = AssetsPumpMain.ID;
+ _partMapping.MainID = AssetsPumpMain.ID;
_partMapping.SeriesID = _series.ID;
this.propGroupChoiceViewModelBindingSource.DataSource = _propList;
this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
--
Gitblit v1.9.3