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

2026-08-19 17:13:33 +08:00
parent 08792e0dc8
commit 679e9f6cec
68 changed files with 2481 additions and 1170 deletions
@@ -32,6 +32,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
            ddlCheckPerson.SelectedValue = model.CheckPerson;
            dpCheckTime.SelectedDate = model.CheckTime;
            txtRemark.Text = model.Remark;
+            numWeldReinforcement.Text = ToText(model.WeldReinforcement);
+            numWeldHeight.Text = ToText(model.WeldHeight);
+            numWeldWidth.Text = ToText(model.WeldWidth);
+            txtSurfaceDefect.Text = model.SurfaceDefect;
+            numPreheatTemperature.Text = ToText(model.PreheatTemperature);
+            numInterpassTemperature.Text = ToText(model.InterpassTemperature);
        }

        private void BindWeldJoints()
@@ -64,11 +70,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                    CheckPerson = ddlCheckPerson.SelectedValue,
                    CheckTime = dpCheckTime.SelectedDate,
                    Remark = txtRemark.Text.Trim(),
+                    WeldReinforcement = ToDecimal(numWeldReinforcement.Text),
+                    WeldHeight = ToDecimal(numWeldHeight.Text),
+                    WeldWidth = ToDecimal(numWeldWidth.Text),
+                    SurfaceDefect = txtSurfaceDefect.Text.Trim(),
+                    PreheatTemperature = ToDecimal(numPreheatTemperature.Text),
+                    InterpassTemperature = ToDecimal(numInterpassTemperature.Text),
                    CreateUser = CurrUser.PersonId
                });
                ShowNotify("保存成功！", MessageBoxIcon.Success);
                PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
            }
+            catch (ArgumentException ex)
+            {
+                ShowNotify(ex.Message, MessageBoxIcon.Warning);
+            }
            catch (Exception ex)
            {
                Alert.ShowInTop(ex.Message, MessageBoxIcon.Warning);
@@ -81,5 +97,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                "../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/HJGL/WeldingManage/WeldAppearanceCheck&menuId={1}&edit=1",
                AppearanceCheckId, Const.HJGL_WeldAppearanceCheckMenuId)));
        }
+
+        private static decimal? ToDecimal(string value)
+        {
+            decimal result;
+            return decimal.TryParse(value, out result) ? result : (decimal?)null;
+        }
+
+        private static string ToText(decimal? value)
+        {
+            return value.HasValue ? value.Value.ToString() : string.Empty;
+        }
    }
 }