提交代码

.gitignore

@@ -18,3 +18,4 @@ bin-release/
 # information for Eclipse / Flash Builder.
 /HJGL_DS/FineUIPro.Web/FileUpload/HJGL/HotProessManage
 /HJGL_DS/FineUIPro.Web/FileUploadHJGLHotProessManage
+/HJGL_DS/FineUIPro.Web/File/Excel

HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs

@@ -428,7 +428,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
         protected void btnMenuUpdate_Click(object sender, EventArgs e)
         {
-            if (this.CurrUser.Account == Const.Gly)
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_JointInfoMenuId, BLL.Const.BtnModify))
             {
                 if (Grid1.SelectedRowIndexArray.Length == 0)
                 {
@@ -439,7 +439,27 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 var jot = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(Grid1.SelectedRowID);
                 if (!string.IsNullOrEmpty(jot.DReportID))
                 {
-                    PageContext.RegisterStartupScript(Window8.GetShowReference(String.Format("JointReportUpdate.aspx?JOT_ID={0}", Grid1.SelectedRowID, "维护 - ")));
+                    var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByJotId(Grid1.SelectedRowID);
+                    var hot = Funs.DB.HJGL_CH_HotProessTrustItem.FirstOrDefault(x => x.JOT_ID == Grid1.SelectedRowID);
+                    if (batchDetail != null)
+                    {
+                        var batch = BLL.HJGL_BO_BatchService.GetBatchById(batchDetail.BatchId);
+                        if (batch.BatchIsClosed == true || hot != null)
+                        {
+                            if (this.CurrUser.Account == Const.Gly)
+                            {
+                                PageContext.RegisterStartupScript(Window8.GetShowReference(String.Format("JointReportUpdate.aspx?JOT_ID={0}", Grid1.SelectedRowID, "维护 - ")));
+                            }
+                            else
+                            {
+                                ShowNotify("只有管理员才有更改的权限！", MessageBoxIcon.Warning);
+                            }
+                        }
+                        else
+                        {
+                            PageContext.RegisterStartupScript(Window8.GetShowReference(String.Format("JointReportUpdate.aspx?JOT_ID={0}", Grid1.SelectedRowID, "维护 - ")));
+                        }
+                    }
                 }
                 else
                 {
@@ -448,7 +468,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
             else
             {
-                ShowNotify("只有管理员才有更改的权限！", MessageBoxIcon.Warning);
+                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
             }
         }