diff --git a/.gitignore b/.gitignore
index 00420380..33a12f85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /SGGL/FineUIPro.Web/FileUpload/CQMS/InspectionEquipment/2023-05
 /SGGL/FineUIPro.Web/FileUpload/CQMS
 /SGGL/FineUIPro.Web/FileUpload/LargerHazard/2023-06
+/SGGLPackFile.rar
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
index b07c0135..2c3f9fdc 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs
@@ -306,17 +306,17 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                     var units = (from x in db.Base_Unit
                                  join y in db.Project_ProjectUnit
                                  on x.UnitId equals y.UnitId
-                                 where y.ProjectId==this.CurrUser.LoginProjectId && y.UnitType== BLL.Const.ProjectUnitType_4
+                                 where y.ProjectId == this.CurrUser.LoginProjectId && y.UnitType == BLL.Const.ProjectUnitType_4
                                  orderby x.UnitName
                                  select x).FirstOrDefault();
-                    if (units!=null)
+                    if (units != null)
                     {
                         bookmarkUnitName.Text = units.UnitName;
                     }
                 }
                 var projectModel = db.Base_Project.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).FirstOrDefault();
                 var inspectionModel = db.ProcessControl_InspectionManagement.Where(x => x.InspectionId == Id).FirstOrDefault();
-                
+
                 //项目编号
                 Bookmark bookmarkProjectCode = doc.Range.Bookmarks["projectCode"];
                 if (bookmarkProjectCode != null)
@@ -339,9 +339,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 Bookmark bookmarkInspectionCode = doc.Range.Bookmarks["inspectionCode"];
                 if (bookmarkInspectionCode != null)
                 {
-                    if (inspectionModel != null)
+                    if (inspectionModel != null && !string.IsNullOrEmpty(inspectionModel.NoticeCode))
                     {
-                        bookmarkInspectionCode.Text = inspectionModel.InspectionCode;
+                        bookmarkInspectionCode.Text = inspectionModel.NoticeCode;
                     }
                 }
 
@@ -446,7 +446,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 builder.StartTable();
                 builder.CellFormat.Borders.LineStyle = Aspose.Words.LineStyle.Single;
                 builder.CellFormat.Borders.Color = System.Drawing.Color.Black;
-                
+
                 builder.Bold = false;
                 builder.RowFormat.Height = 20;
                 builder.Font.Size = 10;
@@ -462,7 +462,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                         {
                             builder.RowFormat.Height = 200 / ManagementDetaillList.Count;
                         }
-                        else {
+                        else
+                        {
                             builder.RowFormat.Height = 20;
                         }
                         builder.CellFormat.Borders.Left.LineWidth = 1;
@@ -473,7 +474,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                         builder.CellFormat.Width = 156;
                         builder.Write(ConvertControlPointType(item.ControlPointType));
                         builder.CellFormat.Borders.Left.LineWidth = 0;
-                       // 控制点等级
+                        // 控制点等级
                         builder.InsertCell();
                         builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                         builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
@@ -483,11 +484,12 @@ namespace FineUIPro.Web.CQMS.ProcessControl
 
                         var ControlPointType = ConvertClass(item.ControlPointType);
                         #region 控制点等级
-                        if (ControlPointType.Contains("A") )
+                        if (ControlPointType.Contains("A"))
                         {
                             builder.Write("■A  ");
                         }
-                        else {
+                        else
+                        {
                             builder.Write("□A  ");
                         }
                         if (ControlPointType.Contains("B"))
@@ -700,16 +702,16 @@ namespace FineUIPro.Web.CQMS.ProcessControl
                 #endregion
 
                 #region 生成二维码
-                
+
                 string imageUrl = Funs.RootPath + CreateQRCodeService.CreateCode_Simple("InspectionNotice$" + Id);
-                if (File.Exists( imageUrl))
+                if (File.Exists(imageUrl))
                 {
                     builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Top;//垂直居中对齐
                     builder.ParagraphFormat.Alignment = ParagraphAlignment.Right;//水平居中对齐
-                    builder.InsertImage(imageUrl,100, 100);
+                    builder.InsertImage(imageUrl, 100, 100);
                 }
                 #endregion
-                    doc.Save(newUrl);
+                doc.Save(newUrl);
                 string fileName = Path.GetFileName(newUrl);
                 FileInfo info = new FileInfo(newUrl);
                 long fileSize = info.Length;
@@ -730,7 +732,8 @@ namespace FineUIPro.Web.CQMS.ProcessControl
             }
         }
 
-        public class WorkBranchList {
+        public class WorkBranchList
+        {
             public string UnitWorkId { get; set; }
             public string Branch { get; set; }
         }
diff --git a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs
index 96c147ae..918d4819 100644
--- a/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/WBS/WorkloadInputEditAll.aspx.cs
@@ -157,7 +157,7 @@ namespace FineUIPro.Web.JDGL.WBS
         {
             Save();
             ShowNotify("保存成功！", MessageBoxIcon.Success);
-            PageContext.RegisterStartupScript(ActiveWindow.GetHideReference());
+            //PageContext.RegisterStartupScript(ActiveWindow.GetHideReference());
         }
 
         private void Save()