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.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingDlg.cs | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingDlg.cs
index 85a30b4..750f827 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/09-Tank/AssetsTankSingleMatchingDlg.cs
@@ -23,7 +23,7 @@
return;
}
_input = input;
- this.assetsTankSingleMatchingCtrl1.SetBindingData(input.DbId);
+ this.assetsTankSingleMatchingCtrl1.SetBindingData(input.DbId, input.CurveDbId);
}
private void GeneralOkAndCancelCtrl1_OkEvent()
@@ -37,8 +37,15 @@
{
return;
}
-
- _input.MatchingModelType = vm.Name;
+ _input.MatchingModelType = vm.Vmo.Name;
+ _input.MatchingCurveDbId = vm.MatchingCurveDbId;
+ _input.MatchingMaxLevel = vm.Vmo.MaxLevel;
+ _input.MatchingMinLevel = vm.Vmo.MinLevel;
+ _input.MatchingMinVol = vm.Vmo.MinVol;
+ _input.MatchingOverFlow = vm.Vmo.OverFlow;
+ _input.MatchingDN = vm.Vmo.DN;
+ _input.MatchingDbId = vm.Vmo.ID.ToString();
+ _input.MatchingVolCurve = vm.MatchingCurve;
this.ReloadDataEvent?.Invoke(_input);
this.DialogResult = DialogResult.OK;
this.Close();
--
Gitblit v1.9.3