修改匹配方法以及单独匹配

duheng

2024-12-05 492fbc0052225864e97cceb66d86d3fdf9dee961

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs

@@ -18,6 +18,16 @@
            public string OtherName { get; set; }
            public int Importance { get; set; }
            public int SortCode { get; set; }

            /// <summary>
            /// 容积曲线
            /// </summary>
            public string VolCurve { get; set; }

            /// <summary>
            /// 型号ID
            /// </summary>
            public long MainID { get; set; }
        }

        public class CurvieInfo
@@ -44,9 +54,12 @@
            _allBindingList = new List<TankSingleMatchingViewModel>();
            _TankBll = new BLL.AssetsTankMain();
            var allAssetsPumpMain = await _TankBll.GetAll();
            foreach (var Main in allAssetsPumpMain)
            if (allAssetsPumpMain != null)
            {
                _allBindingList.Add(new TankSingleMatchingViewModel(Main));
                foreach (var Main in allAssetsPumpMain)
                {
                    _allBindingList.Add(new TankSingleMatchingViewModel(Main));
                }
            }
            this.TankSingleMatchingViewModelBindingSource.DataSource = _allBindingList;
            this.searchControl1.Text = _pumpMatchingViewModel.ModelType;
@@ -72,16 +85,16 @@
            {
                _pumpMatchingViewModel.MatchingDbId = vm.ID.ToString();
                _pumpMatchingViewModel.MatchingModelType = vm.Name.ToString();
                /*  _pumpMatchingViewModel.MatchingMinorLoss = vm.Coefficient;
                 _pumpMatchingViewModel.MatchingMaterial = vm.Material;
                 _pumpMatchingViewModel.MatchingTankType = (eTankType?)vm.SeriesType;
                 _pumpMatchingViewModel.MatchingTankSetting = vm.TankSetting;*/
                _pumpMatchingViewModel.MatchingMaxLevel = vm.MaxLevel;
                _pumpMatchingViewModel.MatchingMinLevel = vm.MinLevel;
                _pumpMatchingViewModel.MatchingDN = vm.DN;
                _pumpMatchingViewModel.MatchingMinVol = vm.MinVol;
                var list = await _bll_ex.Value.GetByMainID(vm.ID);
                if (list != null && list.Any())
                {
                    foreach (var item in list)
                    {
                        _allPhartList.Add(new PhartViewModel { ID = item.ID });
                        _allPhartList.Add(new PhartViewModel { ID = item.ID, VolCurve = item.VolCurve, MainID = item.MainID,OtherName="默认曲线",Importance=1 });
                    }
                }
            }
@@ -126,7 +139,9 @@
            var vmo = await _bll_ex.Value.GetByID(vm.ID);
            if (vmo != null)
            {
                _pumpMatchingViewModel.MatchingCurveDbId = vm.ID.ToString();
                _pumpMatchingViewModel.MatchingCurveDbId = vm.MainID.ToString();
                var pt_list = Yw.JsonHelper.Json2Object<List<HydroCurvePointViewModel>>(vm.VolCurve);
                _pumpMatchingViewModel.MatchingVolCurve = pt_list;
            }
        }
    }