feat(hjgl): 完善焊前检查和防腐检查流程

焊前检查需要同时覆盖下料、组对和防腐检查，并支持移动端查询与保存。扩展焊前检查模型、服务和页面字段，补充检查结果、不合格原因、整改要求、附件和防腐检查记录，便于按焊口和材料追溯检查过程。
2026-07-07 10:40:21 +08:00
parent 02b524b895
commit bb6615ebb0
57 changed files with 5035 additions and 2057 deletions
@@ -44,6 +44,15 @@
                    <f:RenderField Width="140px" ColumnID="WeldJointCode" DataField="WeldJointCode" FieldType="String"
                        HeaderText="焊口号" HeaderTextAlign="Center" TextAlign="Left">
                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="CuttingLength" DataField="CuttingLength" FieldType="Double"
+                        HeaderText="下料长度" HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="GrooveForm" DataField="GrooveForm" FieldType="String"
+                        HeaderText="坡口形式" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="GrooveAngle" DataField="GrooveAngle" FieldType="Double"
+                        HeaderText="坡口角度" HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
                    <f:CheckBoxField Width="150px" ColumnID="IsMaterialCodeBatchNoAccurate" DataField="IsMaterialCodeBatchNoAccurate"
                        HeaderText="材料准确" HeaderTextAlign="Center" TextAlign="Center" RenderAsStaticField="true">
                    </f:CheckBoxField>
@@ -56,9 +65,21 @@
                    <f:RenderField Width="170px" ColumnID="CheckTime" DataField="CheckTime" FieldType="Date"
                        RendererArgument="yyyy-MM-dd HH:mm" HeaderText="检查时间" HeaderTextAlign="Center" TextAlign="Center">
                    </f:RenderField>
-                    <f:CheckBoxField Width="120px" ColumnID="IsQualified" DataField="IsQualified"
-                        HeaderText="是否合格" HeaderTextAlign="Center" TextAlign="Center" RenderAsStaticField="true">
-                    </f:CheckBoxField>
+                    <f:RenderField Width="120px" ColumnID="CheckResult" DataField="CheckResult" FieldType="String"
+                        HeaderText="检查结果" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="180px" ColumnID="CreateTime" DataField="CreateTime" FieldType="Date"
+                        RendererArgument="yyyy-MM-dd HH:mm" HeaderText="创建时间" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="220px" ColumnID="UnqualifiedReason" DataField="UnqualifiedReason" FieldType="String"
+                        HeaderText="不合格原因" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="220px" ColumnID="RectifyRequirement" DataField="RectifyRequirement" FieldType="String"
+                        HeaderText="整改要求" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="220px" ColumnID="Remark" DataField="Remark" FieldType="String"
+                        HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
                </Columns>
                <PageItems>
                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -20,6 +20,24 @@
                    </f:DropDownList>
                </Items>
            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:NumberBox ID="numCuttingLength" runat="server" Label="下料长度" LabelWidth="170px" DecimalPrecision="2">
+                    </f:NumberBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextBox ID="txtGrooveForm" runat="server" Label="坡口形式" LabelWidth="170px">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:NumberBox ID="numGrooveAngle" runat="server" Label="坡口角度" LabelWidth="170px" DecimalPrecision="2">
+                    </f:NumberBox>
+                </Items>
+            </f:FormRow>
            <f:FormRow>
                <Items>
                    <f:CheckBox ID="chkMaterialCodeBatchNo" runat="server" Label="材料编码及炉批号校验"
@@ -34,6 +52,22 @@
                    </f:CheckBox>
                </Items>
            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="ddlCheckResult" runat="server" Label="检查结果" LabelWidth="170px" Required="true"
+                        ShowRedStar="true">
+                        <f:ListItem Text="合格" Value="合格" />
+                        <f:ListItem Text="不合格" Value="不合格" />
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="drpCheckPerson" runat="server" Label="检查人" LabelWidth="170px" Required="true"
+                        ShowRedStar="true" EnableEdit="true">
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
            <f:FormRow>
                <Items>
                    <f:DatePicker ID="dpCheckTime" runat="server" Label="检查时间" LabelWidth="170px"
@@ -41,6 +75,18 @@
                    </f:DatePicker>
                </Items>
            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtUnqualifiedReason" runat="server" Label="不合格原因" LabelWidth="170px">
+                    </f:TextArea>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtRectifyRequirement" runat="server" Label="整改要求" LabelWidth="170px">
+                    </f:TextArea>
+                </Items>
+            </f:FormRow>
            <f:FormRow>
                <Items>
                    <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelWidth="170px">
@@ -19,12 +19,15 @@ namespace FineUIPro.Web.HJGL.PreWeld
                btnClose.OnClientClick = ActiveWindow.GetHideReference();
                CuttingCheckId = Request.Params["CuttingCheckId"];
                BindWeldJoint();
+                BindCheckPerson();
+                ddlCheckResult.SelectedValue = "合格";
                if (!string.IsNullOrEmpty(CuttingCheckId))
                {
                    BindData();
                }
                else
                {
+                    drpCheckPerson.SelectedValue = CurrUser.PersonId;
                    dpCheckTime.SelectedDate = DateTime.Now;
                }
            }
@@ -49,6 +52,11 @@ namespace FineUIPro.Web.HJGL.PreWeld
            }
        }

+        private void BindCheckPerson()
+        {
+            Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpCheckPerson, CurrUser.LoginProjectId, null, null, true);
+        }
+
        private void BindData()
        {
            var model = PreWeldInspectionService.GetCuttingCheckById(CuttingCheckId);
@@ -58,9 +66,22 @@ namespace FineUIPro.Web.HJGL.PreWeld
            }

            drpWeldJoint.SelectedValue = model.WeldJointId;
+            numCuttingLength.Text = model.CuttingLength.HasValue ? model.CuttingLength.Value.ToString() : string.Empty;
+            txtGrooveForm.Text = model.GrooveForm;
+            numGrooveAngle.Text = model.GrooveAngle.HasValue ? model.GrooveAngle.Value.ToString() : string.Empty;
            chkMaterialCodeBatchNo.Checked = model.IsMaterialCodeBatchNoAccurate;
            chkMaterialQuantity.Checked = model.IsMaterialQuantityAccurate;
+            if (!string.IsNullOrEmpty(model.CheckResult))
+            {
+                ddlCheckResult.SelectedValue = model.CheckResult;
+            }
+            if (!string.IsNullOrEmpty(model.CheckPerson))
+            {
+                drpCheckPerson.SelectedValue = model.CheckPerson;
+            }
            dpCheckTime.SelectedDate = model.CheckTime;
+            txtUnqualifiedReason.Text = model.UnqualifiedReason;
+            txtRectifyRequirement.Text = model.RectifyRequirement;
            txtRemark.Text = model.Remark;
        }

@@ -72,32 +93,33 @@ namespace FineUIPro.Web.HJGL.PreWeld
                return;
            }

-            var item = new Model.PreWeldCuttingCheckItem
+            var item = new Model.PreWeldCuttingCheckInput
            {
+                CuttingCheckId = CuttingCheckId,
                ProjectId = CurrUser.LoginProjectId,
                WeldJointId = drpWeldJoint.SelectedValue,
+                CuttingLength = string.IsNullOrWhiteSpace(numCuttingLength.Text) ? (decimal?)null : Convert.ToDecimal(numCuttingLength.Text),
+                GrooveForm = txtGrooveForm.Text.Trim(),
+                GrooveAngle = string.IsNullOrWhiteSpace(numGrooveAngle.Text) ? (decimal?)null : Convert.ToDecimal(numGrooveAngle.Text),
                IsMaterialCodeBatchNoAccurate = chkMaterialCodeBatchNo.Checked,
                IsMaterialQuantityAccurate = chkMaterialQuantity.Checked,
-                CheckPerson = CurrUser.PersonId,
+                CheckResult = ddlCheckResult.SelectedValue,
+                CheckPerson = drpCheckPerson.SelectedValue,
                CheckTime = dpCheckTime.SelectedDate ?? DateTime.Now,
                CreateUser = CurrUser.PersonId,
+                UnqualifiedReason = txtUnqualifiedReason.Text.Trim(),
+                RectifyRequirement = txtRectifyRequirement.Text.Trim(),
                Remark = txtRemark.Text.Trim()
            };

-            APIPreWeldInspectionService.SaveCuttingCheck(item);
+            CuttingCheckId = APIPreWeldInspectionService.SaveCuttingCheck(item);
            ShowNotify("保存成功！", MessageBoxIcon.Success);
            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
        }

        protected void btnAttachUrl_Click(object sender, EventArgs e)
        {
-            string cuttingCheckId = CuttingCheckId;
-            if (string.IsNullOrEmpty(cuttingCheckId) && !string.IsNullOrEmpty(drpWeldJoint.SelectedValue))
-            {
-                var check = Funs.DB.HJGL_PreWeldCuttingCheck.FirstOrDefault(x => x.WeldJointId == drpWeldJoint.SelectedValue);
-                cuttingCheckId = check == null ? string.Empty : check.CuttingCheckId;
-            }
-            if (string.IsNullOrEmpty(cuttingCheckId))
+            if (string.IsNullOrEmpty(CuttingCheckId))
            {
                Alert.ShowInTop("请先保存下料抽检记录后再上传附件！", MessageBoxIcon.Warning);
                return;
@@ -105,7 +127,7 @@ namespace FineUIPro.Web.HJGL.PreWeld

            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
                string.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/HJGL/PreWeld/CuttingCheck&menuId={1}&edit=1&type=-1",
-                    cuttingCheckId, Const.HJGL_PreWeldCuttingCheckMenuId)));
+                    CuttingCheckId, Const.HJGL_PreWeldCuttingCheckMenuId)));
        }
    }
 }
@@ -50,6 +50,33 @@ namespace FineUIPro.Web.HJGL.PreWeld
        /// </remarks>
        protected global::FineUIPro.DropDownList drpWeldJoint;

+        /// <summary>
+        /// numCuttingLength 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox numCuttingLength;
+
+        /// <summary>
+        /// txtGrooveForm 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtGrooveForm;
+
+        /// <summary>
+        /// numGrooveAngle 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox numGrooveAngle;
+
        /// <summary>
        /// chkMaterialCodeBatchNo 控件。
        /// </summary>
@@ -68,6 +95,24 @@ namespace FineUIPro.Web.HJGL.PreWeld
        /// </remarks>
        protected global::FineUIPro.CheckBox chkMaterialQuantity;

+        /// <summary>
+        /// ddlCheckResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCheckResult;
+
+        /// <summary>
+        /// drpCheckPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCheckPerson;
+
        /// <summary>
        /// dpCheckTime 控件。
        /// </summary>
@@ -77,6 +122,24 @@ namespace FineUIPro.Web.HJGL.PreWeld
        /// </remarks>
        protected global::FineUIPro.DatePicker dpCheckTime;

+        /// <summary>
+        /// txtUnqualifiedReason 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtUnqualifiedReason;
+
+        /// <summary>
+        /// txtRectifyRequirement 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRectifyRequirement;
+
        /// <summary>
        /// txtRemark 控件。
        /// </summary>
@@ -13,8 +13,8 @@
        ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
        <Items>
            <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="组对抽检列表台账"
-                runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WeldJointId"
-                DataIDField="WeldJointId" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
+                runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="FitupCheckId"
+                DataIDField="FitupCheckId" AllowPaging="true" IsDatabasePaging="true" PageSize="15"
                OnPageIndexChange="Grid1_PageIndexChange" EnableRowDoubleClickEvent="true"
                OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
                <Toolbars>
@@ -59,6 +59,36 @@
                    <f:RenderField Width="120px" ColumnID="Misalignment" DataField="Misalignment" FieldType="Double"
                        HeaderText="错边量" HeaderTextAlign="Center" TextAlign="Right">
                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="WeldReinforcement" DataField="WeldReinforcement" FieldType="Double"
+                        HeaderText="焊缝余高" HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="WeldHeight" DataField="WeldHeight" FieldType="Double"
+                        HeaderText="焊缝高度" HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="WeldWidth" DataField="WeldWidth" FieldType="Double"
+                        HeaderText="焊缝宽度" HeaderTextAlign="Center" TextAlign="Right">
+                    </f:RenderField>
+                    <f:RenderField Width="180px" ColumnID="SurfaceDefect" DataField="SurfaceDefect" FieldType="String"
+                        HeaderText="表面缺陷" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="CheckResult" DataField="CheckResult" FieldType="String"
+                        HeaderText="检查结果" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="120px" ColumnID="CheckPersonName" DataField="CheckPersonName" FieldType="String"
+                        HeaderText="检查人" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="170px" ColumnID="CheckTime" DataField="CheckTime" FieldType="Date"
+                        RendererArgument="yyyy-MM-dd HH:mm" HeaderText="检查时间" HeaderTextAlign="Center" TextAlign="Center">
+                    </f:RenderField>
+                    <f:RenderField Width="220px" ColumnID="UnqualifiedReason" DataField="UnqualifiedReason" FieldType="String"
+                        HeaderText="不合格原因" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="220px" ColumnID="RectifyRequirement" DataField="RectifyRequirement" FieldType="String"
+                        HeaderText="整改要求" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
+                    <f:RenderField Width="220px" ColumnID="Remark" DataField="Remark" FieldType="String"
+                        HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left">
+                    </f:RenderField>
                </Columns>
                <PageItems>
                    <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -67,7 +67,7 @@ namespace FineUIPro.Web.HJGL.PreWeld
            }
            if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.PersonId, Const.HJGL_PreWeldFitupCheckMenuId, Const.BtnModify))
            {
-                PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("FitupCheckEdit.aspx?WeldJointId={0}", Grid1.SelectedRowID)));
+                PageContext.RegisterStartupScript(Window1.GetShowReference(string.Format("FitupCheckEdit.aspx?FitupCheckId={0}", Grid1.SelectedRowID)));
            }
        }
    }
@@ -51,6 +51,46 @@
                    </f:NumberBox>
                </Items>
            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:NumberBox ID="numWeldReinforcement" runat="server" Label="焊缝余高" LabelWidth="170px" DecimalPrecision="2">
+                    </f:NumberBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:NumberBox ID="numWeldHeight" runat="server" Label="焊缝高度" LabelWidth="170px" DecimalPrecision="2">
+                    </f:NumberBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:NumberBox ID="numWeldWidth" runat="server" Label="焊缝宽度" LabelWidth="170px" DecimalPrecision="2">
+                    </f:NumberBox>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtSurfaceDefect" runat="server" Label="表面缺陷" LabelWidth="170px">
+                    </f:TextArea>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="ddlCheckResult" runat="server" Label="检查结果" LabelWidth="170px" Required="true"
+                        ShowRedStar="true">
+                        <f:ListItem Text="合格" Value="合格" />
+                        <f:ListItem Text="不合格" Value="不合格" />
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:DropDownList ID="drpCheckPerson" runat="server" Label="检查人" LabelWidth="170px" Required="true"
+                        ShowRedStar="true" EnableEdit="true">
+                    </f:DropDownList>
+                </Items>
+            </f:FormRow>
            <f:FormRow>
                <Items>
                    <f:DatePicker ID="dpCheckTime" runat="server" Label="检查时间" LabelWidth="170px"
@@ -58,6 +98,18 @@
                    </f:DatePicker>
                </Items>
            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtUnqualifiedReason" runat="server" Label="不合格原因" LabelWidth="170px">
+                    </f:TextArea>
+                </Items>
+            </f:FormRow>
+            <f:FormRow>
+                <Items>
+                    <f:TextArea ID="txtRectifyRequirement" runat="server" Label="整改要求" LabelWidth="170px">
+                    </f:TextArea>
+                </Items>
+            </f:FormRow>
            <f:FormRow>
                <Items>
                    <f:TextArea ID="txtRemark" runat="server" Label="备注" MaxLength="500" LabelWidth="170px">
@@ -6,10 +6,10 @@ namespace FineUIPro.Web.HJGL.PreWeld
 {
    public partial class FitupCheckEdit : PageBase
    {
-        public string WeldJointId
+        public string FitupCheckId
        {
-            get { return (string)ViewState["WeldJointId"]; }
-            set { ViewState["WeldJointId"] = value; }
+            get { return (string)ViewState["FitupCheckId"]; }
+            set { ViewState["FitupCheckId"] = value; }
        }

        protected void Page_Load(object sender, EventArgs e)
@@ -17,15 +17,26 @@ namespace FineUIPro.Web.HJGL.PreWeld
            if (!IsPostBack)
            {
                btnClose.OnClientClick = ActiveWindow.GetHideReference();
-                WeldJointId = Request.Params["WeldJointId"];
+                FitupCheckId = Request.Params["FitupCheckId"];
+                var weldJointId = Request.Params["WeldJointId"];
                BindWeldJoint();
                BindGrooveType();
-                if (!string.IsNullOrEmpty(WeldJointId))
+                BindCheckPerson();
+                ddlCheckResult.SelectedValue = "合格";
+                if (!string.IsNullOrEmpty(FitupCheckId))
                {
                    BindData();
                }
+                else if (!string.IsNullOrEmpty(weldJointId))
+                {
+                    drpWeldJoint.SelectedValue = weldJointId;
+                    drpWeldJoint.Enabled = false;
+                    drpCheckPerson.SelectedValue = CurrUser.PersonId;
+                    dpCheckTime.SelectedDate = DateTime.Now;
+                }
                else
                {
+                    drpCheckPerson.SelectedValue = CurrUser.PersonId;
                    dpCheckTime.SelectedDate = DateTime.Now;
                }
            }
@@ -50,6 +61,11 @@ namespace FineUIPro.Web.HJGL.PreWeld
            }
        }

+        private void BindCheckPerson()
+        {
+            Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(drpCheckPerson, CurrUser.LoginProjectId, null, null, true);
+        }
+
        private void BindGrooveType()
        {
            drpGrooveType.DataTextField = "BaseInfoName";
@@ -60,8 +76,12 @@ namespace FineUIPro.Web.HJGL.PreWeld

        private void BindData()
        {
-            var model = PreWeldInspectionService.GetFitupCheckByWeldJointId(WeldJointId);
-            var weldJoint = APIPreWeldInspectionService.GetPreWeldJointByWeldJointId(WeldJointId);
+            var model = PreWeldInspectionService.GetFitupCheckById(FitupCheckId);
+            if (model == null)
+            {
+                return;
+            }
+            var weldJoint = APIPreWeldInspectionService.GetPreWeldJointByWeldJointId(model.WeldJointId);
            if (weldJoint != null)
            {
                drpWeldJoint.SelectedValue = weldJoint.WeldJointId;
@@ -97,7 +117,30 @@ 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;
+                }
+                if (!string.IsNullOrEmpty(model.CheckPerson))
+                {
+                    drpCheckPerson.SelectedValue = model.CheckPerson;
+                }
                dpCheckTime.SelectedDate = model.CheckTime;
+                txtUnqualifiedReason.Text = model.UnqualifiedReason;
+                txtRectifyRequirement.Text = model.RectifyRequirement;
                txtRemark.Text = model.Remark;
            }
        }
@@ -110,8 +153,9 @@ namespace FineUIPro.Web.HJGL.PreWeld
                return;
            }

-            var item = new Model.PreWeldFitupCheckItem
+            var item = new Model.PreWeldFitupCheckInput
            {
+                FitupCheckId = FitupCheckId,
                ProjectId = CurrUser.LoginProjectId,
                WeldJointId = drpWeldJoint.SelectedValue,
                GrooveTypeId = drpGrooveType.SelectedValue,
@@ -119,24 +163,27 @@ namespace FineUIPro.Web.HJGL.PreWeld
                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),
-                CheckPerson = CurrUser.PersonId,
+                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,
                CreateUser = CurrUser.PersonId,
+                UnqualifiedReason = txtUnqualifiedReason.Text.Trim(),
+                RectifyRequirement = txtRectifyRequirement.Text.Trim(),
                Remark = txtRemark.Text.Trim()
            };

-            APIPreWeldInspectionService.SaveFitupCheck(item);
+            FitupCheckId = APIPreWeldInspectionService.SaveFitupCheck(item);
            ShowNotify("保存成功！", MessageBoxIcon.Success);
            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
        }

        protected void btnAttachUrl_Click(object sender, EventArgs e)
        {
-            string weldJointId = drpWeldJoint.SelectedValue;
-            var check = string.IsNullOrEmpty(weldJointId)
-                ? null
-                : Funs.DB.HJGL_PreWeldFitupCheck.FirstOrDefault(x => x.WeldJointId == weldJointId);
-            if (check == null)
+            if (string.IsNullOrEmpty(FitupCheckId))
            {
                Alert.ShowInTop("请先保存组对抽检记录后再上传附件！", MessageBoxIcon.Warning);
                return;
@@ -144,7 +191,7 @@ namespace FineUIPro.Web.HJGL.PreWeld

            PageContext.RegisterStartupScript(WindowAtt.GetShowReference(
                string.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/HJGL/PreWeld/FitupCheck&menuId={1}&edit=1&type=-1",
-                    check.FitupCheckId, Const.HJGL_PreWeldFitupCheckMenuId)));
+                    FitupCheckId, Const.HJGL_PreWeldFitupCheckMenuId)));
        }
    }
 }
@@ -95,6 +95,60 @@ namespace FineUIPro.Web.HJGL.PreWeld
        /// </remarks>
        protected global::FineUIPro.NumberBox numMisalignment;

+        /// <summary>
+        /// numWeldReinforcement 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox numWeldReinforcement;
+
+        /// <summary>
+        /// numWeldHeight 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox numWeldHeight;
+
+        /// <summary>
+        /// numWeldWidth 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox numWeldWidth;
+
+        /// <summary>
+        /// txtSurfaceDefect 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtSurfaceDefect;
+
+        /// <summary>
+        /// ddlCheckResult 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList ddlCheckResult;
+
+        /// <summary>
+        /// drpCheckPerson 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCheckPerson;
+
        /// <summary>
        /// dpCheckTime 控件。
        /// </summary>
@@ -104,6 +158,24 @@ namespace FineUIPro.Web.HJGL.PreWeld
        /// </remarks>
        protected global::FineUIPro.DatePicker dpCheckTime;

+        /// <summary>
+        /// txtUnqualifiedReason 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtUnqualifiedReason;
+
+        /// <summary>
+        /// txtRectifyRequirement 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextArea txtRectifyRequirement;
+
        /// <summary>
        /// txtRemark 控件。
        /// </summary>