2023-10-15

This commit is contained in:
2023-10-25 10:03:27 +08:00
parent cbb2b0c571
commit 69138c9b08
8 changed files with 146 additions and 56 deletions
@@ -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">
@@ -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());
@@ -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)
{