2022-12-18 焊接修改
This commit is contained in:
@@ -40,11 +40,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
BLL.Base_ConsumablesService.InitConsumablesDropDownList(this.drpWeldingWire, true, "1", "请选择");//焊条类型
|
||||
Funs.FineUIPleaseSelect(DropTwoJointType, "请选择");
|
||||
|
||||
// 焊口属性
|
||||
//this.drpJointAttribute.DataTextField = "Text";
|
||||
//this.drpJointAttribute.DataValueField = "Value";
|
||||
//this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
|
||||
//this.drpJointAttribute.DataBind();
|
||||
//焊口属性
|
||||
this.drpJointAttribute.DataTextField = "Text";
|
||||
this.drpJointAttribute.DataValueField = "Value";
|
||||
this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute();
|
||||
this.drpJointAttribute.DataBind();
|
||||
|
||||
//BLL.Base_ComponentsService.InitComponentsDropDownList(this.drpComponent1, this.CurrUser.LoginProjectId, true, "请选择");//组件1
|
||||
//BLL.Base_ComponentsService.InitComponentsDropDownList(this.drpComponent2, this.CurrUser.LoginProjectId, true, "请选择");//组件2
|
||||
@@ -99,6 +99,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
}
|
||||
this.txtSize.Text = Convert.ToString(joint.Size);
|
||||
this.txtDia.Text = Convert.ToString(joint.Dia);
|
||||
this.txtDNDia.Text = joint.DNDia;
|
||||
this.txtThickness.Text = Convert.ToString(joint.Thickness);
|
||||
if (!string.IsNullOrEmpty(joint.WeldingMethodId))
|
||||
{
|
||||
@@ -148,10 +149,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
this.drpDetectionTypeId.SelectedValue = joint.DetectionTypeId;
|
||||
}
|
||||
|
||||
//if (!string.IsNullOrEmpty(joint.JointAttribute))
|
||||
//{
|
||||
// drpJointAttribute.SelectedValue = joint.JointAttribute;
|
||||
//}
|
||||
if (!string.IsNullOrEmpty(joint.JointAttribute))
|
||||
{
|
||||
drpJointAttribute.SelectedValue = joint.JointAttribute;
|
||||
}
|
||||
|
||||
//if (!string.IsNullOrEmpty(joint.Components1Id))
|
||||
//{
|
||||
@@ -353,6 +354,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
}
|
||||
joint.Size = Funs.GetNewDecimal(this.txtSize.Text.Trim());
|
||||
joint.Dia = Funs.GetNewDecimal(this.txtDia.Text.Trim());
|
||||
joint.DNDia=txtDNDia.Text.Trim();
|
||||
joint.Thickness = Funs.GetNewDecimal(this.txtThickness.Text.Trim());
|
||||
//if (this.drpComponent1.SelectedValue != BLL.Const._Null)
|
||||
//{
|
||||
@@ -362,7 +364,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
//{
|
||||
// joint.Components2Id = this.drpComponent2.SelectedValue;
|
||||
//}
|
||||
//joint.JointAttribute = drpJointAttribute.SelectedValue;
|
||||
joint.JointAttribute = drpJointAttribute.SelectedValue;
|
||||
|
||||
if (!string.IsNullOrEmpty(this.hdWeldingMethodId.Text.Trim()))
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user