diff --git a/DataBase/版本日志/SGGLDB_WH_2024-05-13-bwj.sql b/DataBase/版本日志/SGGLDB_WH_2024-05-13-bwj.sql
new file mode 100644
index 00000000..429e321b
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-05-13-bwj.sql
@@ -0,0 +1,3 @@
+
+update ProcessControl_InspectionManagement set IsOnceQualified=1
+go
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
index 1a926684..51eb19ad 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingDoc.aspx
@@ -85,7 +85,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
index 588b9c69..eb7cdab0 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
@@ -230,9 +230,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//更新书签内容
Document doc = new Aspose.Words.Document(newUrl);
DocumentBuilder builder = new DocumentBuilder(doc);
-
-
-
+ //builder.CellFormat.VerticalAlignment = CellVerticalAlignment.Center;
+ //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;
#region 头部静态列
//业主单位
var unitsYz = (from x in db.Base_Unit
@@ -344,13 +343,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
row.Cells.Add(CreateCell(item.TargetValue, doc, table.FirstRow.Cells[3].CellFormat.Width));
row.Cells.Add(CreateCell(item.MonthPer, doc, table.FirstRow.Cells[4].CellFormat.Width));
row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[5].CellFormat.Width));
+
table.Rows.Insert(numberIndex, row);
-
+
numberIndex += 1;
}
//自动设置表格样式
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
-
+ //table.Alignment = Aspose.Words.Tables.TableAlignment.Center;
+ //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;
+
#endregion
#region 本月主要工作内容
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index 8459a6b6..67bf69dc 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -103,8 +103,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
CNProfessionals = (from x in db.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
- //&& x.CNProfessionalId != BLL.Const.ComprehensiveId
- orderby x.SortIndex
+ && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
+ orderby x.SortIndex
select new ProfessionalsClass
{
CNProfessionalId=x.CNProfessionalId,
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index 0bbb6454..e9a5d952 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -105,7 +105,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//加载所有专业
CNProfessionals = (from x in db.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
- //&& x.CNProfessionalId != BLL.Const.ComprehensiveId
+ && x.CNProfessionalId != BLL.Const.CNProfessionalHSEId
orderby x.SortIndex
select new ProfessionalsClass
{
@@ -600,17 +600,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int Quantity1Sum = 0;
int Quantity2Sum = 0;
- //加载所有专业
- //var CNProfessionals = from x in db.Base_CNProfessional
- // where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
- // && x.CNProfessionalId != BLL.Const.ComprehensiveId
- // orderby x.SortIndex
- // select new
- // {
- // x.CNProfessionalId,
- // x.ProfessionalName
- // };
-
foreach (var item in CNProfessionals)
{
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs
index 43d89ba3..5c3b48e2 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/CheckManStatistics.aspx.cs
@@ -46,7 +46,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl
///
public void BindGvInspectionManagement()
{
- //List StatisticsList = new List();
+ StatisticsList = new List();
Model.Base_Project project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId);
StartDate = Convert.ToDateTime(project.StartDate);
EndDate = DateTime.Now;
diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs
index 5044cf3c..e290e18e 100644
--- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs
@@ -3,10 +3,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using System.Text;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
namespace FineUIPro.Web.CQMS.ProcessControl
{
diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc
index 97ea9d3e..6cfd48e9 100644
Binary files a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc and b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量周报.doc differ
diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc
index 5bb59508..bb2f0765 100644
Binary files a/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc and b/SGGL/FineUIPro.Web/File/Word/CQMS/项目质量月报.doc differ
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index 63ca13cc..9e91deff 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
true
false
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index bd497c6b..5fe155da 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
- Release|Any CPU
+ Debug|Any CPU
true