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

feat(hjgl): 完善焊接任务与质量管理流程

Browse Source
This commit is contained in:
李鹏飞
2026-08-19 17:13:33 +08:00
parent 08792e0dc8
commit 679e9f6cec
68 changed files with 2481 additions and 1170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/PreWeld/FitupCheckEdit.aspx.cs
+10 -44
View File
@@ -20,7 +20,6 @@ namespace FineUIPro.Web.HJGL.PreWeld
FitupCheckId = Request.Params["FitupCheckId"];
var weldJointId = Request.Params["WeldJointId"];
BindWeldJoint();
BindGrooveType();
BindCheckPerson();
ddlCheckResult.SelectedValue = "合格";
if (!string.IsNullOrEmpty(FitupCheckId))
@@ -66,14 +65,6 @@ namespace FineUIPro.Web.HJGL.PreWeld
Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpCheckPerson, CurrUser.LoginProjectId, null, null, true);
}
private void BindGrooveType()
{
drpGrooveType.DataTextField = "BaseInfoName";
drpGrooveType.DataValueField = "BaseInfoId";
drpGrooveType.DataSource = APIBaseInfoService.getGrooveType();
drpGrooveType.DataBind();
}
private void BindData()
{
var model = PreWeldInspectionService.GetFitupCheckById(FitupCheckId);
@@ -86,12 +77,6 @@ namespace FineUIPro.Web.HJGL.PreWeld
{
drpWeldJoint.SelectedValue = weldJoint.WeldJointId;
drpWeldJoint.Enabled = false;
drpGrooveType.SelectedValue = weldJoint.GrooveTypeId;
txtGrooveProcessType.Text = weldJoint.GrooveProcessType;
if (weldJoint.GrooveAngle.HasValue)
{
numGrooveAngle.Text = weldJoint.GrooveAngle.Value.ToString();
}
if (weldJoint.FitupGap.HasValue)
{
numFitupGap.Text = weldJoint.FitupGap.Value.ToString();
@@ -103,12 +88,6 @@ namespace FineUIPro.Web.HJGL.PreWeld
}
if (model != null)
{
drpGrooveType.SelectedValue = model.GrooveTypeId;
txtGrooveProcessType.Text = model.GrooveProcessType;
if (model.GrooveAngle.HasValue)
{
numGrooveAngle.Text = model.GrooveAngle.Value.ToString();
}
if (model.FitupGap.HasValue)
{
numFitupGap.Text = model.FitupGap.Value.ToString();
@@ -117,19 +96,6 @@ namespace FineUIPro.Web.HJGL.PreWeld
{
numMisalignment.Text = model.Misalignment.Value.ToString();
}
if (model.WeldReinforcement.HasValue)
{
numWeldReinforcement.Text = model.WeldReinforcement.Value.ToString();
}
if (model.WeldHeight.HasValue)
{
numWeldHeight.Text = model.WeldHeight.Value.ToString();
}
if (model.WeldWidth.HasValue)
{
numWeldWidth.Text = model.WeldWidth.Value.ToString();
}
txtSurfaceDefect.Text = model.SurfaceDefect;
if (!string.IsNullOrEmpty(model.CheckResult))
{
ddlCheckResult.SelectedValue = model.CheckResult;
@@ -158,15 +124,8 @@ namespace FineUIPro.Web.HJGL.PreWeld
FitupCheckId = FitupCheckId,
ProjectId = CurrUser.LoginProjectId,
WeldJointId = drpWeldJoint.SelectedValue,
GrooveTypeId = drpGrooveType.SelectedValue,
GrooveProcessType = txtGrooveProcessType.Text.Trim(),
GrooveAngle = string.IsNullOrWhiteSpace(numGrooveAngle.Text) ? (decimal?)null : Convert.ToDecimal(numGrooveAngle.Text),
FitupGap = string.IsNullOrWhiteSpace(numFitupGap.Text) ? (decimal?)null : Convert.ToDecimal(numFitupGap.Text),
Misalignment = string.IsNullOrWhiteSpace(numMisalignment.Text) ? (decimal?)null : Convert.ToDecimal(numMisalignment.Text),
WeldReinforcement = string.IsNullOrWhiteSpace(numWeldReinforcement.Text) ? (decimal?)null : Convert.ToDecimal(numWeldReinforcement.Text),
WeldHeight = string.IsNullOrWhiteSpace(numWeldHeight.Text) ? (decimal?)null : Convert.ToDecimal(numWeldHeight.Text),
WeldWidth = string.IsNullOrWhiteSpace(numWeldWidth.Text) ? (decimal?)null : Convert.ToDecimal(numWeldWidth.Text),
SurfaceDefect = txtSurfaceDefect.Text.Trim(),
CheckResult = ddlCheckResult.SelectedValue,
CheckPerson = drpCheckPerson.SelectedValue,
CheckTime = dpCheckTime.SelectedDate ?? DateTime.Now,
@@ -176,9 +135,16 @@ namespace FineUIPro.Web.HJGL.PreWeld
Remark = txtRemark.Text.Trim()
};
FitupCheckId = APIPreWeldInspectionService.SaveFitupCheck(item);
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
try
{
FitupCheckId = APIPreWeldInspectionService.SaveFitupCheck(item);
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
}
catch (ArgumentException ex)
{
ShowNotify(ex.Message, MessageBoxIcon.Warning);
}
}
protected void btnAttachUrl_Click(object sender, EventArgs e)