lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2011-10-19 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-10-19 15:49:56 +08:00
parent 6e363ef6ae
commit b7a43a4130
26 changed files with 444 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.cs
+27 -22
View File
@@ -50,6 +50,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//Funs.FineUIPleaseSelect(this.drpDetectionTypeId);
string weldJointId = Request.Params["WeldJointId"];
string isTwoJoint = Request.Params["IsTwoJoint"];
GroupPanel2.Hidden = true;
if (!string.IsNullOrEmpty(weldJointId))
{
@@ -233,7 +234,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </summary>
private void SaveData()
{
if (this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.hdWeldingMethodId.Text) || string.IsNullOrEmpty(this.txtWpqId.Text.Trim()))
// if (this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.hdWeldingMethodId.Text) || string.IsNullOrEmpty(this.txtWpqId.Text.Trim()))
if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("页面必填项不能为空", MessageBoxIcon.Warning);
Alert.ShowInTop("请完善必填项！", MessageBoxIcon.Warning);
@@ -266,11 +269,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
else
{
if (this.txtWeldJointCode.Text.Contains("G"))
{
Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning);
return;
}
//if (this.txtWeldJointCode.Text.Contains("G"))
//{
// Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning);
// return;
//}
joint.WeldJointCode = this.txtWeldJointCode.Text;
}
@@ -323,26 +326,28 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
joint.DetectionTypeId = this.drpDetectionTypeId.SelectedValue;
}
bool flag = false;
if (Convert.ToBoolean(drpDesignIsHotProess.SelectedValue))
{
flag = true;
}
if (flag)
{
joint.IsHotProess = true;
}
else
{
joint.IsHotProess = false;
}
//bool flag = false;
//if (Convert.ToBoolean(drpDesignIsHotProess.SelectedValue))
//{
// flag = true;
//}
//if (flag)
//{
// joint.IsHotProess = true;
//}
//else
//{
// joint.IsHotProess = false;
//}
//joint.IsHotProess = Convert.ToBoolean(drpIsHotProess.SelectedValue);
//joint.DesignIsHotProess = Convert.ToBoolean(drpDesignIsHotProess.SelectedValue);
joint.Remark = txtRemark.Text.Trim();
joint.SubmitMan = CurrUser.PersonId;
if (!string.IsNullOrEmpty(this.txtWpqId.Text))
{
joint.WPQId = this.txtWpqId.Text;
}
joint.IsHotProess = Convert.ToBoolean(drpIsHotProess.SelectedValue);
joint.DesignIsHotProess = Convert.ToBoolean(drpDesignIsHotProess.SelectedValue);
joint.Remark = txtRemark.Text.Trim();
if (Request.Params["IsTwoJoint"] == "1")
{