diff --git a/DataBase/版本日志/SGGLDB_CD_V2023-07-01-001.sql b/DataBase/版本日志/SGGLDB_CD_V2023-07-01-001.sql new file mode 100644 index 00000000..7c454ec9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2023-07-01-001.sql @@ -0,0 +1,17 @@ +delete from Sys_Menu +where MenuId='FDEA9D67-20B7-4D6C-9378-C72F544510D3' +delete from Sys_Menu +where MenuId='0AF190FB-C9EB-4AC2-B17A-DE97A69E4C4E' + +UPDATE TOP(1) [dbo].[Sys_Menu] SET [MenuId]=N'7A8C1B24-D4FB-4716-83A1-6D3245CC2D75', [MenuName]=N'', [Icon]=NULL, [Url]=N'ZHGL/ManagementReport/CQMSCheckDaily.aspx', [SortIndex]='40', [SuperMenu]=N'785DA4ED-03BF-4C27-8424-ED3ABA697429', [MenuType]=N'Menu_ZHGL', [IsOffice]='1', [IsEnd]='1', [IsUsed]='1' WHERE ([MenuId]=N'7A8C1B24-D4FB-4716-83A1-6D3245CC2D75'); + + + + ALTER TABLE dbo.PW_WeldingProcedure ADD + ProjectId nvarchar(50) NULL + + + + ALTER TABLE [dbo].[PW_ProcedureImageManage] ADD + ProjectId nvarchar(50) NULL + \ No newline at end of file diff --git a/SGGL/BLL/HJGL/WeldingManage/ProcedureImageService.cs b/SGGL/BLL/HJGL/WeldingManage/ProcedureImageService.cs index eec22de0..37b8396b 100644 --- a/SGGL/BLL/HJGL/WeldingManage/ProcedureImageService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/ProcedureImageService.cs @@ -35,6 +35,7 @@ namespace BLL newProcedureImage.Thickness = procedureImage.Thickness; newProcedureImage.WeldTypeId = procedureImage.WeldTypeId; newProcedureImage.GrooveTypeId = procedureImage.GrooveTypeId; + newProcedureImage.ProjectId = procedureImage.ProjectId; Funs.DB.PW_ProcedureImageManage.InsertOnSubmit(newProcedureImage); Funs.DB.SubmitChanges(); @@ -53,6 +54,7 @@ namespace BLL newProcedureImage.Thickness = procedureImage.Thickness; newProcedureImage.WeldTypeId = procedureImage.WeldTypeId; newProcedureImage.GrooveTypeId = procedureImage.GrooveTypeId; + newProcedureImage.ProjectId = procedureImage.ProjectId; Funs.DB.SubmitChanges(); } diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldingProcedureService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldingProcedureService.cs index 7bcc9329..46e419f8 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldingProcedureService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldingProcedureService.cs @@ -30,6 +30,7 @@ namespace BLL Model.PW_WeldingProcedure newWeldProcedure = new Model.PW_WeldingProcedure(); newWeldProcedure.WeldingProcedureId = SQLHelper.GetNewID(typeof(Model.PW_WeldingProcedure)); newWeldProcedure.WeldingProcedureCode = weldProcedure.WeldingProcedureCode; + newWeldProcedure.ProjectId = weldProcedure.ProjectId; newWeldProcedure.WType = weldProcedure.WType; newWeldProcedure.Material = weldProcedure.Material; newWeldProcedure.Specification = weldProcedure.Specification; @@ -96,6 +97,7 @@ namespace BLL if (newWeldProcedure != null) { newWeldProcedure.WeldingProcedureCode = weldProcedure.WeldingProcedureCode; + newWeldProcedure.ProjectId = weldProcedure.ProjectId; newWeldProcedure.WType = weldProcedure.WType; newWeldProcedure.Material = weldProcedure.Material; newWeldProcedure.Specification = weldProcedure.Specification; diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx index c450aae9..f64df1f0 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx @@ -18,14 +18,18 @@ - + - + + + + - + diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.cs index b9a40cce..4801979a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.cs @@ -19,10 +19,11 @@ namespace FineUIPro.Web.CQMS.Check { if (!IsPostBack) { - this.txtStartRectificationTime.Text = DateTime.Now.AddDays(-7).ToString("yyyy-MM-dd"); - this.txtEndRectificationTime.Text = DateTime.Now.ToString("yyyy-MM-dd"); + UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true); + + QualityQuestionTypeService.InitQualityQuestionTypeDownList(drpQuestionType, true); } - this.AnalyseData(); + this.AnalyseData(); } #endregion @@ -66,6 +67,10 @@ namespace FineUIPro.Web.CQMS.Check { strSql += " and CheckDate <'" + DateTime.Parse( this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; } + if (drpUnit.SelectedValue != BLL.Const._Null) + { + strSql += " and UnitId='" + drpUnit.SelectedValue + "' "; + } strSql += " group by UnitId,unitName "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); @@ -138,6 +143,15 @@ namespace FineUIPro.Web.CQMS.Check { strSql += " and CheckDate <'" + DateTime.Parse(this.txtEndRectificationTime.Text.Trim()).AddDays(1).ToString("yyyy-MM-dd") + "' "; } + if (drpUnit.SelectedValue != BLL.Const._Null) + { + strSql += " and UnitId='" + drpUnit.SelectedValue + "' "; + } + if (drpQuestionType.SelectedValue != Const._Null) + { + strSql += " AND QuestionType='"+ drpQuestionType.SelectedValue + "' "; + + } strSql += " group by QuestionDef,QuestionTypeStr "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); diff --git a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.designer.cs index 80ba88cb..4b91f885 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/Check/JointCheckChartStatistics.aspx.designer.cs @@ -50,6 +50,24 @@ namespace FineUIPro.Web.CQMS.Check /// protected global::FineUIPro.Form Form2; + /// + /// drpUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnit; + + /// + /// drpQuestionType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpQuestionType; + /// /// txtStartRectificationTime 控件。 /// diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx index 270a35d1..b3106b7b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApproval.aspx @@ -5,7 +5,7 @@ - 超过一定规模的危大施工方案 + 超危大工程施工方案清单
@@ -13,7 +13,7 @@ - - diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx index 4c1a9006..5a7de9e2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx @@ -6,7 +6,7 @@ - 施工组织设计及施工方案 + 施工方案定稿文件