Dto/HStation.Dto.Assets.Core/00-PumpProduct/01-PumpMainManage/03-PumpMain/UpdatePumpMainInput.cs
@@ -73,7 +73,7 @@ /// <summary> /// 叶轮外径 /// </summary> public double D2 { get; set; } public double? D2 { get; set; } /// <summary> /// 说明 WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/AddPumpProductMainDlg.cs
@@ -69,8 +69,7 @@ double.TryParse(TextEditRatedSpeed.Text.Trim(), out ratedSpeed); _AssetsPumpMain.RatedSpeed = ratedSpeed; _AssetsPumpMain.Description = DescriptionTextEdit.Text.Trim(); double d2; if (double.TryParse(TextEditD2.Text.Trim(), out d2)) if (double.TryParse(TextEditD2.Text.Trim(), out double d2)) { _AssetsPumpMain.D2 = d2; } WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
@@ -13,6 +13,9 @@ private const double _headTolerance = 5; private const double _powerTolerance = 0.05; private const double _valveLift = 10;//阀门开度范围 private const int _angle = 1;//角度范围 //资产自动匹配 public static bool Matching(AssetsMatchingViewModel assetsAutoMatchingView, out string Error) { @@ -241,7 +244,8 @@ var rangeMatch = adaptingManageVmos .Where(item => item.Caliber == null || Math.Abs(Convert.ToInt64(item.Caliber) - Convert.ToInt64(input.Diameter)) <= _caliberTolerance) Math.Abs(Convert.ToInt64(item.Caliber) - Convert.ToInt64(input.Diameter)) <= _caliberTolerance || Math.Abs(Convert.ToInt64(item.ValveLift) - Convert.ToInt64(input.ValveLift)) <= _valveLift) .ToList(); if (rangeMatch != null && rangeMatch.Count > 0) { @@ -293,6 +297,7 @@ input.MatchingMaterial = vmo.MaterialName; input.MatchingModelType = vmo.Name; // input.MatchingValveSetting = input.MatchingValveLift = vmo.ValveLift; input.MatchingValveType = vmo.SeriesType.ToString(); return true; } @@ -436,10 +441,13 @@ //区间匹配 var rangeMatch = adaptingManageVmos .Where(item => input.Caliber == null || item.Caliber == null || Math.Abs(Convert.ToInt64(item.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance) .ToList(); (input.Caliber == null && input.Caliber == null) || (item.Caliber.HasValue && input.Caliber.HasValue) && //存在值,则进行下面差值判断 Math.Abs(Convert.ToInt64(item.Caliber) - Convert.ToInt64(input.Caliber)) <= _caliberTolerance || item.ConnectionLength == input.ConnectionLength || (item.Angle.HasValue && input.Angle.HasValue) && //存在值,则进行下面差值判断 Math.Abs(Convert.ToInt64(item.Angle) - Convert.ToInt64(input.Angle)) <= _angle) .ToList(); if (rangeMatch != null && rangeMatch.Count > 0) { var materialList = new List<Vmo.AssetsElbowMainVmo>(); @@ -488,6 +496,8 @@ input.MatchingDbId = vmo.ID.ToString(); input.MatchingMaterial = vmo.MaterialName; input.MatchingModelType = vmo.Name; input.MatchingConnectionLength = vmo.ConnectionLength; input.MatchingAngle = vmo.Angle; return true; } return false; @@ -584,6 +594,8 @@ input.MatchingDbId = vmo.ID.ToString(); input.MatchingMaterial = vmo.MaterialName; input.MatchingModelType = vmo.Name; input.MatchingRunThroughCoefficient = vmo.RunThroughCoefficient; input.MatchingBranchThroughCoefficient = vmo.BranchThroughCoefficient; return true; } return false; WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/05-completed/XhsProjectSimulationAnalysisCtrl.Designer.cs
@@ -60,6 +60,8 @@ // // gridView1 // gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true; gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colDescription, colCode, colType }); gridFormatRule1.Name = "Format0"; gridFormatRule1.Rule = formatConditionRule2ColorScale1; @@ -71,35 +73,43 @@ // // colName // colName.AppearanceCell.Options.UseTextOptions = true; colName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; colName.FieldName = "Name"; colName.Name = "colName"; colName.Visible = true; colName.VisibleIndex = 0; colName.Width = 239; colName.VisibleIndex = 2; colName.Width = 116; // // colDescription // colDescription.AppearanceCell.Options.UseTextOptions = true; colDescription.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; colDescription.FieldName = "Description"; colDescription.Name = "colDescription"; colDescription.Visible = true; colDescription.VisibleIndex = 3; colDescription.Width = 491; colDescription.Width = 424; // // colCode // colCode.AppearanceCell.Options.UseTextOptions = true; colCode.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; colCode.FieldName = "Code"; colCode.Name = "colCode"; colCode.Visible = true; colCode.VisibleIndex = 1; colCode.Width = 134; colCode.Width = 137; // // colType // colType.AppearanceCell.Options.UseTextOptions = true; colType.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center; colType.FieldName = "Type"; colType.Name = "colType"; colType.Visible = true; colType.VisibleIndex = 2; colType.Width = 92; colType.VisibleIndex = 0; colType.Width = 279; // // XhsProjectSimulationAnalysisCtrl // WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/05-completed/XhsProjectSimulationAnalysisCtrl.cs
@@ -5,6 +5,8 @@ public XhsProjectSimulationAnalysisCtrl() { InitializeComponent(); this.gridView1.SetNormalView(30); this.gridView1.RegistCustomDrawRowIndicator(40); } private List<XhsProjectSimulationAnalysisViewModel> _allBindingList; @@ -66,14 +68,17 @@ { case "Error": e.Appearance.BackColor = Color.Red; e.Appearance.ForeColor = Color.White; break; case "Lack": e.Appearance.BackColor = Color.Gray; e.Appearance.ForeColor = Color.White; break; case "Abnormal": e.Appearance.BackColor = Color.Orange; e.Appearance.ForeColor = Color.White; break; } }; WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/05-completed/XhsProjectSimulationAnalysisViewModel.cs
@@ -13,8 +13,8 @@ this.Type = rhs.Type; } //名称 [DisplayName("名称")] //属性 [DisplayName("属性")] [Browsable(true)] public string Name { get; set; } @@ -28,8 +28,8 @@ [Browsable(true)] public string Code { get; set; } //构建属性 [DisplayName("构建属性")] //构件类型 [DisplayName("构件类型")] [Browsable(true)] public string Type { get; set; }
@@ -109,7 +109,7 @@ ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages; ribbonControl1.ShowQatLocationSelector = false; ribbonControl1.ShowToolbarCustomizeItem = false; ribbonControl1.Size = new Size(1206, 128); ribbonControl1.Size = new Size(1206, 101); ribbonControl1.Toolbar.ShowCustomizeItem = false; ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden; // @@ -437,12 +437,12 @@ tabPane1.Controls.Add(tabPageBimface); tabPane1.Controls.Add(tabPageQ3d); tabPane1.Dock = DockStyle.Fill; tabPane1.Location = new Point(0, 128); tabPane1.Location = new Point(0, 101); tabPane1.Name = "tabPane1"; tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d }); tabPane1.RegularSize = new Size(931, 407); tabPane1.RegularSize = new Size(931, 434); tabPane1.SelectedPage = tabPageBimface; tabPane1.Size = new Size(931, 407); tabPane1.Size = new Size(931, 434); tabPane1.TabIndex = 1; tabPane1.Text = "tabPane1"; // @@ -450,7 +450,7 @@ // tabPageBimface.Caption = "三维模型"; tabPageBimface.Name = "tabPageBimface"; tabPageBimface.Size = new Size(931, 374); tabPageBimface.Size = new Size(931, 401); // // tabPageQ3d // @@ -469,17 +469,17 @@ docPnlRight.Controls.Add(controlContainerRight); docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right; docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18"); docPnlRight.Location = new Point(931, 128); docPnlRight.Location = new Point(931, 101); docPnlRight.Name = "docPnlRight"; docPnlRight.OriginalSize = new Size(275, 200); docPnlRight.Size = new Size(275, 572); docPnlRight.Size = new Size(275, 599); docPnlRight.Text = "属性"; // // controlContainerRight // controlContainerRight.Location = new Point(4, 26); controlContainerRight.Name = "controlContainerRight"; controlContainerRight.Size = new Size(268, 543); controlContainerRight.Size = new Size(268, 570); controlContainerRight.TabIndex = 0; // // docPnlBottom @@ -539,8 +539,8 @@ AutoScaleDimensions = new SizeF(7F, 14F); AutoScaleMode = AutoScaleMode.Font; Controls.Add(tabPane1); Controls.Add(docPnlBottom); Controls.Add(docPnlRight); Controls.Add(docPnlBottom); Controls.Add(ribbonControl1); Margin = new Padding(2); Name = "XhsProjectSimulationCorePage";
