This commit is contained in:
2024-07-01 09:29:35 +08:00
parent 3990f747ce
commit 26d1774fb1
35 changed files with 1432 additions and 488 deletions
@@ -127,9 +127,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
this.drpJointAttribute.DataBind();
Funs.FineUIPleaseSelect(this.drpJointAttribute,Resources.Lan.PleaseSelect);
// 物料码
BLL.MaterialCoodeService.InitCoodeDropDownList(this.drpCoode1, this.CurrUser.LoginProjectId, true, Resources.Lan.PleaseSelect);//Coode1
BLL.MaterialCoodeService.InitCoodeDropDownList(this.drpCoode2, this.CurrUser.LoginProjectId, true, Resources.Lan.PleaseSelect);//Coode2
///组件1号
Base_ComponentsService.InitComponentsDropDownList(this.drpPipeAssembly1, true,Resources.Lan.PleaseSelect);
///组件2号
@@ -355,14 +353,14 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
txtPageNum.Text = jointInfo.PageNum;
if (!string.IsNullOrEmpty(jointInfo.Coode1))
{
drpCoode1.SelectedValue = jointInfo.Coode1;
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo1, drpCoode1.SelectedValue, true, Resources.Lan.PleaseSelect);
txtCoode1.Text = jointInfo.Coode1;
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo1, txtCoode1.Text, true, Resources.Lan.PleaseSelect);
drpHeartNo1.SelectedValue = jointInfo.Coode1;
}
if (!string.IsNullOrEmpty(jointInfo.Coode2))
{
drpCoode2.SelectedValue = jointInfo.Coode2;
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo2, drpCoode2.SelectedValue, true, Resources.Lan.PleaseSelect);
txtCoode2.Text = jointInfo.Coode2;
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo2, txtCoode2.Text, true, Resources.Lan.PleaseSelect);
drpHeartNo2.SelectedValue = jointInfo.Coode2;
}
@@ -517,19 +515,13 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
newJointInfo.TestPackageNo = this.txtTestPackageNo.Text.Trim();
newJointInfo.PrepareTemp = this.txtPrepareTemp.Text.Trim();
newJointInfo.PageNum = txtPageNum.Text.Trim();
if (drpCoode1.SelectedValue != Const._Null)
{
newJointInfo.Coode1 = drpCoode1.SelectedValue;
}
newJointInfo.Coode1 = txtCoode1.Text.Trim();
if (drpHeartNo1.SelectedValue != Const._Null)
{
newJointInfo.HeartNo1 = drpHeartNo1.SelectedValue;
}
if (drpCoode2.SelectedValue != Const._Null)
{
newJointInfo.Coode2=drpCoode2.SelectedValue;
}
newJointInfo.Coode2 = txtCoode2.Text.Trim();
if (drpHeartNo2.SelectedValue != Const._Null)
{
newJointInfo.HeartNo2 = drpHeartNo2.SelectedValue;
@@ -658,21 +650,21 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
protected void drpCoode1_SelectedIndexChanged(object sender, EventArgs e)
protected void txtCoode1_TextChanged(object sender, EventArgs e)
{
if (drpCoode1.SelectedValue != Const._Null)
if (!string.IsNullOrEmpty(txtCoode1.Text))
{
drpHeartNo1.Items.Clear();
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo1, drpCoode1.SelectedValue, true, Resources.Lan.PleaseSelect);//HeartNo1
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo1, txtCoode1.Text, true, Resources.Lan.PleaseSelect);//HeartNo1
}
}
protected void drpCoode2_SelectedIndexChanged(object sender, EventArgs e)
protected void txtCoode2_TextChanged(object sender, EventArgs e)
{
if (drpCoode2.SelectedValue != Const._Null)
if (!string.IsNullOrEmpty(txtCoode2.Text))
{
drpHeartNo2.Items.Clear();
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo2, drpCoode2.SelectedValue, true, Resources.Lan.PleaseSelect);//HeartNo2
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo2, txtCoode2.Text, true, Resources.Lan.PleaseSelect);//HeartNo2
}
}