duheng
2024-12-05 4a7fe49b8de6aef60d1cfd741f178a23b0a7c1fd
修改单泵匹配报错
已修改2个文件
24 ■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/PumpProductMainPage.cs
@@ -16,7 +16,6 @@
            this.AssetsPumpSeriesTreeListCtrl1.FocusedChangedEvent += AssetsPumpSeriesTreeListCtrl1_FocusedChangedEvent;
            this.AssetsPumpSeriesTreeListCtrl1.AddAssetsPumpMain += BtnAdd_ItemClickAsync;
            this.dockManager1.Style = DevExpress.XtraBars.Docking2010.Views.DockingViewStyle.Light;
        }
        private readonly List<AssetsPumpMainViewModel> _allBindingList = new();
@@ -168,9 +167,9 @@
                MessageBoxHelper.ShowWarning("请选择数据行!");
                return;
            }
            //var dlg=new HStation.WinFrmUI.PhartRelation.SelXhsAssetsPumpMainPhartDlg();
            //dlg.SetBandingData(currentVm.ID);
            //dlg.ShowDialog();
            /*      var dlg=new HStation.WinFrmUI.PhartRelation.SelXhsAssetsPumpMainPhartDlg();
                  dlg.SetBandingData(currentVm.ID);
                 dlg.ShowDialog();*/
            var guid = new PageGuid()
            {
@@ -186,11 +185,11 @@
                    MessageBoxHelper.ShowWarning($"{currentVm.Name}:AssetsPumpMainDto is null!");
                    return;
                }
                //var page = new HStation.WinFrmUI.PhartRelation.XhsPumpMainPhartPanel();
                //page.InitialDataSource(currentVm.ID);
                //page.PageTitle.Caption = guid.Function;
                //page.PageGuid = guid;
                //CreatePage(page, guid);
                /*      var page = new HStation.WinFrmUI.PhartRelation.XhsPumpMainPhartPanel();
                      page.InitialDataSource(currentVm.ID);
                      page.PageTitle.Caption = guid.Function;
                      page.PageGuid = guid;
                      CreatePage(page, guid);*/
            }
        }
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/02-pump/01-pumpsinglematching/SimulationPumpSingleMatchingDlg.cs
@@ -46,9 +46,12 @@
                    var item = pump_main_list[i];
                    var vm = new PumpSingleMatchingViewModel(item);
                    _pump_mian_vm_list.Add(vm);
                    if (vm.ID.ToString() == pump_matching_vm.DbId.ToString())
                    if (pump_matching_vm.DbId != null)
                    {
                        sel_index = i;
                        if (vm.ID.ToString() == pump_matching_vm.DbId.ToString())
                        {
                            sel_index = i;
                        }
                    }
                }
            }