feat: 完善材料条码与焊接业务功能

This commit is contained in:
2026-08-12 23:10:22 +08:00
parent 5d0501806b
commit 67206a28ee
26 changed files with 800 additions and 814 deletions
@@ -100,6 +100,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
this.txtWeldJointCode.Text = joint.WeldJointCode;
}
this.txtFlowingSection.Text = joint.FlowingSection;
if (!string.IsNullOrEmpty(joint.Material1Id))
{
this.drpMaterial1.SelectedValue = joint.Material1Id;
@@ -318,8 +319,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
Alert.ShowInTop("请完善必填项!", MessageBoxIcon.Warning);
return;
}
Model.HJGL_WeldJoint joint = new Model.HJGL_WeldJoint();
string weldJointId = WeldJointId;
bool isUpdatingExistingJoint = !string.IsNullOrEmpty(weldJointId) && string.IsNullOrEmpty(Request.Params["Type"]);
Model.HJGL_WeldJoint joint = isUpdatingExistingJoint
? BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId)
: new Model.HJGL_WeldJoint();
if (joint == null)
{
Alert.ShowInTop("焊口数据不存在或已被删除,请刷新后重试!", MessageBoxIcon.Warning);
return;
}
joint.PipelineId = this.PipelineId;
joint.PipelineCode = txtPipelineCode.Text.Trim();
joint.ProjectId = this.CurrUser.LoginProjectId;
@@ -418,6 +428,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
joint.IsHotProess = Convert.ToBoolean(drpIsHotProess.SelectedValue);
//joint.DesignIsHotProess = Convert.ToBoolean(drpDesignIsHotProess.SelectedValue);
joint.Remark = txtRemark.Text.Trim();
// 流水段属于焊口自身属性,编辑时直接回写焊口,避免只显示管线流水段而无法修正。
joint.FlowingSection = txtFlowingSection.Text.Trim();
joint.SubmitMan = CurrUser.PersonId;
if (this.txtWpqId.Text != "")
@@ -426,7 +438,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
if (!string.IsNullOrEmpty(weldJointId))
{
if (string.IsNullOrEmpty(Request.Params["Type"])) //非插入焊口
if (isUpdatingExistingJoint) // 非插入焊口
{
joint.WeldJointId = weldJointId;
BLL.WeldJointService.UpdateWeldJoint(joint);
@@ -878,4 +890,4 @@ namespace FineUIPro.Web.HJGL.WeldingManage
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldJoint&menuId={1}", WeldJointId, BLL.Const.HJGL_JotTwoDesignMenuId)));
}
}
}
}