合并最新

SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs

@@ -647,8 +647,16 @@ namespace FineUIPro.Web.HSSE.SolutionNew
 
                 if (constructSolution != null)
                 {
-                    PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}",
-              -1, constructSolution.ConstructSolutionId + constructSolution.Edition, Const.CQMSConstructSolutionMenuId)));
+                    if (string.IsNullOrEmpty(constructSolution.CQMSConstructSolutionId))
+                    {
+                        PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}",
+                  -1, constructSolution.ConstructSolutionId + constructSolution.Edition, Const.CQMSConstructSolutionMenuId)));
+                    }
+                    else
+                    {
+                        PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?type={0}&toKeyId={1}&path=FileUpload/Solution&menuId={2}",
+                -1, constructSolution.CQMSConstructSolutionId + constructSolution.Edition, Const.CQMSConstructSolutionMenuId)));
+                    }
                 }
                  
             }
@@ -688,6 +696,11 @@ namespace FineUIPro.Web.HSSE.SolutionNew
                 Alert.ShowInTop("该方案已经审批完成,无法操作,请右键查看!", MessageBoxIcon.Warning);
                 return;
             }
+            else if (!string.IsNullOrEmpty(constructSolution.CQMSConstructSolutionId))
+            {
+                Alert.ShowInTop("该方案为质量模块施工方案备份内容,请右键查看!", MessageBoxIcon.Warning);
+                return;
+            }
             else if (constructSolution.State == Const.CQMSConstructSolution_Compile)
             {
                 if (constructSolution.CompileMan == CurrUser.UserId || CurrUser.UserId == Const.sysglyId)