duheng
2024-11-06 bc230c03cb961e8d5fb40131806fe795ecfbfa73
修改曲线id命名
已修改4个文件
22 ■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
@@ -278,7 +278,7 @@
                    if (list != null && list.Count > 0)
                    {
                        var maxImportanceItem = list.OrderByDescending(x => x.Importance).First();
                        input.MatchingChartDbId = maxImportanceItem.ID.ToString();
                        input.MatchingCurveDbId = maxImportanceItem.ID.ToString();
                        var graph_ql = maxImportanceItem.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveQL);
                        var graph_ol = maxImportanceItem.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveOL);
                        if (graph_ql != null)
@@ -299,7 +299,7 @@
                    if (list != null && list.Count > 0)
                    {
                        var maxImportanceItem = list.OrderByDescending(x => x.Importance).First();
                        input.MatchingChartDbId = maxImportanceItem.ID.ToString();
                        input.MatchingCurveDbId = maxImportanceItem.ID.ToString();
                        var graph_ol = maxImportanceItem.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveOL);
                        if (graph_ol != null)
                        {
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/01-viewmodel/ValveMatchingViewModel.cs
@@ -51,11 +51,11 @@
        public string DbId { get; set; }
        /// <summary>
        /// ChartDbId
        /// CurveDbId
        /// </summary>
        [DisplayName("ChartDbId")]
        [Browsable(false)]
        public string ChartDbId { get; set; }
        public string CurveDbId { get; set; }
        /// <summary>
        /// 直径
@@ -114,11 +114,11 @@
        public double? MatchingDiameter { get; set; }
        /// <summary>
        /// MatchingChartDbId
        /// MatchingCurveDbId
        /// </summary>
        [DisplayName("MatchingChartDbId")]
        [DisplayName("MatchingCurveDbId")]
        [Browsable(false)]
        public string MatchingChartDbId { get; set; }
        public string MatchingCurveDbId { get; set; }
        /// <summary>
        /// 匹配材质
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingDlg.cs
@@ -26,7 +26,7 @@
                TipFormHelper.ShowError("阀门型号选择错误");
                return;
            }
            if (_ValveMatchingView.MatchingChartDbId == null || _ValveMatchingView.MatchingChartDbId == string.Empty)
            if (_ValveMatchingView.MatchingCurveDbId == null || _ValveMatchingView.MatchingCurveDbId == string.Empty)
            {
                TipFormHelper.ShowError("曲线选择错误");
                return;
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingForm.cs
@@ -96,11 +96,11 @@
                    }
                }
            }
            if (_pumpMatchingViewModel.MatchingChartDbId != null)
            if (_pumpMatchingViewModel.MatchingCurveDbId != null)
            {
                for (int i = 0; i < _allPhartList.Count; i++)
                {
                    if (_allBindingList[i].ID.ToString() == _pumpMatchingViewModel.MatchingChartDbId)
                    if (_allBindingList[i].ID.ToString() == _pumpMatchingViewModel.MatchingCurveDbId)
                    {
                        gridView1.FocusedRowHandle = i;
                    }
@@ -120,7 +120,7 @@
                    var vmo = await _bll_ex.Value.GetByID(vm.ID);
                    if (vmo != null)
                    {
                        _pumpMatchingViewModel.MatchingChartDbId = vm.ID.ToString();
                        _pumpMatchingViewModel.MatchingCurveDbId = vm.ID.ToString();
                        var graph_ql = vmo.Diagram.GraphList.Find(x => x.GraphType == HStation.PhartRelation.eGraphType.ValveQL);
                        if (graph_ql != null)
                        {