lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
高飞
2023-10-25 14:07:40 +08:00
parent ac817b3cdd 127146e24a
commit ce1e237663
8 changed files with 146 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/BaseInfo/Control.aspx
+4 -4
View File
@@ -64,11 +64,11 @@
<f:RenderField Width="100px" ColumnID="OutSizeDia" DataField="OutSizeDia" FieldType="Float" Locked="true"
HeaderText="外径(mm)" HeaderTextAlign="Center" TextAlign="Left" SortField="OutSizeDia">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Sch5S" DataField="Sch5S" FieldType="Float"
HeaderText="SCH5S/SCH5" HeaderTextAlign="Center" TextAlign="Left" SortField="Sch5S">
<f:RenderField Width="120px" ColumnID="SCH5S" DataField="SCH5S" FieldType="Float"
HeaderText="SCH5S/SCH5" HeaderTextAlign="Center" TextAlign="Left" SortField="SCH5S">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="Sch10S" DataField="Sch10S" FieldType="Float"
HeaderText="SCH10S" HeaderTextAlign="Center" TextAlign="Left" SortField="Sch10S">
<f:RenderField Width="80px" ColumnID="SCH10S" DataField="SCH10S" FieldType="Float"
HeaderText="SCH10S" HeaderTextAlign="Center" TextAlign="Left" SortField="SCH10S">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="SCH10" DataField="SCH10" FieldType="Float"
HeaderText="SCH10" HeaderTextAlign="Center" TextAlign="Left" SortField="SCH10">
SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlEdit.aspx.cs
+6 -6
View File
@@ -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());
SGGL/FineUIPro.Web/HJGL/BaseInfo/ControlView.aspx.cs
+4 -4
View File
@@ -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)
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+37 -15
View File
@@ -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
{