From 69138c9b086d4c98b4406b2851580a351ea32bcd Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Wed, 25 Oct 2023 10:03:27 +0800 Subject: [PATCH] 2023-10-15 --- DataBase/版本日志/SGGLDB_V2023-10-24.sql | 3 +- DataBase/版本日志/SGGLDB_V2023-10-25.sql | 7 ++ .../HJGL/BaseInfo/Base_DNCompareService.cs | 68 +++++++++++++++++-- SGGL/FineUIPro.Web/HJGL/BaseInfo/Control.aspx | 8 +-- .../HJGL/BaseInfo/ControlEdit.aspx.cs | 12 ++-- .../HJGL/BaseInfo/ControlView.aspx.cs | 8 +-- .../WeldingManage/PipelineListPDMSIn.aspx.cs | 52 ++++++++++---- SGGL/Model/Model.cs | 44 ++++++------ 8 files changed, 146 insertions(+), 56 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-10-25.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-10-24.sql b/DataBase/版本日志/SGGLDB_V2023-10-24.sql index 01b9c436..19ec21da 100644 --- a/DataBase/版本日志/SGGLDB_V2023-10-24.sql +++ b/DataBase/版本日志/SGGLDB_V2023-10-24.sql @@ -3,4 +3,5 @@ alter table dbo.Sys_Const go alter table dbo.PHTGL_ContractTrack add SerialNumber nvarchar(50) -go \ No newline at end of file +go + diff --git a/DataBase/版本日志/SGGLDB_V2023-10-25.sql b/DataBase/版本日志/SGGLDB_V2023-10-25.sql new file mode 100644 index 00000000..8950d1fc --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-10-25.sql @@ -0,0 +1,7 @@ + +exec sp_rename 'dbo.Base_DNCompare.Sch5S', SCH5S, 'COLUMN' +go + +exec sp_rename 'dbo.Base_DNCompare.Sch10S', SCH10S, 'COLUMN' +go + diff --git a/SGGL/BLL/HJGL/BaseInfo/Base_DNCompareService.cs b/SGGL/BLL/HJGL/BaseInfo/Base_DNCompareService.cs index 21557503..a7df7932 100644 --- a/SGGL/BLL/HJGL/BaseInfo/Base_DNCompareService.cs +++ b/SGGL/BLL/HJGL/BaseInfo/Base_DNCompareService.cs @@ -1,4 +1,5 @@ using Model; +using System; using System.Collections.Generic; using System.Linq; @@ -15,6 +16,14 @@ namespace BLL return Funs.DB.Base_DNCompare.FirstOrDefault(e => e.DNCompareId == dNCompareId); } + public static Model.Base_DNCompare GetDNCompareByDN(int DN) + { + return Funs.DB.Base_DNCompare.FirstOrDefault(e => e.DN == DN); + } + public static Model.Base_DNCompare GetDNCompareByOutSizeDia(decimal OutSizeDia) + { + return Funs.DB.Base_DNCompare.FirstOrDefault(e => e.OutSizeDia == OutSizeDia); + } /// /// 增加直径寸径对照信息 /// @@ -28,8 +37,8 @@ namespace BLL DN = dNCompare.DN, PipeSize = dNCompare.PipeSize, OutSizeDia = dNCompare.OutSizeDia, - Sch5S = dNCompare.Sch5S, - Sch10S = dNCompare.Sch10S, + SCH5S = dNCompare.SCH5S, + SCH10S = dNCompare.SCH10S, SCH10 = dNCompare.SCH10, SCH20 = dNCompare.SCH20, SCH30 = dNCompare.SCH30, @@ -72,8 +81,8 @@ namespace BLL newDNCompare.DN = dNCompare.DN; newDNCompare.PipeSize = dNCompare.PipeSize; newDNCompare.OutSizeDia = dNCompare.OutSizeDia; - newDNCompare.Sch5S = dNCompare.Sch5S; - newDNCompare.Sch10S = dNCompare.Sch10S; + newDNCompare.SCH5S = dNCompare.SCH5S; + newDNCompare.SCH10S = dNCompare.SCH10S; newDNCompare.SCH10 = dNCompare.SCH10; newDNCompare.SCH20 = dNCompare.SCH20; newDNCompare.SCH30 = dNCompare.SCH30; @@ -130,6 +139,57 @@ namespace BLL return list; } + /// + /// 根据DN直径获取壁厚 + /// + /// + /// + /// + public static decimal? GetThicknessByDNDia(int DN,string sch) + { + decimal result = 0; + var q = GetDNCompareByDN(DN); + if (q!=null) + { + var diaProperty = q.GetType().GetProperty(sch); + diaProperty = (diaProperty == null ? q.GetType().GetProperty(sch.Replace("Sch", "SCH")) : diaProperty); + + if (diaProperty != null) + { + var diaValue = diaProperty.GetValue(q); + + result = Funs.GetNewDecimalOrZero(diaValue?.ToString()); + } + } + + return result; + } + /// + /// 根据外径获取壁厚 + /// + /// + /// + /// + public static decimal? GetThicknessByDia(decimal? Dia, string sch) + { + decimal result = 0; + sch = sch.Replace("", ""); + var q = GetDNCompareByOutSizeDia((decimal)Dia); + if (q != null) + { + var diaProperty = q.GetType().GetProperty(sch); + diaProperty = (diaProperty == null ? q.GetType().GetProperty(sch.Replace("Sch", "SCH")) : diaProperty); + if (diaProperty != null) + { + var diaValue = diaProperty.GetValue(q); + + result = Funs.GetNewDecimalOrZero(diaValue?.ToString()); + } + } + + return result; + } + public static decimal? GetSizeByDia(decimal dia) { var q = Funs.DB.Base_DNCompare.FirstOrDefault(x => x.OutSizeDia == dia); diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/Control.aspx b/SGGL/FineUIPro.Web/HJGL/BaseInfo/Control.aspx index 95836735..32f7f979 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/Control.aspx +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/Control.aspx @@ -64,11 +64,11 @@ - + - + diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlEdit.aspx.cs index 362b9a18..8f101ff6 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlEdit.aspx.cs @@ -46,13 +46,13 @@ namespace FineUIPro.Web.HJGL.BaseInfo { this.txtOutSizeDia.Text = DNCompare.OutSizeDia.ToString(); } - if (DNCompare.Sch5S.HasValue) + if (DNCompare.SCH5S.HasValue) { - this.txtSCH5S.Text = DNCompare.Sch5S.ToString(); + this.txtSCH5S.Text = DNCompare.SCH5S.ToString(); } - if (DNCompare.Sch10S.HasValue) + if (DNCompare.SCH10S.HasValue) { - this.txtSCH10S.Text = DNCompare.Sch10S.ToString(); + this.txtSCH10S.Text = DNCompare.SCH10S.ToString(); } if (DNCompare.SCH10.HasValue) { @@ -164,8 +164,8 @@ namespace FineUIPro.Web.HJGL.BaseInfo newDNCompare.PipeSize = Funs.GetNewDecimal(this.txtPipeSize.Text.Trim()); newDNCompare.DN = Funs.GetNewInt(this.txtDN.Text.Trim()); newDNCompare.OutSizeDia = Funs.GetNewDecimal(this.txtOutSizeDia.Text.Trim()); - newDNCompare.Sch5S = Funs.GetNewDecimal(this.txtSCH5S.Text.Trim()); - newDNCompare.Sch10S = Funs.GetNewDecimal(this.txtSCH10S.Text.Trim()); + newDNCompare.SCH5S = Funs.GetNewDecimal(this.txtSCH5S.Text.Trim()); + newDNCompare.SCH10S = Funs.GetNewDecimal(this.txtSCH10S.Text.Trim()); newDNCompare.SCH10 = Funs.GetNewDecimal(this.txtSCH10.Text.Trim()); newDNCompare.SCH20 = Funs.GetNewDecimal(this.txtSCH20.Text.Trim()); newDNCompare.SCH30 = Funs.GetNewDecimal(this.txtSCH30.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlView.aspx.cs b/SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlView.aspx.cs index 907ba641..b0d745cf 100644 --- a/SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlView.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlView.aspx.cs @@ -27,13 +27,13 @@ namespace FineUIPro.Web.HJGL.BaseInfo { this.txtOutSizeDia.Text = DNCompare.OutSizeDia.ToString(); } - if (DNCompare.Sch5S.HasValue) + if (DNCompare.SCH5S.HasValue) { - this.txtSCH5S.Text = DNCompare.Sch5S.ToString(); + this.txtSCH5S.Text = DNCompare.SCH5S.ToString(); } - if (DNCompare.Sch10S.HasValue) + if (DNCompare.SCH10S.HasValue) { - this.txtSCH10S.Text = DNCompare.Sch10S.ToString(); + this.txtSCH10S.Text = DNCompare.SCH10S.ToString(); } if (DNCompare.SCH10.HasValue) { diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs index 5e74f7e2..2c73f034 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs @@ -595,25 +595,47 @@ namespace FineUIPro.Web.HJGL.WeldingManage var col24 = Convert.ToString(pds[i].Z); if (col24!=null) - { - try + { + // var Thickness = Convert.ToDecimal(col24); + decimal Thickness = 0; + string thickness = col24.ToString(); + if (thickness.Contains("Sch") || thickness.Contains("SCH")) { - var Thickness = Convert.ToDecimal(col24); - pipeline.Thickness = Thickness; - //是否根据壁厚计算达因 - //Model.Project_Sys_Set thicknessSet = BLL.Project_SysSetService.GetSysSetBySetId("7", this.CurrUser.LoginProjectId); - //if (thicknessSet != null && thicknessSet.IsAuto == true) - //{ - // if (pipeline.Size != null) - // { - // pipeline.Size = Convert.ToDecimal(BLL.WeldJointService.GetSizeByThickness(pipeline.Size, Thickness)); - // } - //} + if (rbDiaType.SelectedValue == "1")//外径 + { + Thickness = (decimal)BLL.Base_DNCompareService.GetThicknessByDia(pipeline.Dia,thickness); + pipeline.Thickness = Thickness; + } + else //DN直径 + { + Thickness = (decimal)BLL.Base_DNCompareService.GetThicknessByDNDia(int.Parse( pipeline.DNDia.Replace("DN","")), thickness); + pipeline.Thickness = Thickness; + } } - catch (Exception) + else { - result.Add("第" + (i + 1).ToString() + "行," + "壁厚格式输入有误" + "|") ; + try + { + + Thickness = Convert.ToDecimal(col24); + pipeline.Thickness = Thickness; + //是否根据壁厚计算达因 + //Model.Project_Sys_Set thicknessSet = BLL.Project_SysSetService.GetSysSetBySetId("7", this.CurrUser.LoginProjectId); + //if (thicknessSet != null && thicknessSet.IsAuto == true) + //{ + // if (pipeline.Size != null) + // { + // pipeline.Size = Convert.ToDecimal(BLL.WeldJointService.GetSizeByThickness(pipeline.Size, Thickness)); + // } + //} + } + catch (Exception) + { + result.Add("第" + (i + 1).ToString() + "行," + "壁厚格式输入有误" + "|"); + } + } + } else { diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 1ffc1b9e..cbdaa69b 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -19345,9 +19345,9 @@ namespace Model private System.Nullable _OutSizeDia; - private System.Nullable _Sch5S; + private System.Nullable _SCH5S; - private System.Nullable _Sch10S; + private System.Nullable _SCH10S; private System.Nullable _SCH10; @@ -19407,10 +19407,10 @@ namespace Model partial void OnPipeSizeChanged(); partial void OnOutSizeDiaChanging(System.Nullable value); partial void OnOutSizeDiaChanged(); - partial void OnSch5SChanging(System.Nullable value); - partial void OnSch5SChanged(); - partial void OnSch10SChanging(System.Nullable value); - partial void OnSch10SChanged(); + partial void OnSCH5SChanging(System.Nullable value); + partial void OnSCH5SChanged(); + partial void OnSCH10SChanging(System.Nullable value); + partial void OnSCH10SChanged(); partial void OnSCH10Changing(System.Nullable value); partial void OnSCH10Changed(); partial void OnSCH20Changing(System.Nullable value); @@ -19544,42 +19544,42 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sch5S", DbType="Decimal(9,1)")] - public System.Nullable Sch5S + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SCH5S", DbType="Decimal(9,1)")] + public System.Nullable SCH5S { get { - return this._Sch5S; + return this._SCH5S; } set { - if ((this._Sch5S != value)) + if ((this._SCH5S != value)) { - this.OnSch5SChanging(value); + this.OnSCH5SChanging(value); this.SendPropertyChanging(); - this._Sch5S = value; - this.SendPropertyChanged("Sch5S"); - this.OnSch5SChanged(); + this._SCH5S = value; + this.SendPropertyChanged("SCH5S"); + this.OnSCH5SChanged(); } } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sch10S", DbType="Decimal(9,1)")] - public System.Nullable Sch10S + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SCH10S", DbType="Decimal(9,1)")] + public System.Nullable SCH10S { get { - return this._Sch10S; + return this._SCH10S; } set { - if ((this._Sch10S != value)) + if ((this._SCH10S != value)) { - this.OnSch10SChanging(value); + this.OnSCH10SChanging(value); this.SendPropertyChanging(); - this._Sch10S = value; - this.SendPropertyChanged("Sch10S"); - this.OnSch10SChanged(); + this._SCH10S = value; + this.SendPropertyChanged("SCH10S"); + this.OnSCH10SChanged(); } } }