This commit is contained in:
2024-06-05 08:24:19 +08:00
parent 1677a6d714
commit 3990f747ce
67 changed files with 6774 additions and 1645 deletions
@@ -95,7 +95,6 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
this.drpWeldingLocation.DataSource = from x in Funs.DB.Base_WeldingLocation orderby x.WeldingLocationCode select x;
this.drpWeldingLocation.DataBind();
///是否热处理
this.drpIsHotProess.DataValueField = "Value";
this.drpIsHotProess.DataTextField = "Text";
@@ -192,7 +191,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (this.drpJointAttribute.SelectedValue != BLL.Const._Null)
{
newJointInfo.JointAttribute = this.drpJointAttribute.SelectedValue;
if (this.drpJointAttribute.SelectedValue == "活动S")
if (this.drpJointAttribute.SelectedValue == "S")
{
newJointInfo.JointArea = "S";
}
@@ -331,136 +330,155 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (dn.Count() > 0)
{
if (dn.First().OutSizeDia != null)
if (ansi != "FB")
{
dia = dn.First().OutSizeDia.ToString();
}
txtDia.Readonly = true;
txtThickness.Readonly = true;
if (dn.First().OutSizeDia != null)
{
dia = dn.First().OutSizeDia.ToString();
}
if (ansi == "5")
{
if (dn.First().SCH5 != null)
if (ansi == "5")
{
sch = dn.First().SCH5.ToString();
if (dn.First().SCH5 != null)
{
sch = dn.First().SCH5.ToString();
}
}
if (ansi == "5S")
{
if (dn.First().SCH5S != null)
{
sch = dn.First().SCH5S.ToString();
}
}
if (ansi == "10")
{
if (dn.First().SCH10 != null)
{
sch = dn.First().SCH10.ToString();
}
}
if (ansi == "10S")
{
if (dn.First().SCH10S != null)
{
sch = dn.First().SCH10S.ToString();
}
}
if (ansi == "20")
{
if (dn.First().SCH20 != null)
{
sch = dn.First().SCH20.ToString();
}
}
if (ansi == "30")
{
if (dn.First().SCH30 != null)
{
sch = dn.First().SCH30.ToString();
}
}
if (ansi == "40")
{
if (dn.First().SCH40 != null)
{
sch = dn.First().SCH40.ToString();
}
}
if (ansi == "40S")
{
if (dn.First().SCH40S != null)
{
sch = dn.First().SCH40S.ToString();
}
}
if (ansi == "STD")
{
if (dn.First().STD != null)
{
sch = dn.First().STD.ToString();
}
}
if (ansi == "60")
{
if (dn.First().SCH60 != null)
{
sch = dn.First().SCH60.ToString();
}
}
if (ansi == "80")
{
if (dn.First().SCH80 != null)
{
sch = dn.First().SCH80.ToString();
}
}
if (ansi == "80S")
{
if (dn.First().SCH80S != null)
{
sch = dn.First().SCH80S.ToString();
}
}
if (ansi == "XS")
{
if (dn.First().XS != null)
{
sch = dn.First().XS.ToString();
}
}
if (ansi == "100")
{
if (dn.First().SCH100 != null)
{
sch = dn.First().SCH100.ToString();
}
}
if (ansi == "120")
{
if (dn.First().SCH120 != null)
{
sch = dn.First().SCH120.ToString();
}
}
if (ansi == "140")
{
if (dn.First().SCH140 != null)
{
sch = dn.First().SCH140.ToString();
}
}
if (ansi == "160")
{
if (dn.First().SCH160 != null)
{
sch = dn.First().SCH160.ToString();
}
}
if (ansi == "XXS")
{
if (dn.First().XXS != null)
{
sch = dn.First().XXS.ToString();
}
}
}
if (ansi == "5S")
else // 非美标FB
{
if (dn.First().SCH5S != null)
{
sch = dn.First().SCH5S.ToString();
}
}
if (ansi == "10")
{
if (dn.First().SCH10 != null)
{
sch = dn.First().SCH10.ToString();
}
}
if (ansi == "10S")
{
if (dn.First().SCH10S != null)
{
sch = dn.First().SCH10S.ToString();
}
}
if (ansi == "20")
{
if (dn.First().SCH20 != null)
{
sch = dn.First().SCH20.ToString();
}
}
if (ansi == "30")
{
if (dn.First().SCH30 != null)
{
sch = dn.First().SCH30.ToString();
}
}
if (ansi == "40")
{
if (dn.First().SCH40 != null)
{
sch = dn.First().SCH40.ToString();
}
}
if (ansi == "40S")
{
if (dn.First().SCH40S != null)
{
sch = dn.First().SCH40S.ToString();
}
}
if (ansi == "STD")
{
if (dn.First().STD != null)
{
sch = dn.First().STD.ToString();
}
}
if (ansi == "60")
{
if (dn.First().SCH60 != null)
{
sch = dn.First().SCH60.ToString();
}
}
if (ansi == "80")
{
if (dn.First().SCH80 != null)
{
sch = dn.First().SCH80.ToString();
}
}
if (ansi == "80S")
{
if (dn.First().SCH80S != null)
{
sch = dn.First().SCH80S.ToString();
}
}
if (ansi == "XS")
{
if (dn.First().XS != null)
{
sch = dn.First().XS.ToString();
}
}
if (ansi == "100")
{
if (dn.First().SCH100 != null)
{
sch = dn.First().SCH100.ToString();
}
}
if (ansi == "120")
{
if (dn.First().SCH120 != null)
{
sch = dn.First().SCH120.ToString();
}
}
if (ansi == "140")
{
if (dn.First().SCH140 != null)
{
sch = dn.First().SCH140.ToString();
}
}
if (ansi == "160")
{
if (dn.First().SCH160 != null)
{
sch = dn.First().SCH160.ToString();
}
}
if (ansi == "XXS")
{
if (dn.First().XXS != null)
{
sch = dn.First().XXS.ToString();
}
txtDia.Readonly = false;
txtThickness.Readonly = false;
//if (dn.First().OutSize_FB != null)
//{
// dia = dn.First().OutSize_FB.ToString();
//}
//if (dn.First().SCH_FB != null)
//{
// sch = dn.First().SCH_FB.ToString();
//}
}
if (!string.IsNullOrEmpty(dia))
@@ -478,6 +496,26 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
}
}
/// <summary>
/// 选择外径和壁厚自动获取规格
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtText_TextChanged(object sender, EventArgs e)
{
string dn = string.Empty;
string s = string.Empty;
if (!string.IsNullOrEmpty(this.txtDia.Text.Trim()))
{
dn = this.txtDia.Text.Trim();
if (!string.IsNullOrEmpty(this.txtThickness.Text.Trim()))
{
this.txtSpecification.Text = "Φ" + dn + "×" + this.txtThickness.Text.Trim();
}
}
}
#endregion
}
}