diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
index 31e9dbe..8c10333 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs
@@ -232,7 +232,7 @@
btnCopy.Enabled = false; // 不能引用
}
}
- if (batch.BatchIsClosed == true) //批关闭则不能修改焊口号
+ if (batch != null && batch.BatchIsClosed == true) //批关闭则不能修改焊口号
{
}
@@ -1244,7 +1244,7 @@
{
if (this.txtJointNo.Text.Trim().Last() == 'G')
{
- this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G","");
+ this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G", "");
}
}
}
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 5c46a5b..e233efb 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
-
+