diff --git a/DataBase/版本日志/SGGLDB_WH_V2024-09-20-bwj.sql b/DataBase/版本日志/SGGLDB_WH_V2024-12-25-bwj.sql
similarity index 99%
rename from DataBase/版本日志/SGGLDB_WH_V2024-09-20-bwj.sql
rename to DataBase/版本日志/SGGLDB_WH_V2024-12-25-bwj.sql
index f3f3742e..47611461 100644
--- a/DataBase/版本日志/SGGLDB_WH_V2024-09-20-bwj.sql
+++ b/DataBase/版本日志/SGGLDB_WH_V2024-12-25-bwj.sql
@@ -1,4 +1,3 @@
-
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('0E1CCE60-6F9D-419D-B763-E9E0AF5621E6','λֲ̻֡ü','',10,'3B322232-38A1-4291-9832-CD4A01C2A975','Menu_CQMS',0,0,1)
go
diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs
index d0a95b6f..3edb8d1f 100644
--- a/SGGL/BLL/ProjectData/ProjectService.cs
+++ b/SGGL/BLL/ProjectData/ProjectService.cs
@@ -141,6 +141,7 @@
Progress = project.Progress,
ProjType = project.ProjType,
ProjPhase = project.ProjPhase,
+ MasterSysId = project.MasterSysId,
};
db.Base_Project.InsertOnSubmit(newProject);
db.SubmitChanges();
@@ -191,6 +192,7 @@
newProject.Progress = project.Progress;
newProject.ProjType = project.ProjType;
newProject.ProjPhase = project.ProjPhase;
+ newProject.MasterSysId = project.MasterSysId;
db.SubmitChanges();
HSEDataCollectService.ProjectHSEDataCollectSubmission(newProject);
}
@@ -261,14 +263,15 @@
select x).ToList();
return list;
}
- else {
+ else
+ {
var list = (from x in Funs.DB.Base_Project
where pids.Contains(x.ProjectId)
orderby x.ProjectCode descending
select x).ToList();
return list;
}
-
+
}
@@ -327,7 +330,7 @@
/// 获取userId参与项目下拉框
///
///
- public static List GetProjectByUserIdStateDropDownList(string userId, string state,string urlType="")
+ public static List GetProjectByUserIdStateDropDownList(string userId, string state, string urlType = "")
{
if (userId == Const.sysglyId || userId == Const.hfnbdId || userId == Const.sedinId)
{
@@ -345,7 +348,7 @@
if (!string.IsNullOrEmpty(urlType))
{
//五环的能看所有项目，否则只能看项目用户中有自己或者所属单位是自己单位的
- if (getRoleP != null && getUser.UnitId== Const.UnitId_CWCEC)
+ if (getRoleP != null && getUser.UnitId == Const.UnitId_CWCEC)
{
return (from x in Funs.DB.Base_Project
where x.ProjectState == state
@@ -356,12 +359,13 @@
{
return (from x in Funs.DB.Base_Project
join y in Funs.DB.Project_ProjectUser on x.ProjectId equals y.ProjectId
- where ( (y.UserId == userId && y.IsPost == true)|| x.UnitId== getUser.UnitId) && x.ProjectState == state
+ where ((y.UserId == userId && y.IsPost == true) || x.UnitId == getUser.UnitId) && x.ProjectState == state
orderby x.ProjectCode descending
select x).Distinct().ToList();
}
}
- else {
+ else
+ {
if (getRoleP != null)
{
return (from x in Funs.DB.Base_Project
@@ -482,7 +486,7 @@
///
///
///
- public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease,string urlType="")
+ public static void InitProjectShortNameByStateDropDownList(FineUIPro.DropDownList dropName, string userId, string state, bool isShowPlease, string urlType = "")
{
dropName.DataValueField = "ProjectId";
dropName.DataTextField = "ProjectName";
@@ -706,7 +710,8 @@
#region 加载公司级别项目
public static List GetUnEndProjectByUserIdDropDownList(string projectState,
- string projectName = null, string projectCode = null) {
+ string projectName = null, string projectCode = null)
+ {
IQueryable projects = (from x in Funs.DB.Base_Project
where x.ProjectState == projectState
orderby x.ProjectCode descending
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
index 277d6704..b856553a 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_DefectService.cs
@@ -1,12 +1,9 @@
using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
-using NPOI.SS.Formula.Functions;
+using Model;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
-using Model;
namespace BLL
{
diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs
index b9968bd2..454c7c8c 100644
--- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs
@@ -1,11 +1,9 @@
using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
using Model;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
-using System.Text;
namespace BLL
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
index e44e6139..ae969cac 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx
@@ -163,7 +163,7 @@
-
+
@@ -248,7 +248,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -265,7 +265,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -282,7 +282,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -675,7 +675,7 @@
-
+
@@ -861,7 +861,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1856,7 +1856,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1873,7 +1873,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1891,7 +1891,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
index d451cdfa..b380ad97 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportEdit.aspx.cs
@@ -437,6 +437,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 本月质量目标管理情况 Grid1方法
protected void btnAddGrid1_Click(object sender, EventArgs e)
{
+ SaveMethod();
+
Grid1.Hidden = false;
JArray teamGroupData = Grid1.GetMergedData();
@@ -1072,6 +1074,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.2 PQR/WPS报验情况 Grid9方法
protected void btnAddGrid9_Click(object sender, EventArgs e)
{
+ SaveMethod();
Grid9.Hidden = false;
JArray teamGroupData = Grid9.GetMergedData();
@@ -2521,6 +2524,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
///
protected void btnRowMaterialProblem_Click(object sender, EventArgs e)
{
+ SaveMethod();
gvRowMaterialProblem.Hidden = false;
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
@@ -2575,6 +2579,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
///
protected void btnAddConstructionProblems_Click(object sender, EventArgs e)
{
+ SaveMethod();
gvConstructionProblems.Hidden = false;
JArray teamGroupData = gvConstructionProblems.GetMergedData();
@@ -2643,6 +2648,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
///
protected void btnAddNextControl_Click(object sender, EventArgs e)
{
+ SaveMethod();
gvNextQualityControl.Hidden = false;
JArray teamGroupData = gvNextQualityControl.GetMergedData();
@@ -2677,6 +2683,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
+ SaveMethod();
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@@ -2818,6 +2825,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ShowNotify("周期不能为空！", MessageBoxIcon.Warning);
return;
}
+ SaveMethod();
+
+ ShowNotify("编辑成功！", MessageBoxIcon.Success);
+ PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+ }
+
+ private void SaveMethod()
+ {
Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId;
@@ -2923,7 +2938,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
saveConstructionProblems();
//保存19.下月质量控制重点
saveNextQualityControl();
-
//保存23.施工照片
saveImages();
@@ -2939,9 +2953,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
WeekAndMonthReportNewService.Update(report);
}
-
- ShowNotify("编辑成功！", MessageBoxIcon.Success);
- PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#region 保存本月质量目标管理情况
@@ -4006,5 +4017,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#endregion
#endregion
+
+ protected void Text_TextChanged(object sender, EventArgs e)
+ {
+ SaveMethod();
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
index 2aa7e32d..47dd984f 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx
@@ -162,7 +162,7 @@
-
+
@@ -247,7 +247,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -264,7 +264,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -281,7 +281,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -674,7 +674,7 @@
-
+
@@ -860,7 +860,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1855,7 +1855,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1872,7 +1872,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
@@ -1890,7 +1890,7 @@
+ AutoGrowHeight="true" AutoGrowHeightMin="100" AutoGrowHeightMax="600" AutoPostBack="true" OnTextChanged="Text_TextChanged">
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index d97a9800..37905120 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -378,6 +378,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 本月质量目标管理情况 Grid1方法
protected void btnAddGrid1_Click(object sender, EventArgs e)
{
+ SaveMethod();
Grid1.Hidden = false;
JArray teamGroupData = Grid1.GetMergedData();
@@ -1003,6 +1004,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.2 PQR/WPS报验情况 Grid9方法
protected void btnAddGrid9_Click(object sender, EventArgs e)
{
+ SaveMethod();
Grid9.Hidden = false;
JArray teamGroupData = Grid9.GetMergedData();
@@ -2457,6 +2459,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
///
protected void btnRowMaterialProblem_Click(object sender, EventArgs e)
{
+ SaveMethod();
gvRowMaterialProblem.Hidden = false;
JArray teamGroupData = gvRowMaterialProblem.GetMergedData();
@@ -2511,6 +2514,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
///
protected void btnAddConstructionProblems_Click(object sender, EventArgs e)
{
+ SaveMethod();
gvConstructionProblems.Hidden = false;
JArray teamGroupData = gvConstructionProblems.GetMergedData();
@@ -2579,6 +2583,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
///
protected void btnAddNextControl_Click(object sender, EventArgs e)
{
+ SaveMethod();
gvNextQualityControl.Hidden = false;
JArray teamGroupData = gvNextQualityControl.GetMergedData();
@@ -2613,6 +2618,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 23.施工照片
protected void filePhoto_FileSelected(object sender, EventArgs e)
{
+ SaveMethod();
if (filePhoto.HasFile)
{
string fileName = filePhoto.ShortFileName;
@@ -2754,6 +2760,17 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
ShowNotify("周期不能为空！", MessageBoxIcon.Warning);
return;
}
+ SaveMethod();
+ ShowNotify("编辑成功！", MessageBoxIcon.Success);
+ PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+ }
+
+ #region 保存方法
+ ///
+ /// 保存方法
+ ///
+ private void SaveMethod()
+ {
Model.Report_WeekAndMonthReport_New report = new Model.Report_WeekAndMonthReport_New();
report.Id = ReportId;
report.ProjectId = this.CurrUser.LoginProjectId;
@@ -2875,10 +2892,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
WeekAndMonthReportNewService.Update(report);
}
-
- ShowNotify("编辑成功！", MessageBoxIcon.Success);
- PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
+ #endregion
#region 保存本月质量目标管理情况
void saveTarget()
@@ -3939,8 +3954,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
db.Report_TextBoxContent.InsertAllOnSubmit(ImageLists);
db.SubmitChanges();
}
+
#endregion
#endregion
+
+ protected void Text_TextChanged(object sender, EventArgs e)
+ {
+ SaveMethod();
+ }
+
}
}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs
index 3c953f80..8e73c688 100644
--- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs
+++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs
@@ -590,7 +590,7 @@ namespace FineUIPro.Web.SysManage
Model.Sys_Set newSysSet9 = new Model.Sys_Set();
if (!string.IsNullOrEmpty(this.txtSerVerUrl.Text.Trim()))
{
- newSysSet9.SetValue = this.txtSerVerUrl.Text.Trim();
+ newSysSet9.SetValue = this.txtSerVerUrl.Text.Trim();
}
newSysSet9.SetName = "集团接口地址";
Funs.DB.Sys_Set.InsertOnSubmit(newSysSet9);
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 6c177656..dad486f4 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -1,4 +1,4 @@
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
-
+
+
-
-
+
+
@@ -179,24 +179,24 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
index c90f11c5..cefc9ef0 100644
--- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml
@@ -8,9 +8,10 @@
-
+
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
index db103972..7470816f 100644
--- a/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_HSSE.xml
@@ -25,7 +25,6 @@
-
@@ -90,10 +89,13 @@
-
+
+
-
-
+
+
+
+
@@ -119,8 +121,7 @@
-
-
+
diff --git a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
index f12d5412..b34c5503 100644
--- a/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_JDGL.xml
@@ -22,6 +22,4 @@
-
-
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml
index 2b9b3fb8..d3beefd2 100644
--- a/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_PGJSX.xml
@@ -1,9 +1,8 @@
-
+
-
diff --git a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
index 4056ca52..f8b9fc63 100644
--- a/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_TestRun.xml
@@ -46,12 +46,12 @@
-
-
-
-
+
+
+
+
@@ -69,11 +69,9 @@
-
-
@@ -121,8 +119,8 @@
-
-
+
+
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
index 283e3429..3abd6e40 100644
--- a/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_Transfer.xml
@@ -3,17 +3,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
index 53012cf7..d4c4638d 100644
--- a/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
+++ b/SGGL/FineUIPro.Web/common/Menu_ZHGL.xml
@@ -27,8 +27,8 @@
-
-
+
+
@@ -54,7 +54,7 @@
-
+
@@ -85,6 +85,4 @@
-
-
\ No newline at end of file