diff --git a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs index 3912f254..1d3a589a 100644 --- a/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs +++ b/SGGL/BLL/CQMS/ProcessControl/InspectionManagementService.cs @@ -329,7 +329,7 @@ namespace BLL } public static List getInspectionManagementDetailListByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified) { - List InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail select x).ToList(); + List InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail select x).ToList(); if (!string.IsNullOrEmpty(projectId)) { @@ -397,9 +397,9 @@ namespace BLL } } - public static List getInspectionManagementDetailListByDate(string projectId, DateTime startDate, DateTime SoptDate, bool isOnceQualified) + public static List getInspectionManagementDetailListByDate(string projectId, DateTime startDate, DateTime SoptDate, bool isOnceQualified) { - List InspectionMangementList = (from x in Funs.DB.View_CQMS_InspectionManagementDetail where x.ProjectId == projectId select x).ToList(); + List InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList(); if (isOnceQualified == true) { InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); @@ -410,5 +410,48 @@ namespace BLL } return InspectionMangementList; } + + public static List getInspectionManagementByCNProfessionalIdAndDate(string projectId, string cNProfessionalId, DateTime startDate, DateTime SoptDate, bool isOnceQualified) + { + List InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement select x).ToList(); + + if (!string.IsNullOrEmpty(projectId)) + { + InspectionMangementList = (from x in InspectionMangementList where x.ProjectId == projectId select x).ToList(); + } + if (!string.IsNullOrEmpty(cNProfessionalId) && cNProfessionalId != "0") + { + InspectionMangementList = (from x in InspectionMangementList where x.CNProfessionalId == cNProfessionalId select x).ToList(); + } + if (isOnceQualified == true) + { + InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); + } + if (startDate != null && SoptDate != null) + { + InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList(); + } + + return InspectionMangementList; + } + + public static List getInspectionManagementByUnitIdAndDate(string projectId, string unitId, DateTime startDate, DateTime SoptDate, bool isOnceQualified) + { + List InspectionMangementList = (from x in Funs.DB.ProcessControl_InspectionManagement where x.ProjectId == projectId select x).ToList(); + if (!string.IsNullOrEmpty(unitId) && unitId != "0") + { + InspectionMangementList = (from x in InspectionMangementList where x.UnitId == unitId select x).ToList(); + } + if (isOnceQualified == true) + { + InspectionMangementList = (from x in InspectionMangementList where x.IsOnceQualified == isOnceQualified select x).ToList(); + } + if (startDate != null && SoptDate != null) + { + InspectionMangementList = (from x in InspectionMangementList where x.InspectionDate >= startDate && x.InspectionDate <= SoptDate select x).ToList(); + } + + return InspectionMangementList; + } } } \ No newline at end of file diff --git a/SGGL/BLL/Common/AttachFileService.cs b/SGGL/BLL/Common/AttachFileService.cs index 59070a1e..9a50abef 100644 --- a/SGGL/BLL/Common/AttachFileService.cs +++ b/SGGL/BLL/Common/AttachFileService.cs @@ -1,4 +1,5 @@ -using System; +using FineUIPro; +using System; using System.Collections.Generic; using System.Configuration; using System.Drawing; @@ -87,6 +88,7 @@ namespace BLL { string url = file.AttachUrl.Replace('\\', '/'); fileUrl = BLL.UploadAttachmentService.ShowAttachment2("../../", url); + } } return fileUrl; diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 8187e114..b3970b27 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -3241,6 +3241,16 @@ namespace BLL /// public const string TestRun_TrainRecordsUrl = "File\\Word\\TestRun\\生产人员培训执行情况报告.doc"; + /// + /// 总包质量管理组织机构图 + /// + public const string CQMS_OrganizationalUrl = "File\\Word\\CQMS\\总包质量管理组织机构图.doc"; + + /// + /// 分包质量管理组织机构图 + /// + public const string CQMS_SubOrganizationalUrl = "File\\Word\\CQMS\\分包质量管理组织机构图.doc"; + /// /// 签到表 /// diff --git a/SGGL/BLL/Common/UploadAttachmentService.cs b/SGGL/BLL/Common/UploadAttachmentService.cs index b54c3d31..2068250f 100644 --- a/SGGL/BLL/Common/UploadAttachmentService.cs +++ b/SGGL/BLL/Common/UploadAttachmentService.cs @@ -1,4 +1,5 @@ -using System; +using NPOI.SS.UserModel; +using System; using System.IO; using System.Linq; using System.Web.UI.WebControls; diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index 32f1d91d..685784b1 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -1611,10 +1611,10 @@ namespace BLL } } - public static List GetUserNameListsByWorkPostName(string projectId, string workPostName) - { - return (from x in Funs.DB.View_ProjectUserWorkPost where x.ProjectId == projectId && x.WorkPostName == workPostName select x.UserName).ToList(); - } + //public static List GetUserNameListsByWorkPostName(string projectId, string workPostName) + //{ + // return (from x in Funs.DB.View_ProjectUserWorkPost where x.ProjectId == projectId && x.WorkPostName == workPostName select x.UserName).ToList(); + //} public static List GetUserNameListsByUnitIdWorkPostName(string projectId,string unitId, string workPostName) { diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs index 76a8d003..009d120f 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs @@ -33,7 +33,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// public void BindGrid() { - string strSql = @"SELECT distinct P.InspectionId, + string strSql = @"SELECT P.InspectionId, P.ProjectId, P.UnitId, P.CNProfessionalId, @@ -50,14 +50,13 @@ namespace FineUIPro.Web.CQMS.ProcessControl (CASE WHEN IsOnceQualified='True' THEN '是' ELSE '否' END)AS IsOnceQualified, P.InspectionCode, P.InspectionDate" - + @" FROM ProcessControl_InspectionManagementDetail AS D" - + @" LEFT JOIN ProcessControl_InspectionManagement AS P on P.InspectionId=D.InspectionId" - + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId" - + @" LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId" - + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId" - + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch" - + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType" - + @" WHERE P.ProjectId=@ProjectId "; + + @" FROM ProcessControl_InspectionManagement AS P " + + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId" + + @" LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId" + + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId" + + @" LEFT JOIN WBS_DivisionProject AS DP ON DP.DivisionProjectId = P.Branch" + + @" LEFT JOIN WBS_BreakdownProject AS BP ON BP.BreakdownProjectId = P.ControlPointType" + + @" WHERE P.ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); if (drpUnitWork.SelectedValue != BLL.Const._Null) diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs index cc982a89..d0067319 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementStatistics.aspx.cs @@ -60,21 +60,21 @@ namespace FineUIPro.Web.CQMS.ProcessControl { if (DateTime.Now < NewDate) { - List managementListSunNumber = new List(); - List managementListOneNumber = new List(); + List managementListSunNumber = new List(); + List managementListOneNumber = new List(); if (ZyType == "1") { //统计所给时间段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); //统计所给时间段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } else if (ZyType == "2") { //统计所给时间段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); //统计所给时间段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } else { @@ -99,23 +99,23 @@ namespace FineUIPro.Web.CQMS.ProcessControl } else { - List managementListSunNumber = new List(); - List managementListOneNumber = new List(); + List managementListSunNumber = new List(); + List managementListOneNumber = new List(); NextDate = Convert.ToDateTime(StartDate.Year + "-" + StartDate.Month + "-25"); if (ZyType == "1") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, true); } else if (ZyType == "2") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, true); } else { @@ -141,22 +141,22 @@ namespace FineUIPro.Web.CQMS.ProcessControl { if (DateTime.Now < NewDate) { - List managementListSunNumber = new List(); - List managementListOneNumber = new List(); + List managementListSunNumber = new List(); + List managementListOneNumber = new List(); if (ZyType == "1") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } else if(ZyType=="2") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } else @@ -185,21 +185,21 @@ namespace FineUIPro.Web.CQMS.ProcessControl } else { - List managementListSunNumber = new List(); - List managementListOneNumber = new List(); + List managementListSunNumber = new List(); + List managementListOneNumber = new List(); if (ZyType == "1") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); } else if (ZyType == "2") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); } else { @@ -240,21 +240,21 @@ namespace FineUIPro.Web.CQMS.ProcessControl NewDate = Convert.ToDateTime(NextDate.Year + "-" + NextDate.Month + "-25"); if (DateTime.Now < NewDate) { - List managementListSunNumber = new List(); - List managementListOneNumber = new List(); + List managementListSunNumber = new List(); + List managementListOneNumber = new List(); if (ZyType == "1") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } else if(ZyType=="2") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, DateTime.Now, true); } else @@ -281,20 +281,20 @@ namespace FineUIPro.Web.CQMS.ProcessControl } else { - List managementListSunNumber = new List(); - List managementListOneNumber = new List(); + List managementListSunNumber = new List(); + List managementListOneNumber = new List(); if (ZyType == "1") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); } else if(ZyType=="2") { //统计所给事件段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false); //统计所给事件段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true); } else { @@ -360,22 +360,22 @@ namespace FineUIPro.Web.CQMS.ProcessControl Model.InspectionManagementStatistics Statistics = new Model.InspectionManagementStatistics(); - List managementListSunNumber = new List(); - List managementListOneNumber = new List(); + List managementListSunNumber = new List(); + List managementListOneNumber = new List(); if (ZyType == "1") { //统计所给时间段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, false); //统计所给时间段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, true); } else if(ZyType=="2") { //统计所给时间段的全部数量 - managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, false); + managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, false); //统计所给时间段的合格数量 - managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, true); + managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementByUnitIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, EndDate, true); } else { diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs index 5332603e..f77179e6 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs @@ -36,7 +36,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl /// public void BindGrid() { - string strSql = @"SELECT distinct P.InspectionId, + string strSql = @"SELECT P.InspectionId, P.ProjectId, P.UnitId, P.CNProfessionalId, @@ -50,8 +50,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl BP.Class, P.AcceptanceSite, P.AcceptanceCheckMan" - + @" FROM ProcessControl_InspectionManagementDetail AS D" - + @" LEFT JOIN ProcessControl_InspectionManagement AS P on P.InspectionId=D.InspectionId" + + @" FROM ProcessControl_InspectionManagement AS P" + @" LEFT JOIN Base_Unit AS U ON U.UnitId = P.UnitId" + @" LEFT JOIN Base_CNProfessional C ON C.CNProfessionalId = P.CNProfessionalId" + @" LEFT JOIN WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId = P.UnitWorkId" diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx index dc96cb52..a8a44843 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx @@ -6,202 +6,479 @@ 质量管理组织机构 - + .auto-style92{ + width:1276px; + height:672px; + margin-bottom:0px; + } +
- - - - - - - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
- - - - - - -
- - - -
- - - - -
-
-
+ + +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+    + +
+ + +    + +        + + + +
+    + +     + +        + +           +
+ +   + +     + +       + +       +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + + +     + + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + +       + + +        + + +
+ + + + + + + + + + + + + + +
+ + + + + + +      + + +        + + +
+ + + + + + + + + + + + + + +
+ + +   + +      + +          + +           + +
+ + + + + + + + + + + + + + +
+
+ diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs index 104bf0e9..2897df0c 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.cs @@ -1,3 +1,4 @@ +using Aspose.Words; using BLL; using System; using System.Collections.Generic; @@ -23,46 +24,510 @@ namespace FineUIPro.Web.CQMS.QualityPlanning string projectId = this.CurrUser.LoginProjectId; string unitId = this.CurrUser.UnitId; - this.lblProjectName.Text = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId); - - + this.ContentPanel1.Title = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId); var unit = (from x in Funs.DB.Project_ProjectUnit - join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId - where x.ProjectId == projectId - && x.UnitType == BLL.Const.ProjectUnitType_2 - && x.UnitId == unitId - select y).Count(); - if (unit>0) + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == projectId + //&& x.UnitType == BLL.Const.ProjectUnitType_2 + && x.UnitId == unitId + select x).FirstOrDefault(); + if (unit != null) { - string projectManagerName = string.Empty; - var projectManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理"); - if (projectManager != null) + if (unit.UnitType == BLL.Const.ProjectUnitType_1) { - foreach (var item in projectManager) + this.divSubOrganizational.Visible = false; + this.divOrganizational.Visible = true; + + string projectManagerName = string.Empty; + var projectManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理"); + if (projectManager != null) { - projectManagerName += item + ","; + foreach (var item in projectManager) + { + projectManagerName += item + ","; + } + if (!string.IsNullOrEmpty(projectManagerName)) + { + this.Label1.Text = "项目经理：" + projectManagerName.Substring(0, projectManagerName.LastIndexOf(',')); + } } - if (!string.IsNullOrEmpty(projectManagerName)) + + string sjName = string.Empty; + var sj = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设计经理"); + if (sj != null) { - this.Label1.Text = "项目经理：" + projectManagerName.Substring(0, projectManagerName.LastIndexOf(',')); + foreach (var item in sj) + { + sjName += item + ","; + } + if (!string.IsNullOrEmpty(sjName)) + { + this.Label2.Text = "设计经理：" + sjName.Substring(0, sjName.LastIndexOf(',')); + } } + + string cgName = string.Empty; + var cg = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "采购经理"); + if (cg != null) + { + foreach (var item in cg) + { + cgName += item + ","; + } + if (!string.IsNullOrEmpty(cgName)) + { + this.Label3.Text = "采购经理：" + cgName.Substring(0, cgName.LastIndexOf(',')); + } + } + + string name4 = string.Empty; + var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理"); + if (con != null) + { + foreach (var item in con) + { + name4 += item + ","; + } + if (!string.IsNullOrEmpty(name4)) + { + this.Label4.Text = "施工经理：" + name4.Substring(0, name4.LastIndexOf(',')); + } + } + + string name5 = string.Empty; + var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理"); + if (qa != null) + { + foreach (var item in qa) + { + name5 += item + ","; + } + if (!string.IsNullOrEmpty(name5)) + { + this.Label5.Text = "质量经理：" + name5.Substring(0, name5.LastIndexOf(',')); + } + } + + string name6 = string.Empty; + var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理"); + if (hseManager != null) + { + foreach (var item in hseManager) + { + name6 += item + ","; + } + if (!string.IsNullOrEmpty(name6)) + { + this.Label6.Text = "HSE经理：" + name6.Substring(0, name6.LastIndexOf(',')); + } + } + + string name7 = string.Empty; + var carManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车经理"); + if (carManager != null) + { + foreach (var item in carManager) + { + name7 += item + ","; + } + if (!string.IsNullOrEmpty(name7)) + { + this.Label7.Text = "开车经理：" + name7.Substring(0, name7.LastIndexOf(',')); + } + } + + string warehousemanName = string.Empty; + var warehousemanLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仓库管理员"); + if (warehousemanLists != null) + { + foreach (var item in warehousemanLists) + { + warehousemanName += item + ","; + } + if (!string.IsNullOrEmpty(warehousemanName)) + { + warehousemanName = warehousemanName.Substring(0, warehousemanName.LastIndexOf(',')); + } + } + this.Label8.Text = "仓库管理员：" + warehousemanName; + + string docName = string.Empty; + var doc = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师"); + if (doc != null) + { + foreach (var item in doc) + { + docName += item + ","; + } + if (!string.IsNullOrEmpty(docName)) + { + docName = docName.Substring(0, docName.LastIndexOf(',')); + } + } + this.Label9.Text = "文控工程师：" + docName; + + string hseEngineerName = string.Empty; + var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师"); + if (hseEngineerLists != null) + { + foreach (var item in hseEngineerLists) + { + hseEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(hseEngineerName)) + { + hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(',')); + } + } + this.Label10.Text = "HSE工程师：" + hseEngineerName; + + string carEngineerName = string.Empty; + var carEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车工程师"); + if (carEngineerLists != null) + { + foreach (var item in carEngineerLists) + { + carEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(carEngineerName)) + { + carEngineerName = carEngineerName.Substring(0, carEngineerName.LastIndexOf(',')); + } + } + this.Label11.Text = "开车工程师：" + carEngineerName; + + string CVEngineerName = string.Empty; + var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师"); + if (CVEngineerLists != null) + { + foreach (var item in CVEngineerLists) + { + CVEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(CVEngineerName)) + { + CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(',')); + } + } + this.Label12.Text = "土建工程师：" + CVEngineerName; + + string FEEngineerName = string.Empty; + var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师"); + if (FEEngineerLists != null) + { + foreach (var item in FEEngineerLists) + { + FEEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(FEEngineerName)) + { + FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(',')); + } + } + this.Label13.Text = "设备工程师：" + FEEngineerName; + + string PDEngineerName = string.Empty; + var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师"); + if (PDEngineerLists != null) + { + foreach (var item in PDEngineerLists) + { + PDEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(PDEngineerName)) + { + PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(',')); + } + } + this.Label14.Text = "管道工程师：" + PDEngineerName; + + string EHEngineerName = string.Empty; + var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师"); + if (EHEngineerLists != null) + { + foreach (var item in EHEngineerLists) + { + EHEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(EHEngineerName)) + { + EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(',')); + } + } + this.Label15.Text = "电气工程师：" + EHEngineerName; + + string EAEngineerName = string.Empty; + var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师"); + if (EAEngineerLists != null) + { + foreach (var item in EAEngineerLists) + { + EAEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(EAEngineerName)) + { + EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(',')); + } + } + this.Label16.Text = "仪表工程师：" + EAEngineerName; + } + else if (unit.UnitType == BLL.Const.ProjectUnitType_2) + { + this.divSubOrganizational.Visible = true; + this.divOrganizational.Visible = false; + + string projectManagerName = string.Empty; + var projectManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理"); + if (projectManager != null) + { + foreach (var item in projectManager) + { + projectManagerName += item + ","; + } + if (!string.IsNullOrEmpty(projectManagerName)) + { + projectManagerName = projectManagerName.Substring(0, projectManagerName.LastIndexOf(',')); + } + } + this.Label17.Text = "项目经理：" + projectManagerName; + + string name4 = string.Empty; + var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理"); + if (con != null) + { + foreach (var item in con) + { + name4 += item + ","; + } + if (!string.IsNullOrEmpty(name4)) + { + name4 = name4.Substring(0, name4.LastIndexOf(',')); + } + } + this.Label8.Text = "施工经理：" + name4; + + string name5 = string.Empty; + var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理"); + if (qa != null) + { + foreach (var item in qa) + { + name5 += item + ","; + } + if (!string.IsNullOrEmpty(name5)) + { + name5 = name5.Substring(0, name5.LastIndexOf(',')); + } + } + this.Label9.Text = "质量经理：" + name5; + + string name6 = string.Empty; + var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理"); + if (hseManager != null) + { + foreach (var item in hseManager) + { + name6 += item + ","; + } + if (!string.IsNullOrEmpty(name6)) + { + name6 = name6.Substring(0, name6.LastIndexOf(',')); + } + } + this.Label20.Text = "HSE经理：" + name6; + + string docName = string.Empty; + var doc = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师"); + if (doc != null) + { + foreach (var item in doc) + { + docName += item + ","; + } + if (!string.IsNullOrEmpty(docName)) + { + docName = docName.Substring(0, docName.LastIndexOf(',')); + } + } + this.Label21.Text = "文控工程师：" + docName; + + string hseEngineerName = string.Empty; + var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师"); + if (hseEngineerLists != null) + { + foreach (var item in hseEngineerLists) + { + hseEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(hseEngineerName)) + { + hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(',')); + } + } + this.Label22.Text = "HSE工程师：" + hseEngineerName; + + string CVEngineerName = string.Empty; + var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师"); + if (CVEngineerLists != null) + { + foreach (var item in CVEngineerLists) + { + CVEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(CVEngineerName)) + { + CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(',')); + } + } + this.Label23.Text = "土建工程师：" + CVEngineerName; + + string FEEngineerName = string.Empty; + var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师"); + if (FEEngineerLists != null) + { + foreach (var item in FEEngineerLists) + { + FEEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(FEEngineerName)) + { + FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(',')); + } + } + this.Label24.Text = "设备工程师：" + FEEngineerName; + + string PDEngineerName = string.Empty; + var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师"); + if (PDEngineerLists != null) + { + foreach (var item in PDEngineerLists) + { + PDEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(PDEngineerName)) + { + PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(',')); + } + } + this.Label25.Text = "管道工程师：" + PDEngineerName; + + string EHEngineerName = string.Empty; + var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师"); + if (EHEngineerLists != null) + { + foreach (var item in EHEngineerLists) + { + EHEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(EHEngineerName)) + { + EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(',')); + } + } + this.Label26.Text = "电气工程师：" + EHEngineerName; + + string EAEngineerName = string.Empty; + var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师"); + if (EAEngineerLists != null) + { + foreach (var item in EAEngineerLists) + { + EAEngineerName += item + ","; + } + if (!string.IsNullOrEmpty(EAEngineerName)) + { + EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(',')); + } + } + this.Label27.Text = "仪表工程师：" + EAEngineerName; + } + } + } + } + #endregion + + /// + /// 导出 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + string rootPath = Server.MapPath("~/"); + string initTemplatePath = string.Empty; + string uploadfilepath = string.Empty; + string newUrl = string.Empty; + string filePath = string.Empty; + + string projectId = this.CurrUser.LoginProjectId; + string unitId = this.CurrUser.UnitId; + + var pModel = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == projectId); + + var unit = (from x in Funs.DB.Project_ProjectUnit + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.ProjectId == projectId + //&& x.UnitType == BLL.Const.ProjectUnitType_2 + && x.UnitId == unitId + select x).FirstOrDefault(); + if (unit != null) + { + if (unit.UnitType == BLL.Const.ProjectUnitType_1) + { + initTemplatePath = Const.CQMS_OrganizationalUrl; + uploadfilepath = rootPath + initTemplatePath; + + newUrl = uploadfilepath.Replace("总包质量管理组织机构图", "总包质量管理组织机构图（" + pModel.ShortName + "）"); + //filePath = initTemplatePath.Replace(".doc", trainRecords.TrainRecordsId.Replace("/", "-") + ".pdf"); + if (File.Exists(newUrl)) + { + File.Delete(newUrl); } - string sjName = string.Empty; - var sj = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设计经理"); - if (sj != null) + File.Copy(uploadfilepath, newUrl); + Document doc = new Aspose.Words.Document(uploadfilepath); + + + Bookmark projectName = doc.Range.Bookmarks["ProjectName"]; + if (projectName != null) { - foreach (var item in sj) + projectName.Text = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId); + } + + Bookmark projectManager = doc.Range.Bookmarks["ProjectManager"]; + string pm = string.Empty; + var lists1 = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理"); + if (lists1 != null) + { + foreach (var item in lists1) + { + pm += item + ","; + } + if (!string.IsNullOrEmpty(pm)) + { + pm = pm.Substring(0, pm.LastIndexOf(',')); + } + } + projectManager.Text = "项目经理：" + pm; + + Bookmark sj = doc.Range.Bookmarks["sjManager"]; + string sjName = string.Empty; + var sjLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设计经理"); + if (sjLists != null) + { + foreach (var item in sjLists) { sjName += item + ","; } if (!string.IsNullOrEmpty(sjName)) { - this.Label2.Text = "设计经理：" + sjName.Substring(0, sjName.LastIndexOf(',')); + sjName = sjName.Substring(0, sjName.LastIndexOf(',')); } } + sj.Text = "设计经理：" + sjName; + Bookmark cgManager = doc.Range.Bookmarks["cgManager"]; string cgName = string.Empty; var cg = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "采购经理"); if (cg != null) @@ -73,10 +538,12 @@ namespace FineUIPro.Web.CQMS.QualityPlanning } if (!string.IsNullOrEmpty(cgName)) { - this.Label3.Text = "采购经理：" + cgName.Substring(0, cgName.LastIndexOf(',')); + cgName = cgName.Substring(0, cgName.LastIndexOf(',')); } } + cgManager.Text = "采购经理：" + cgName; + Bookmark sgManager = doc.Range.Bookmarks["sgManager"]; string name4 = string.Empty; var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理"); if (con != null) @@ -87,10 +554,12 @@ namespace FineUIPro.Web.CQMS.QualityPlanning } if (!string.IsNullOrEmpty(name4)) { - this.Label4.Text = "施工经理：" + name4.Substring(0, name4.LastIndexOf(',')); + name4 = name4.Substring(0, name4.LastIndexOf(',')); } } + sgManager.Text = "施工经理：" + name4; + Bookmark qaManager = doc.Range.Bookmarks["qaManager"]; string name5 = string.Empty; var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理"); if (qa != null) @@ -101,10 +570,12 @@ namespace FineUIPro.Web.CQMS.QualityPlanning } if (!string.IsNullOrEmpty(name5)) { - this.Label5.Text = "质量经理：" + name5.Substring(0, name5.LastIndexOf(',')); + name5 = name5.Substring(0, name5.LastIndexOf(',')); } } + qaManager.Text = "质量经理：" + name5; + Bookmark hse = doc.Range.Bookmarks["hseManager"]; string name6 = string.Empty; var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理"); if (hseManager != null) @@ -115,10 +586,12 @@ namespace FineUIPro.Web.CQMS.QualityPlanning } if (!string.IsNullOrEmpty(name6)) { - this.Label6.Text = "HSE经理：" + name6.Substring(0, name6.LastIndexOf(',')); + name6 = name6.Substring(0, name6.LastIndexOf(',')); } } + hse.Text = "HSE经理：" + name6; + Bookmark car = doc.Range.Bookmarks["carManager"]; string name7 = string.Empty; var carManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车经理"); if (carManager != null) @@ -129,10 +602,12 @@ namespace FineUIPro.Web.CQMS.QualityPlanning } if (!string.IsNullOrEmpty(name7)) { - this.Label7.Text = "开车经理：" + name7.Substring(0, name7.LastIndexOf(',')); + name7 = name7.Substring(0, name7.LastIndexOf(',')); } } + car.Text = "开车经理：" + name7; + Bookmark warehouse = doc.Range.Bookmarks["warehouseManager"]; string warehousemanName = string.Empty; var warehousemanLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仓库管理员"); if (warehousemanLists != null) @@ -146,13 +621,14 @@ namespace FineUIPro.Web.CQMS.QualityPlanning warehousemanName = warehousemanName.Substring(0, warehousemanName.LastIndexOf(',')); } } - this.Label8.Text = "仓库管理员：" + warehousemanName; + warehouse.Text = "仓库管理员：" + warehousemanName; + Bookmark docManager = doc.Range.Bookmarks["docManager"]; string docName = string.Empty; - var doc = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师"); - if (doc != null) + var docm = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师"); + if (docm != null) { - foreach (var item in doc) + foreach (var item in docm) { docName += item + ","; } @@ -161,8 +637,9 @@ namespace FineUIPro.Web.CQMS.QualityPlanning docName = docName.Substring(0, docName.LastIndexOf(',')); } } - this.Label9.Text = "文控工程师：" + docName; + docManager.Text = "文控工程师：" + docName; + Bookmark hseEngineer = doc.Range.Bookmarks["hseEngineer"]; string hseEngineerName = string.Empty; var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师"); if (hseEngineerLists != null) @@ -176,8 +653,9 @@ namespace FineUIPro.Web.CQMS.QualityPlanning hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(',')); } } - this.Label10.Text = "HSE工程师：" + hseEngineerName; + hseEngineer.Text = "HSE工程师：" + hseEngineerName; + Bookmark carEngineer = doc.Range.Bookmarks["carEngineer"]; string carEngineerName = string.Empty; var carEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "开车工程师"); if (carEngineerLists != null) @@ -191,8 +669,9 @@ namespace FineUIPro.Web.CQMS.QualityPlanning carEngineerName = carEngineerName.Substring(0, carEngineerName.LastIndexOf(',')); } } - this.Label11.Text = "开车工程师：" + carEngineerName; + carEngineer.Text = "开车工程师：" + carEngineerName; + Bookmark CVEngineer = doc.Range.Bookmarks["CVEngineer"]; string CVEngineerName = string.Empty; var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师"); if (CVEngineerLists != null) @@ -206,8 +685,9 @@ namespace FineUIPro.Web.CQMS.QualityPlanning CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(',')); } } - this.Label12.Text = "土建工程师：" + CVEngineerName; + CVEngineer.Text = "土建工程师：" + CVEngineerName; + Bookmark FEEngineer = doc.Range.Bookmarks["FEEngineer"]; string FEEngineerName = string.Empty; var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师"); if (FEEngineerLists != null) @@ -221,8 +701,9 @@ namespace FineUIPro.Web.CQMS.QualityPlanning FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(',')); } } - this.Label13.Text = "设备工程师：" + FEEngineerName; + FEEngineer.Text = "设备工程师：" + FEEngineerName; + Bookmark PDEngineer = doc.Range.Bookmarks["PDEngineer"]; string PDEngineerName = string.Empty; var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师"); if (PDEngineerLists != null) @@ -236,8 +717,9 @@ namespace FineUIPro.Web.CQMS.QualityPlanning PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(',')); } } - this.Label14.Text = "管道工程师：" + PDEngineerName; + PDEngineer.Text = "管道工程师：" + PDEngineerName; + Bookmark EHEngineer = doc.Range.Bookmarks["EHEngineer"]; string EHEngineerName = string.Empty; var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师"); if (EHEngineerLists != null) @@ -251,8 +733,9 @@ namespace FineUIPro.Web.CQMS.QualityPlanning EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(',')); } } - this.Label15.Text = "电气工程师：" + EHEngineerName; + EHEngineer.Text = "电气工程师：" + EHEngineerName; + Bookmark EAEngineer = doc.Range.Bookmarks["EAEngineer"]; string EAEngineerName = string.Empty; var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师"); if (EAEngineerLists != null) @@ -266,54 +749,50 @@ namespace FineUIPro.Web.CQMS.QualityPlanning EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(',')); } } - this.Label16.Text = "仪表工程师：" + EAEngineerName; + EAEngineer.Text = "仪表工程师：" + EAEngineerName; + + doc.Save(newUrl); } - else + else if(unit.UnitType == BLL.Const.ProjectUnitType_2) { - string projectManagerName = string.Empty; - var projectManager = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "项目经理"); - if (projectManager != null) + initTemplatePath = Const.CQMS_SubOrganizationalUrl; + uploadfilepath = rootPath + initTemplatePath; + + newUrl = uploadfilepath.Replace("分包质量管理组织机构图", "分包质量管理组织机构图（" + pModel.ShortName + "）"); + //filePath = initTemplatePath.Replace(".doc", trainRecords.TrainRecordsId.Replace("/", "-") + ".pdf"); + if (File.Exists(newUrl)) { - foreach (var item in projectManager) - { - projectManagerName += item + ","; - } - if (!string.IsNullOrEmpty(projectManagerName)) - { - this.Label1.Text = "项目经理：" + projectManagerName.Substring(0, projectManagerName.LastIndexOf(',')); - } + File.Delete(newUrl); } - string sjName = string.Empty; - var sj = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "设计经理"); - if (sj != null) + File.Copy(uploadfilepath, newUrl); + Document doc = new Aspose.Words.Document(uploadfilepath); + + Bookmark projectName = doc.Range.Bookmarks["ProjectName"]; + if (projectName != null) { - foreach (var item in sj) - { - sjName += item + ","; - } - if (!string.IsNullOrEmpty(sjName)) - { - this.Label2.Text = "设计经理：" + sjName.Substring(0, sjName.LastIndexOf(',')); - } + projectName.Text = "项目名称：" + BLL.ProjectService.GetProjectNameByProjectId(projectId); } - string cgName = string.Empty; - var cg = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "采购经理"); - if (cg != null) + Bookmark projectManager = doc.Range.Bookmarks["ProjectManager"]; + string pm = string.Empty; + var lists1 = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "项目经理"); + if (lists1 != null) { - foreach (var item in cg) + foreach (var item in lists1) { - cgName += item + ","; + pm += item + ","; } - if (!string.IsNullOrEmpty(cgName)) + if (!string.IsNullOrEmpty(pm)) { - this.Label3.Text = "采购经理：" + cgName.Substring(0, cgName.LastIndexOf(',')); + pm = pm.Substring(0, pm.LastIndexOf(',')); } } + projectManager.Text = "项目经理：" + pm; + Bookmark sgManager = doc.Range.Bookmarks["sgManager"]; string name4 = string.Empty; - var con = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "施工经理"); + var con = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "施工经理"); if (con != null) { foreach (var item in con) @@ -322,12 +801,14 @@ namespace FineUIPro.Web.CQMS.QualityPlanning } if (!string.IsNullOrEmpty(name4)) { - this.Label4.Text = "施工经理：" + name4.Substring(0, name4.LastIndexOf(',')); + name4 = name4.Substring(0, name4.LastIndexOf(',')); } } + sgManager.Text = "施工经理：" + name4; + Bookmark qaManager = doc.Range.Bookmarks["qaManager"]; string name5 = string.Empty; - var qa = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "质量经理"); + var qa = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "质量经理"); if (qa != null) { foreach (var item in qa) @@ -336,12 +817,14 @@ namespace FineUIPro.Web.CQMS.QualityPlanning } if (!string.IsNullOrEmpty(name5)) { - this.Label5.Text = "质量经理：" + name5.Substring(0, name5.LastIndexOf(',')); + name5 = name5.Substring(0, name5.LastIndexOf(',')); } } + qaManager.Text = "质量经理：" + name5; + Bookmark hse = doc.Range.Bookmarks["hseManager"]; string name6 = string.Empty; - var hseManager = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "HSE经理"); + var hseManager = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE经理"); if (hseManager != null) { foreach (var item in hseManager) @@ -350,44 +833,17 @@ namespace FineUIPro.Web.CQMS.QualityPlanning } if (!string.IsNullOrEmpty(name6)) { - this.Label6.Text = "HSE经理：" + name6.Substring(0, name6.LastIndexOf(',')); + name6 = name6.Substring(0, name6.LastIndexOf(',')); } } + hse.Text = "HSE经理：" + name6; - string name7 = string.Empty; - var carManager = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "开车经理"); - if (carManager != null) - { - foreach (var item in carManager) - { - name7 += item + ","; - } - if (!string.IsNullOrEmpty(name7)) - { - this.Label7.Text = "开车经理：" + name7.Substring(0, name7.LastIndexOf(',')); - } - } - - string warehousemanName = string.Empty; - var warehousemanLists = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "仓库管理员"); - if (warehousemanLists != null) - { - foreach (var item in warehousemanLists) - { - warehousemanName += item + ","; - } - if (!string.IsNullOrEmpty(warehousemanName)) - { - warehousemanName = warehousemanName.Substring(0, warehousemanName.LastIndexOf(',')); - } - } - this.Label8.Text = "仓库管理员：" + warehousemanName; - + Bookmark docManager = doc.Range.Bookmarks["docManager"]; string docName = string.Empty; - var doc = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "文控工程师"); - if (doc != null) + var docm = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "文控工程师"); + if (docm != null) { - foreach (var item in doc) + foreach (var item in docm) { docName += item + ","; } @@ -396,10 +852,11 @@ namespace FineUIPro.Web.CQMS.QualityPlanning docName = docName.Substring(0, docName.LastIndexOf(',')); } } - this.Label9.Text = "文控工程师：" + docName; + docManager.Text = "文控工程师：" + docName; + Bookmark hseEngineer = doc.Range.Bookmarks["hseEngineer"]; string hseEngineerName = string.Empty; - var hseEngineerLists = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "HSE工程师"); + var hseEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "HSE工程师"); if (hseEngineerLists != null) { foreach (var item in hseEngineerLists) @@ -411,25 +868,11 @@ namespace FineUIPro.Web.CQMS.QualityPlanning hseEngineerName = hseEngineerName.Substring(0, hseEngineerName.LastIndexOf(',')); } } - this.Label10.Text = "HSE工程师：" + hseEngineerName; - - string carEngineerName = string.Empty; - var carEngineerLists = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "开车工程师"); - if (carEngineerLists != null) - { - foreach (var item in carEngineerLists) - { - carEngineerName += item + ","; - } - if (!string.IsNullOrEmpty(carEngineerName)) - { - carEngineerName = carEngineerName.Substring(0, carEngineerName.LastIndexOf(',')); - } - } - this.Label11.Text = "开车工程师：" + carEngineerName; + hseEngineer.Text = "HSE工程师：" + hseEngineerName; + Bookmark CVEngineer = doc.Range.Bookmarks["CVEngineer"]; string CVEngineerName = string.Empty; - var CVEngineerLists = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "土建工程师"); + var CVEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "土建工程师"); if (CVEngineerLists != null) { foreach (var item in CVEngineerLists) @@ -441,10 +884,11 @@ namespace FineUIPro.Web.CQMS.QualityPlanning CVEngineerName = CVEngineerName.Substring(0, CVEngineerName.LastIndexOf(',')); } } - this.Label12.Text = "土建工程师：" + CVEngineerName; + CVEngineer.Text = "土建工程师：" + CVEngineerName; + Bookmark FEEngineer = doc.Range.Bookmarks["FEEngineer"]; string FEEngineerName = string.Empty; - var FEEngineerLists = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "设备工程师"); + var FEEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "设备工程师"); if (FEEngineerLists != null) { foreach (var item in FEEngineerLists) @@ -456,10 +900,11 @@ namespace FineUIPro.Web.CQMS.QualityPlanning FEEngineerName = FEEngineerName.Substring(0, FEEngineerName.LastIndexOf(',')); } } - this.Label13.Text = "设备工程师：" + FEEngineerName; + FEEngineer.Text = "设备工程师：" + FEEngineerName; + Bookmark PDEngineer = doc.Range.Bookmarks["PDEngineer"]; string PDEngineerName = string.Empty; - var PDEngineerLists = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "管道工程师"); + var PDEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "管道工程师"); if (PDEngineerLists != null) { foreach (var item in PDEngineerLists) @@ -471,10 +916,11 @@ namespace FineUIPro.Web.CQMS.QualityPlanning PDEngineerName = PDEngineerName.Substring(0, PDEngineerName.LastIndexOf(',')); } } - this.Label14.Text = "管道工程师：" + PDEngineerName; + PDEngineer.Text = "管道工程师：" + PDEngineerName; + Bookmark EHEngineer = doc.Range.Bookmarks["EHEngineer"]; string EHEngineerName = string.Empty; - var EHEngineerLists = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "电气工程师"); + var EHEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "电气工程师"); if (EHEngineerLists != null) { foreach (var item in EHEngineerLists) @@ -486,10 +932,11 @@ namespace FineUIPro.Web.CQMS.QualityPlanning EHEngineerName = EHEngineerName.Substring(0, EHEngineerName.LastIndexOf(',')); } } - this.Label15.Text = "电气工程师：" + EHEngineerName; + EHEngineer.Text = "电气工程师：" + EHEngineerName; + Bookmark EAEngineer = doc.Range.Bookmarks["EAEngineer"]; string EAEngineerName = string.Empty; - var EAEngineerLists = BLL.UserService.GetUserNameListsByWorkPostName(projectId, "仪表工程师"); + var EAEngineerLists = BLL.UserService.GetUserNameListsByUnitIdWorkPostName(projectId, unitId, "仪表工程师"); if (EAEngineerLists != null) { foreach (var item in EAEngineerLists) @@ -501,10 +948,23 @@ namespace FineUIPro.Web.CQMS.QualityPlanning EAEngineerName = EAEngineerName.Substring(0, EAEngineerName.LastIndexOf(',')); } } - this.Label16.Text = "仪表工程师：" + EAEngineerName; + EAEngineer.Text = "仪表工程师：" + EAEngineerName; + + doc.Save(newUrl); } - } + } + + string fileName = Path.GetFileName(newUrl); + FileInfo info = new FileInfo(newUrl); + long fileSize = info.Length; + Response.Clear(); + Response.ContentType = "application/x-zip-compressed"; + Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + Response.AddHeader("Content-Length", fileSize.ToString()); + Response.TransmitFile(newUrl, 0, fileSize); + Response.Flush(); + Response.Close(); + File.Delete(newUrl); } - #endregion } -} \ No newline at end of file +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs index 41fd0ac4..f1b9ba02 100644 --- a/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/CQMS/QualityPlanning/Organizational.aspx.designer.cs @@ -22,13 +22,40 @@ namespace FineUIPro.Web.CQMS.QualityPlanning { protected global::System.Web.UI.HtmlControls.HtmlForm form1; /// - /// lblProjectName 控件。 + /// PageManager1 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::System.Web.UI.WebControls.Label lblProjectName; + protected global::FineUIPro.PageManager PageManager1; + + /// + /// ContentPanel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ContentPanel ContentPanel1; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// divOrganizational 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divOrganizational; /// /// Label1 控件。 @@ -173,5 +200,113 @@ namespace FineUIPro.Web.CQMS.QualityPlanning { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label16; + + /// + /// divSubOrganizational 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divSubOrganizational; + + /// + /// Label17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label17; + + /// + /// Label18 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label18; + + /// + /// Label19 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label19; + + /// + /// Label20 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label20; + + /// + /// Label21 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label21; + + /// + /// Label22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label22; + + /// + /// Label23 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label23; + + /// + /// Label24 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label24; + + /// + /// Label25 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label25; + + /// + /// Label26 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label26; + + /// + /// Label27 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label27; } } diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..34442b9e 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,378 @@ + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000),@InspectionDate datetime)SELECT disti' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:32:58 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:32:58 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, + ' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:33:03 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:33:03 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, + ' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:33:04 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:33:04 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, + ' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:33:05 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:33:05 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, + ' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:33:05 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:33:05 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, + ' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:33:05 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:33:05 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, + ' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:33:05 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:33:05 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, + ' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:33:05 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:33:05 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000))SELECT distinct P.InspectionId, + ' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:33:06 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:33:06 + + +错误信息开始=====> +错误类型:SqlException +错误信息:参数化查询 '(@ProjectId nvarchar(4000),@CNProfessionalId nvarchar(36))SELECT' 需要参数 '@ProjectId'，但未提供该参数。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunText(String strSql, SqlParameter[] parameters) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\SQLHelper.cs:行号 311 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.BindGrid() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 84 + 在 FineUIPro.Web.CQMS.ProcessControl.InspectionManagement.btnSearch_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\CQMS\ProcessControl\InspectionManagement.aspx.cs:行号 136 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:06/04/2024 15:38:02 +出错文件:http://localhost:8579/CQMS/ProcessControl/InspectionManagement.aspx +IP地址:::1 +操作人员:JT + +出错时间:06/04/2024 15:38:02 + diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/分包质量管理组织机构图.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/分包质量管理组织机构图.doc new file mode 100644 index 00000000..12c8948e --- /dev/null +++ b/SGGL/FineUIPro.Web/File/Word/CQMS/分包质量管理组织机构图.doc @@ -0,0 +1,223 @@ +ࡱ> E + F !"#$%&'()*+,-./0123456789:;<=>?@ABCDJGHIKLRoot Entry FA;/@SummaryInformation(DocumentSummaryInformation8WordDocument< +  +Oh+'0 +  $Sg Normal.dotmWendy1@@kBO@ZEE*@:/  =WPS Office_12.1.0.16929_F1E327BC-269C-435d-A152-05C5408002CA +՜.+,D՜.+,HPX`h pxC 0t|KSOProductBuildVerICV2052-12.1.0.16929$23D5360DDD164FE580F62FF39A29F751_130TablerData +WpsCustomData0 PH +KSKS<ubb  8bvpqd r4rC $h:l# +an<Arp|g p          (ϑ{t~~:ggV EPC-PLA-CSP-A05-A01-C rtvxz|~UUUUUCJUCJUCJUCJUCJUCJU o(nHtHUUCJUCJUCJUUUUCJUCJUCJUUUPJo(mH sH nHtHo(3    + + + + + + + + + + + +" +$ +& +( +* +, +. +0 +2 +4 +6 +8 +: +< +> +@ +B +F +H +o(mH sH nHtHo(mH sH nHtHo(mH sH nHtHo(mH sH nHtHaJaJaJaJaJo( OJPJQJOJPJQJo( OJPJQJ CJaJ5CJo(aJ5CJo(aJ5mH sH nHtH%&<66666666 0@P`p6666 0@P`p 0@P`p 0@P`p 0@P`p 0@P`p 0@P`pZ@Zcke a$$1$0CJOJPJQJ^JaJKHmH sH nHtH_H$A@$؞k=W[SONi@Nnfhu?a^i56%[!Q({@,.9;NXHNTn τ(Ussw/G|]wmq0馜Ws,9С!?:geӑ Mh~PKN@-N 8drs/e2oDoc.xmlSˎ0#4i5HPXKۤ? {kcN.¹9zq=jEviMMamjJBdaQӽzbpުFxմUEx/4 fkfSgص*feyY 7[.BIB۶[-Ljz/vCD&Ce*٬Ry;Ɏ$q L2j>#m7t''c2"NX dcQ5MCfES2Z4(טLsP DJ8nFФpc=ʶu^v=,ͅp4Tvc3Ã_PK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  ~[Content_Types].xmlPK +N@`_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@%C "drs/downrev.xmlPKN@-N 8 'drs/e2oDoc.xmlPKY  + + b((?e,gFh 13#"PK +N@drs/PKN@gӾ +drs/downrev.xmlMN0HH\6 qz@^xDiy{wf4;_x'FbHt@ vhx@d5|cuu}U†3mpܦFp hhS )cݢ7qz$a&94əRKMG5=>XnO^CxuG5h}{3U ^_~tx!F4$62F@+,dUPKN@: +8drs/e2oDoc.xmlS͎0#4,6jrA$'ۤ/o wϱcC=f&;@9ЋYI e~~ + Kez I,ԃohx/ Ңu"ٍ.|U .x!tm\95Ɖ5H"@9۶<~n[b1MZ]`W;''5,=QXdd_TFqƝ)B"XEDykADG?N%%ï? @q7q|Fߝ6NJQI^9FӥjDGeuUMq3$ ؾ*}8A )8Zi7ۼӁz##dhcp~[4G v9ޣ߿Sb+@fH0VeV/xo{2[|^4%cDK|Ȕ>iMHV7#$s۶Au=J8PY}Ϥ~y PK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  {[Content_Types].xmlPK +N@]_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@gӾ + "drs/downrev.xmlPKN@: +8 'drs/e2oDoc.xmlPKY ~B +@ B()vcޏc&{ 27#"PK +N@drs/PKN@c +drs/downrev.xmlMN0DHHܨ*mB !Qg'&:ݴ=8qgFo;1@Sz{Yɐ5.j0 'ziZ%sKiȥMY;ћJ;{'J7= xa?z wM[[_WڂHxNagt(GQ8 嚷$6 8+,d Ȳ'PKN@ _drs/e2oDoc.xmlSK1#q{IK3V:0@ 8@şnKv%;Xdmf8ew&& za]W^?/FQ9dJqe~p%1堝-=HO,߈Ns }Jza N xэ\>8&b՘GpR1rlkM#jR.˴R +IE"4`k\@bq2,6=A Q,d0gHQY̦y߃ JI`:[Z?Ă?~~~7ik]9e0Dj_ +ȋȇb^y]FCL3$-fMLKKdhzQ04DەioF ZenWYn؏u%5:_ZNP#)SJS 98~Au=*1+S {l6ڟNPK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  m[Content_Types].xmlPK +N@O_rels/PKN@f<  s_rels/.relsPK +N@drs/PKN@c + "drs/downrev.xmlPKN@ _ %drs/e2oDoc.xmlPKY + + b((?e,gFh 28#"#PK +N@drs/PKN@ͱw drs/downrev.xmlM=O0w$uH, % !N$l XD`i8l6# ˅:=P'"#Y*6v,P>Ʊ<=ZnDJVk) sJz5C`%3l>|oU1=}{)//XSaO$;H(,Ḱ̀dm_PKN@8drs/e2oDoc.xmlSKn0k)N$n@$%ڒ/ޠn|)ljBr߼oVPbRR"-wBٶ?\SY; vռi!A Uk諢I`⼴l\0,2GviY+zK]Iz` Q\.ifKNyi$_d$Xi_u9|A;G“ S/=R-Ydd3*xp8c!|]Ǽ̵/o(Q)2o'=4P!#2݀cs`?VD0!]\%8^ήgx8Ol_vm?Ct8Ji]Ёlzl:C xl;9Q*arK– Q@N%2䨓L|ĝG->/)(_c222AwڢEc+R4)\;öm|Pme8T0ib3Ã_PK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  [Content_Types].xmlPK +N@b_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@ͱw  "drs/downrev.xmlPKN@8 'drs/e2oDoc.xmlPKY  + + b((?e,gFh 14#"PK +N@drs/PKN@4 +drs/downrev.xmlMN0DHH\ۆ& qz@ +oxl7-rΌfTĄ!4g +RmODLC+m0G.w\(:3]4j?U>=|//DS />CL; Š&[FiMHV7#$s۶Au=J8PY}Ϥ~y PK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  {[Content_Types].xmlPK +N@]_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@4 + "drs/downrev.xmlPKN@N +8 'drs/e2oDoc.xmlPKY  + + b((?e,gFh 29#" PK +N@drs/PKN@r drs/downrev.xmlM=O0w$uH,IKڄ8@AAeuc7vNݫ{~듳l2!%d3`je= ?&ºU̴I#Ч4VǶ7Nř oSdH\;5 %j4i6'ax>u{[=dNs} u,iwJ u&rQfvt-xS#_PKN@X% 8drs/e2oDoc.xmlSM0#q{^IP҃X~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  }[Content_Types].xmlPK +N@__rels/PKN@f<  _rels/.relsPK +N@drs/PKN@r  "drs/downrev.xmlPKN@X% 8 (drs/e2oDoc.xmlPKY  + + b((?e,gFh 10#"PK +N@drs/PKN@ʻ drs/downrev.xmlMN0DHH\6 qz@\xD`i{giv\_a90`H5v9ie JUhwwa)B$1nѪ0q=R[ ^S5<b(}hUO-_ۓ?m׋YŻG`/~Utp'ҁE'VB&fF"˖ry*/PKN@fb 8drs/e2oDoc.xmlS͎0#4@\ -~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  {[Content_Types].xmlPK +N@]_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@ʻ  "drs/downrev.xmlPKN@fb 8 (drs/e2oDoc.xmlPKY  + + D ((e,gFh 28#"#PK +N@drs/PKN@ͱw drs/downrev.xmlM=O0w$uH, % !N$l XD`i8l6# ˅:=P'"#Y*6v,P>Ʊ<=ZnDJVk) sJz5C`%3l>|oU1=}{)//XSaO$;H(,Ḱ̀dm_PKN@8drs/e2oDoc.xmlSKn0k)N$n@$%ڒ/ޠn|)ljBr߼oVPbRR"-wBٶ?\SY; vռi!A Uk諢I`⼴l\0,2GviY+zK]Iz` Q\.ifKNyi$_d$Xi_u9|A;G“ S/=R-Ydd3*xp8c!|]Ǽ̵/o(Q)2o'=4P!#2݀cs`?VD0!]\%8^ήgx8Ol_vm?Ct8Ji]Ёlzl:C xl;9Q*arK– Q@N%2䨓L|ĝG->/)(_c222AwڢEc+R4)\;öm|Pme8T0ib3Ã_PK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  [Content_Types].xmlPK +N@b_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@ͱw  "drs/downrev.xmlPKN@8 'drs/e2oDoc.xmlPKY  \B +  +S *() v~ 32" +\B +! +S *() v~ 33"\B +"@ +S *() v~ 34"\B +# +S *() v~ 35"\B +$ +S *() v~ 36" \B +& +S *() v~ 38"\B +' +S *() v~ 39" +( + D ((e,gFh 28#"#PK +N@drs/PKN@ͱw drs/downrev.xmlM=O0w$uH, % !N$l XD`i8l6# ˅:=P'"#Y*6v,P>Ʊ<=ZnDJVk) sJz5C`%3l>|oU1=}{)//XSaO$;H(,Ḱ̀dm_PKN@8drs/e2oDoc.xmlSKn0k)N$n@$%ڒ/ޠn|)ljBr߼oVPbRR"-wBٶ?\SY; vռi!A Uk諢I`⼴l\0,2GviY+zK]Iz` Q\.ifKNyi$_d$Xi_u9|A;G“ S/=R-Ydd3*xp8c!|]Ǽ̵/o(Q)2o'=4P!#2݀cs`?VD0!]\%8^ήgx8Ol_vm?Ct8Ji]Ёlzl:C xl;9Q*arK– Q@N%2䨓L|ĝG->/)(_c222AwڢEc+R4)\;öm|Pme8T0ib3Ã_PK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  [Content_Types].xmlPK +N@b_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@ͱw  "drs/downrev.xmlPKN@8 'drs/e2oDoc.xmlPKY   +) + D +((e,gFh 28#"#PK +N@drs/PKN@ͱw drs/downrev.xmlM=O0w$uH, % !N$l XD`i8l6# ˅:=P'"#Y*6v,P>Ʊ<=ZnDJVk) sJz5C`%3l>|oU1=}{)//XSaO$;H(,Ḱ̀dm_PKN@8drs/e2oDoc.xmlSKn0k)N$n@$%ڒ/ޠn|)ljBr߼oVPbRR"-wBٶ?\SY; vռi!A Uk諢I`⼴l\0,2GviY+zK]Iz` Q\.ifKNyi$_d$Xi_u9|A;G“ S/=R-Ydd3*xp8c!|]Ǽ̵/o(Q)2o'=4P!#2݀cs`?VD0!]\%8^ήgx8Ol_vm?Ct8Ji]Ёlzl:C xl;9Q*arK– Q@N%2䨓L|ĝG->/)(_c222AwڢEc+R4)\;öm|Pme8T0ib3Ã_PK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  [Content_Types].xmlPK +N@b_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@ͱw  "drs/downrev.xmlPKN@8 'drs/e2oDoc.xmlPKY  + +* + D((e,gFh 28#"#PK +N@drs/PKN@ͱw drs/downrev.xmlM=O0w$uH, % !N$l XD`i8l6# ˅:=P'"#Y*6v,P>Ʊ<=ZnDJVk) sJz5C`%3l>|oU1=}{)//XSaO$;H(,Ḱ̀dm_PKN@8drs/e2oDoc.xmlSKn0k)N$n@$%ڒ/ޠn|)ljBr߼oVPbRR"-wBٶ?\SY; vռi!A Uk諢I`⼴l\0,2GviY+zK]Iz` Q\.ifKNyi$_d$Xi_u9|A;G“ S/=R-Ydd3*xp8c!|]Ǽ̵/o(Q)2o'=4P!#2݀cs`?VD0!]\%8^ήgx8Ol_vm?Ct8Ji]Ёlzl:C xl;9Q*arK– Q@N%2䨓L|ĝG->/)(_c222AwڢEc+R4)\;öm|Pme8T0ib3Ã_PK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  [Content_Types].xmlPK +N@b_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@ͱw  "drs/downrev.xmlPKN@8 'drs/e2oDoc.xmlPKY  ++ + D((e,gFh 28#"#PK +N@drs/PKN@ͱw drs/downrev.xmlM=O0w$uH, % !N$l XD`i8l6# ˅:=P'"#Y*6v,P>Ʊ<=ZnDJVk) sJz5C`%3l>|oU1=}{)//XSaO$;H(,Ḱ̀dm_PKN@8drs/e2oDoc.xmlSKn0k)N$n@$%ڒ/ޠn|)ljBr߼oVPbRR"-wBٶ?\SY; vռi!A Uk諢I`⼴l\0,2GviY+zK]Iz` Q\.ifKNyi$_d$Xi_u9|A;G“ S/=R-Ydd3*xp8c!|]Ǽ̵/o(Q)2o'=4P!#2݀cs`?VD0!]\%8^ήgx8Ol_vm?Ct8Ji]Ёlzl:C xl;9Q*arK– Q@N%2䨓L|ĝG->/)(_c222AwڢEc+R4)\;öm|Pme8T0ib3Ã_PK +N@_rels/PKN@f< _rels/.relsj0 }qN/k؊c[F2e~"Kl`0;1 (6{PF783.#c(Y ̵W͘tT0Dlm#]ڀzgͿ0n .):&viUe6F,jY~}_G>~WoPKN@~ [Content_Types].xmlAN0EH%N@%邴K@`dOdlyLhoDX3'AL:*/@X*eRp208J妾)G,R}Q)=HiҺ0BL):T뢸WQDY;d]6O&8* VCLj"󃒝 yJ.;[wIC_ :{IOA +!>Ø4 Swl9rj̛Mt֎k8풺toPKN@~  [Content_Types].xmlPK +N@b_rels/PKN@f<  _rels/.relsPK +N@drs/PKN@ͱw  "drs/downrev.xmlPKN@8 'drs/e2oDoc.xmlPKY \B +,@ +S *() v~ 44"\B +-@ +S *() v~ 45"\B +.@ +S *() v~ 46"\B +/@ +S *() v~ 47"\B +0@ +S *() v~ 48" * +3 ? <?ABCFGHLMNPQXYZ[\]`abcd$sKtPPst#(!(<t"q | 1t!| ,(t#,t tW(t& f t$'(x((at _q`Zt#%-t0t0Y.Z.t/##t.wx,tvx|~ Ca$$H]H + + + + + + + + + + + + +" +a$$a$$a$$a$$a$$ 9r a$$ 9r &dP 9r a$$ 9r &dPa$$ , ," +$ +& +( +* +, +. +0 +2 +4 +6 +8 +: +< +> +@ +B +D +F +H +:A .!#"$%S2P0p180t-abt'Yh.t,t+7*34t*R((tc-t) t(<(t + $+*)( +  + ProjectNameProjectManager +hseManager sgManager qaManager hseEngineer +docManager +EAEngineer +EHEngineer +PDEngineer +FEEngineer +CVEngineer $ +  $ +commondata,<eyJoZGlkIjoiOTU3M2M5MGU2YzlhNTU3MjI5ZWFkY2FkZDZhZDA5NDQifQ==@ \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/File/Word/CQMS/总包质量管理组织机构图.doc b/SGGL/FineUIPro.Web/File/Word/CQMS/总包质量管理组织机构图.doc new file mode 100644 index 00000000..2b350fa8 --- /dev/null +++ b/SGGL/FineUIPro.Web/File/Word/CQMS/总包质量管理组织机构图.doc @@ -0,0 +1,177 @@ +ࡱ>  + " !#$%Root Entry Fp(@SummaryInformation(DocumentSummaryInformation8WordDocument< +  +Oh+'0  +$ 0 <HPX`Sg Normal.dotmWendy1@@y +@ +B +D +F +H +ynao(mH sH nHtHo(mH sH nHtH o(nHtHo(mH sH nHtHo(mH sH nHtHo(mH sH nHtHo(mH sH nHtHPJo(mH sH nHtHaJaJaJo( OJPJQJOJPJQJo( OJPJQJ CJaJ5CJo(aJ5CJo(aJ5mH sH nHtH$&<66666666 0@P`p6666 0@P`p 0@P`p 0@P`p 0@P`p 0@P`p 0@P`pZ@Zcke a$$1$0CJOJPJQJ^JaJKHmH sH nHtH_H$A@$؞k=W[SONi@Nnfh +@ +B +D +F +H +J +L +N +P +R +T +V +X +X +Z +\ +:A .!#"$%S2P0p180t Ut 35z35ot +nkn +t N*N*t "\"t \t\tl35lt&'t<19t7(,;/t ?'ttt""t++t+t'c1t t; t('tCt +  ". +  "% +  ProjectName_GoBackProjectManager sjManager +carManager +hseManager qaManager sgManager cgManager +docManager carEngineer hseEngineerwarehouseManager +EAEngineer +FEEngineer +CVEngineer +EHEngineer +PDEngineer8 + "$&(*. + 8 + "$&(*. +commondata,<eyJoZGlkIjoiOTU3M2M5MGU2YzlhNTU3MjI5ZWFkY2FkZDZhZDA5NDQifQ==@ \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index ebdfcb39..898f5f3d 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -89,6 +89,10 @@ ..\FineUIPro\Reference BLL\Interop.WIA.dll + + ..\packages\Microsoft.Office.Interop.Word.15.0.4797.1004\lib\net20\Microsoft.Office.Interop.Word.dll + True + False @@ -1726,6 +1730,7 @@ + diff --git a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs index f926ddf3..abcdda9e 100644 --- a/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.cs @@ -173,13 +173,13 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary { ProblemTypes = x.ProblemTypes, ProjectId = x.ProjectId, - CheckTime=x.CheckTime, - States=x.States + CheckTime = x.CheckTime, + States = x.States }).Where(x => x.ProblemTypes == "1").ToList(); //周例会 - var list3 = Funs.DB.Meeting_WeekMeeting.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.WeekMeetingDate }).ToList(); + var list3 = Funs.DB.Meeting_WeekMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.WeekMeetingDate }).ToList(); //月例会 - var list4 = Funs.DB.Meeting_MonthMeeting.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.MonthMeetingDate }).ToList(); + var list4 = Funs.DB.Meeting_MonthMeeting.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.MonthMeetingDate }).ToList(); //作业票 var list5 = Funs.DB.View_License_LicenseManager @@ -188,7 +188,7 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary //工程师日志 var list6 = (from x in Funs.DB.Manager_HSSELog - where x.IsVisible !=false + where x.IsVisible != false select new { x.ProjectId, @@ -196,30 +196,34 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary x.IsVisible }).ToList(); //HSE管理月报 - var list7 = Funs.DB.Manager_MonthReportC.Select(x=> new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.Months }).ToList(); + var list7 = Funs.DB.Manager_MonthReportC.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.Months }).ToList(); //质量巡检 - var list8 = Funs.DB.Check_CheckControl.Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.CheckDate,state=x.State }).ToList(); + var list8 = Funs.DB.Check_CheckControl.Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.CheckDate, state = x.State }).ToList(); //设备材料报验 var list10 = Funs.DB.Comprehensive_InspectionEquipment.Select - (x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.InspectionDate }).ToList(); + (x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.InspectionDate }).ToList(); //人员报验 var list11 = Funs.DB.Comprehensive_InspectionPerson. - Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.ApprovalTime }).ToList(); + Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.ApprovalTime }).ToList(); //机具报验 var list13 = Funs.DB.Comprehensive_InspectionMachine - .Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.InspectionDate }).ToList(); + .Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.InspectionDate }).ToList(); //设计变更管理 var list14 = Funs.DB.Comprehensive_DesignChangeOrder - .Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.IssuedDate }).ToList(); + .Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.IssuedDate }).ToList(); //施工方案管理 var list15 = Funs.DB.Comprehensive_GeneralPlanApproval - .Select(x=>new ProjectIdAndDate { ProjectId=x.ProjectId, Mdate = x.ApprovalDate }).ToList(); + .Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.ApprovalDate }).ToList(); + + //超过一定规模的危大施工方案 + var list15_2 = Funs.DB.Comprehensive_MajorPlanApproval + .Select(x => new ProjectIdAndDate { ProjectId = x.ProjectId, Mdate = x.ApprovalDate }).ToList(); //设计交底管理 var list16 = Funs.DB.Comprehensive_DesignDetails @@ -239,6 +243,16 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary x.ReportType }).ToList(); + //质量周报（新） + var list18_2 = (from x in Funs.DB.Report_WeekAndMonthReport_New + where x.ReportType == "2" + select new + { + x.ProjectId, + x.EndDate, + x.ReportType + }).ToList(); + //质量月报 var list19 = (from x in Funs.DB.Report_WeekAndMonthReport where x.ReportType == "2" @@ -249,6 +263,16 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary x.ReportType }).ToList(); + //质量月报（新） + var list19_2 = (from x in Funs.DB.Report_WeekAndMonthReport_New + where x.ReportType == "1" + select new + { + x.ProjectId, + x.EndDate, + x.ReportType + }).ToList(); + //一次共检合格数 var list20 = (from x in Funs.DB.ProcessControl_InspectionManagement where x.IsOnceQualified == true @@ -554,10 +578,15 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary model.InspectionSummaryId = Guid.NewGuid().ToString(); model.InspectionSummaryMbId = "15"; var SgfaCount = list15.Where(x => x.ProjectId == pid).ToList().Count; - model.SummeryResult = SgfaCount.ToString(); - if (SgfaCount>0) + var bigCount = list15_2.Where(x => x.ProjectId == pid).ToList().Count; + model.SummeryResult = (SgfaCount + bigCount).ToString(); + if (bigCount > 0 && SgfaCount == 0) { //审批日期 + model.CompileDate = list15_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; + } + else if (SgfaCount > 0) + { model.CompileDate = list15.Where(x => x.ProjectId == pid).OrderByDescending(x => x.Mdate).FirstOrDefault().Mdate; } allList.Add(model); @@ -601,10 +630,14 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary model.InspectionSummaryId = Guid.NewGuid().ToString(); model.InspectionSummaryMbId = "18"; var SgzbCount = list18.Where(x => x.ProjectId == pid).ToList().Count; - model.SummeryResult = SgzbCount.ToString(); - if (SgzbCount>0) + var newSgzbCount = list18_2.Where(x => x.ProjectId == pid).ToList().Count; + model.SummeryResult = (SgzbCount + newSgzbCount).ToString(); + if (SgzbCount == 0 && newSgzbCount > 0) + { + model.CompileDate = list18_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + } + else if (SgzbCount > 0) { - //StartDate,EndDate model.CompileDate = list18.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; } allList.Add(model); @@ -616,10 +649,14 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary model.InspectionSummaryId = Guid.NewGuid().ToString(); model.InspectionSummaryMbId = "19"; var SgybCount = list19.Where(x => x.ProjectId == pid).ToList().Count; - model.SummeryResult = SgybCount.ToString(); - if (SgybCount>0) + var newSgybCount = list19_2.Where(x => x.ProjectId == pid).ToList().Count; + model.SummeryResult = (SgybCount+ newSgybCount).ToString(); + if (newSgybCount > 0 && SgybCount == 0) + { + model.CompileDate = list19_2.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; + } + else if (SgybCount > 0) { - //StartDate,EndDate model.CompileDate = list19.Where(x => x.ProjectId == pid).OrderByDescending(x => x.EndDate).FirstOrDefault().EndDate; } allList.Add(model); diff --git a/SGGL/FineUIPro.Web/packages.config b/SGGL/FineUIPro.Web/packages.config index 59c5da55..912667ad 100644 --- a/SGGL/FineUIPro.Web/packages.config +++ b/SGGL/FineUIPro.Web/packages.config @@ -2,6 +2,7 @@ + diff --git a/SGGL/FineUIPro.Web/res/images/SubOrganizational.png b/SGGL/FineUIPro.Web/res/images/SubOrganizational.png new file mode 100644 index 00000000..b547a7bd Binary files /dev/null and b/SGGL/FineUIPro.Web/res/images/SubOrganizational.png differ