gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260428 批量增加焊口验证

This commit is contained in:
毕文静 2026-04-28 17:10:12 +08:00
parent e4111cee3c
commit e3bd464715
4 changed files with 341 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx
View File

@ -106,17 +106,34 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtVoltage" Label="焊接电压" runat="server" LabelWidth="100px">
</f:TextBox>
<f:DropDownList ID="ddlComponent1" Label="组件1号" runat="server" EnableEdit="true"
LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="ddlComponent2" Label="组件2号" runat="server" EnableEdit="true"
LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="drpIsSpecial" Label="是否特殊" runat="server" LabelWidth="100px">
<f:ListItem Value="0" Text="否" />
<f:ListItem Value="1" Text="是" />
</f:DropDownList>
<f:DropDownList ID="drpNDTR_ID" runat="server" Label="探伤比例" LabelWidth="100px" EnableEdit="true">
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpNDTR_ID" runat="server" Label="探伤比例" LabelWidth="100px" EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpJOT_QualifiedLevel" runat="server" Label="合格等级" LabelWidth="100px"
<f:DropDownList ID="drpJOT_QualifiedLevel" runat="server" Label="合格等级" LabelWidth="100px" Required="true" ShowRedStar="true"
EnableEdit="true">
</f:DropDownList>
<f:TextBox ID="txtHardQuaStandard" runat="server" Label="硬度合格标准" LabelWidth="100px">
</f:TextBox>
<f:DropDownList ID="drpIsGold" Label="是否黄金口" runat="server" LabelWidth="100px"
AutoPostBack="true" OnSelectedIndexChanged="drpIsGold_SelectedIndexChanged">
<f:ListItem Value="0" Text="否" />
<f:ListItem Value="1" Text="是" />
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>

62
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs
View File

@ -131,6 +131,20 @@
this.ddlWeldMat.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("2");
this.ddlWeldMat.DataBind();
Funs.FineUIPleaseSelect(this.ddlWeldMat);
///组件1号
this.ddlComponent1.DataTextField = "COM_Name";
this.ddlComponent1.DataValueField = "COM_ID";
this.ddlComponent1.DataSource = BLL.HJGL_ComponentsService.GetComponentNameList();
this.ddlComponent1.DataBind();
Funs.FineUIPleaseSelect(this.ddlComponent1);
///组件2号
this.ddlComponent2.DataTextField = "COM_Name";
this.ddlComponent2.DataValueField = "COM_ID";
this.ddlComponent2.DataSource = BLL.HJGL_ComponentsService.GetComponentNameList();
this.ddlComponent2.DataBind();
Funs.FineUIPleaseSelect(this.ddlComponent2);
}
#endregion
@ -251,6 +265,16 @@
Alert.ShowInTop("请选择焊接方法！", MessageBoxIcon.Warning);
return;
}
if (this.drpNDTR_ID.SelectedValue==BLL.Const._Null)
{
Alert.ShowInTop("请选择探伤比例！", MessageBoxIcon.Warning);
return;
}
if (this.drpJOT_QualifiedLevel.SelectedValue==BLL.Const._Null)
{
Alert.ShowInTop("请选择合格等级！", MessageBoxIcon.Warning);
return;
}
int startInt = Funs.GetNewIntOrZero(this.txtJointNo1.Text.Trim());
int endInt = Funs.GetNewIntOrZero(this.txtJointNo2.Text.Trim());
if (endInt < startInt)
@ -356,6 +380,24 @@
{
newJointInfo.WeldL = Convert.ToInt32(this.txtWeldL.Text);
}
if (this.ddlComponent1.SelectedValue != BLL.Const._Null)
{
newJointInfo.JOT_Component1 = this.ddlComponent1.SelectedValue;
}
if (this.ddlComponent2.SelectedValue != BLL.Const._Null)
{
newJointInfo.JOT_Component2 = this.ddlComponent2.SelectedValue;
}
newJointInfo.JOT_Voltage = this.txtVoltage.Text.Trim();
if (this.drpIsGold.SelectedValue == "1")
{
newJointInfo.IsGold = true;
}
else
{
newJointInfo.IsGold = false;
}
for (int i = startInt; i <= endInt; i++)
{
//if (i < 10)
@ -554,6 +596,10 @@
}
this.txtPressureTestPackageNo.Text = jointInfo.PressureTestPackageNo;
this.drpIsGold.SelectedValue = jointInfo.IsGold.ToString();
this.ddlComponent1.SelectedValue = jointInfo.JOT_Component1;
this.ddlComponent2.SelectedValue = jointInfo.JOT_Component2;
this.txtVoltage.Text = jointInfo.JOT_Voltage;
}
}
}
@ -706,6 +752,22 @@
this.drpProessTypes.Hidden = true;
}
}
protected void drpIsGold_SelectedIndexChanged(object sender, EventArgs e)
{
if (this.drpIsGold.SelectedValue == "1")
{
this.drpNDTR_ID.SelectedValue = "e2612188-fc99-492a-937c-74c7a0151656"; //黄金口检测比例100%
this.drpNDTR_ID.Enabled = false;
this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "H";
}
else
{
this.drpNDTR_ID.SelectedValue = BLL.Const._Null;
this.drpNDTR_ID.Enabled = true;
this.txtJointNo.Text = this.txtJointNo.Text.Trim().Substring(0, this.txtJointNo.Text.Trim().Length - 1);
}
}
#endregion
}
}

42
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGL.WeldingManage {
namespace FineUIPro.Web.HJGL.WeldingManage
{
public partial class JointInfoBatchEdit {
public partial class JointInfoBatchEdit
{
/// <summary>
/// form1 控件。
@ -264,6 +266,33 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks>
protected global::FineUIPro.TextBox txtElectricity;
/// <summary>
/// txtVoltage 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtVoltage;
/// <summary>
/// ddlComponent1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlComponent1;
/// <summary>
/// ddlComponent2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlComponent2;
/// <summary>
/// drpIsSpecial 控件。
/// </summary>
@ -300,6 +329,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks>
protected global::FineUIPro.TextBox txtHardQuaStandard;
/// <summary>
/// drpIsGold 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsGold;
/// <summary>
/// ddlWeldSilk 控件。
/// </summary>

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>