From f10f00cf1739b49fe51abfbb96093a2a2f66a65c Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期日, 19 一月 2025 17:56:36 +0800
Subject: [PATCH] 赋值问题报错修改
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs | 4 ++--
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.cs | 2 +-
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.cs | 1 +
10 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.cs
index 4857073..f0ce751 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/AddAssetsPipeMainDlg.cs
@@ -92,7 +92,7 @@
return;
}
_vmo.Name = this.txtName.Text.Trim();
- _vmo.Caliber= double.Parse(this.txtCaliber.EditValue?.ToString());
+ _vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
_vmo.KeyWords = HStation.Service.Assets.KeyWordHelper.ToList(this.txtKeyWord.Text.Trim());
_vmo.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
_vmo.TagName = this.txtTagName.Text.Trim();
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.cs
index 281f932..3a4d375 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/EditAssetsPipeMainDlg.cs
@@ -78,6 +78,7 @@
return;
}
_vmo.Name = this.txtName.Text.Trim();
+ _vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
_vmo.KeyWords = HStation.Service.Assets.KeyWordHelper.ToList(this.txtKeyWord.Text.Trim());
_vmo.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
_vmo.TagName = this.txtTagName.Text.Trim();
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs
index 5d6c8e8..8155bdd 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/03-factor/AddAssetsPipeFactorDlg.cs
@@ -66,8 +66,8 @@
}
_vmo.Name = this.txtName.Text.Trim();
_vmo.MinorLoss = double.Parse(this.txtMinorLoss.EditValue?.ToString());
- _vmo.Caliber = double.Parse(this.txtCaliber.EditValue?.ToString());
- _vmo.Material = this.txtMaterial.EditValue?.ToString();
+ _vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
+ _vmo.Material = this.txtMaterial.EditValue == null ? null : this.txtMaterial.EditValue?.ToString();
_vmo.Description = this.txtDescription.Text.Trim();
var id = await BLLFactory<HStation.BLL.AssetsPipeFactor>.Instance.Insert(_vmo);
if (id < 1)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.cs
index 39918ff..158087e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/AddAssetsElbowMainDlg.cs
@@ -106,7 +106,7 @@
_vmo.ElbowType = this.imageComboBoxEditConnectlenght.EditValue != null
? (eElbowType)Enum.Parse(typeof(eElbowType), this.imageComboBoxEditConnectlenght.EditValue.ToString())
: (eElbowType?)null;
- _vmo.Angle = int.Parse(this.txtAngle.EditValue?.ToString());
+ _vmo.Angle = this.txtAngle.EditValue == null ? null : int.Parse(this.txtAngle.EditValue?.ToString());
var id = await BLLFactory<HStation.BLL.AssetsElbowMain>.Instance.Insert(_vmo);
if (id < 1)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.cs
index d9d505a..5763e20 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/03-factor/AddAssetsElbowFactorDlg.cs
@@ -75,7 +75,7 @@
_vmo.Material = this.txtMaterial.Text.Trim();
_vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
_vmo.MinorLoss = double.Parse(this.txtCoefficient.EditValue?.ToString());
- _vmo.Angle = int.Parse(this.txtAngle.EditValue?.ToString());
+ _vmo.Angle = this.txtAngle.EditValue == null ? null : int.Parse(this.txtAngle.EditValue?.ToString());
_vmo.Description = this.txtDescription.Text.Trim();
var id = await BLLFactory<HStation.BLL.AssetsElbowFactor>.Instance.Insert(_vmo);
if (id < 1)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.cs
index 07bf3f4..4544707 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/02-main/AddAssetsBluntheadMainDlg.cs
@@ -97,7 +97,7 @@
_vmo.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
_vmo.TagName = this.txtTagName.Text.Trim();
_vmo.Description = this.txtDescription.Text.Trim();
- _vmo.Caliber = double.Parse(this.txtCaliber.EditValue?.ToString());
+ _vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
_vmo.Material = this.txtMaterial.Text.Trim();
var id = await BLLFactory<HStation.BLL.AssetsBluntheadMain>.Instance.Insert(_vmo);
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs
index 4917ff2..f9ad3a1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/03-factor/AddAssetsBluntheadFactorDlg.cs
@@ -68,7 +68,7 @@
}
_vmo.Name = this.txtName.Text.Trim();
_vmo.MinorLoss = double.Parse(this.txtMinorLoss.EditValue?.ToString());
- _vmo.Caliber = double.Parse(this.txtDiameter.EditValue?.ToString());
+ _vmo.Caliber = this.txtDiameter.EditValue == null ? null : double.Parse(this.txtDiameter.EditValue?.ToString());
_vmo.Material = this.txtMaterial.Text.Trim();
_vmo.Description = this.txtDescription.Text.Trim();
var id = await BLLFactory<HStation.BLL.AssetsBluntheadFactor>.Instance.Insert(_vmo);
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs
index 7148d25..5c9dc01 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/02-main/AddAssetsHydrantMainDlg.cs
@@ -97,7 +97,7 @@
_vmo.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
_vmo.TagName = this.txtTagName.Text.Trim();
_vmo.Description = this.txtDescription.Text.Trim();
- _vmo.Caliber = double.Parse(this.txtCaliber.EditValue?.ToString());
+ _vmo.Caliber = this.txtCaliber.EditValue == null ? null : double.Parse(this.txtCaliber.EditValue?.ToString());
_vmo.Material = this.txtMaterial.Text.Trim();
var id = await BLLFactory<HStation.BLL.AssetsHydrantMain>.Instance.Insert(_vmo);
if (id < 1)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.cs
index 01ddb7a..36311c6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/03-factor/AddAssetsHydrantFactorDlg.cs
@@ -68,7 +68,7 @@
}
_vmo.Name = this.txtName.Text.Trim();
_vmo.MinorLoss = double.Parse(this.txtMinorLoss.EditValue?.ToString());
- _vmo.Caliber = double.Parse(this.txtDiameter.EditValue?.ToString());
+ _vmo.Caliber = this.txtDiameter.EditValue == null ? null : double.Parse(this.txtDiameter.EditValue?.ToString());
_vmo.Material = this.txtMaterial.Text.Trim();
_vmo.Description = this.txtDescription.Text.Trim();
var id = await BLLFactory<HStation.BLL.AssetsHydrantFactor>.Instance.Insert(_vmo);
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
index 7caf1c6..f64a335 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
@@ -1706,7 +1706,7 @@
{
return false;
}
-
+ allElbowList = allElbowList.Where(x => x.Angle == 90).ToList();
//鏉冮噸瀛楀吀
var dict = new Dictionary<AssetsElbowMainVmo, double>();
foreach (var item in allElbowList)
--
Gitblit v1.9.3