From 73c2c67939e5360b121be80e5a9a99e3bbba5b0f Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 22 Aug 2024 11:00:20 +0800 Subject: [PATCH] =?UTF-8?q?20240822=20=E8=8E=B7=E5=8F=96=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=B7=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WBSCompleteAndReal/WBSReportService.cs | 4 ++-- SGGL/BLL/ProjectData/UnitWorkService.cs | 6 +++--- .../Project_CQMSDataService.cs | 2 +- .../DataDistributionDataIn.aspx.cs | 2 +- .../CQMS/DataBase/DataBaseProject.aspx.cs | 4 ++-- .../CQMS/Foreign/ControlPointList.aspx.cs | 2 +- .../CQMS/Foreign/ShoBreakdownProject.aspx.cs | 2 +- .../CQMS/ProcessControl/ShowUnitWork.aspx.cs | 2 +- SGGL/FineUIPro.Web/ErrLog.txt | 20 +++++++++++++++++++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- .../HSSE/SitePerson/PersonIn.aspx.cs | 4 ++-- .../ProjectData/UnitWork.aspx.cs | 4 ++-- 12 files changed, 37 insertions(+), 17 deletions(-) diff --git a/SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs b/SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs index 5bcfae71..bf1061ba 100644 --- a/SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs +++ b/SGGL/BLL/JDGL/WBSCompleteAndReal/WBSReportService.cs @@ -276,7 +276,7 @@ namespace BLL } else { - List InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId select x).ToList();//装置条件为空时获取对应操作表中所有的装置 + List InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).ToList();//装置条件为空时获取对应操作表中所有的装置 foreach (Model.WBS_UnitWork item in InstallationList) { Model.View_WBSReport InstallationInit = (from x in WBSReportList where x.Id == item.UnitWorkId select x).FirstOrDefault(); @@ -289,7 +289,7 @@ namespace BLL } else { - List InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId==projectId select x).ToList(); + List InstallationList = (from x in Funs.DB.WBS_UnitWork where x.ProjectId==projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).ToList(); foreach (Model.WBS_UnitWork item in InstallationList) { Model.View_WBSReport InstallationInit = (from x in WBSReportList where x.Id == item.UnitWorkId select x).FirstOrDefault(); diff --git a/SGGL/BLL/ProjectData/UnitWorkService.cs b/SGGL/BLL/ProjectData/UnitWorkService.cs index cde8789c..cf918b4a 100644 --- a/SGGL/BLL/ProjectData/UnitWorkService.cs +++ b/SGGL/BLL/ProjectData/UnitWorkService.cs @@ -402,7 +402,7 @@ namespace BLL string[] type = null; if (!string.IsNullOrEmpty(projectType)) type = projectType.Split(','); - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (type == null || type.Contains(x.ProjectType)) orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == projectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && (type == null || type.Contains(x.ProjectType)) orderby x.UnitWorkCode select x; return unitWorks.ToList(); } /// @@ -454,12 +454,12 @@ namespace BLL { if (ProjectType == "1") { - List lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "1" && x.ProjectId == ProjectId orderby x.UnitWorkCode select x).ToList(); + List lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "1" && x.ProjectId == ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList(); return lis; } else if (ProjectType == "2") { - List lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "2" && x.ProjectId == ProjectId orderby x.UnitWorkCode select x).ToList(); + List lis = (from x in Funs.DB.WBS_UnitWork where x.ProjectType == "2" && x.ProjectId == ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x).ToList(); return lis; } else diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs index ead03467..535bb675 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_CQMSDataService.cs @@ -702,7 +702,7 @@ namespace BLL public static int GetUnitProjectNum(string projectid) { int result = (from x in Funs.DB.WBS_UnitWork - where x.ProjectId == projectid + where x.ProjectId == projectid && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x).Count(); return result; } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs index 6f925940..4031192e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs @@ -388,7 +388,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive select x; var cns = from x in Funs.DB.Base_CNProfessional select x; - var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x; + var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") select x; var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder where x.ProjectId == this.CurrUser.LoginProjectId select x; diff --git a/SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs index 7f6b8c70..f12d1b38 100644 --- a/SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/DataBase/DataBaseProject.aspx.cs @@ -2287,7 +2287,7 @@ namespace FineUIPro.Web.CQMS.DataBase private void WBSDataBind(string cNProfessionalCode) { this.tvWBS.Nodes.Clear(); - var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var q in installations) { TreeNode newNode = new TreeNode(); @@ -2362,7 +2362,7 @@ namespace FineUIPro.Web.CQMS.DataBase private void WBSDataBind2(string cNProfessionalCode) { this.tvWBS2.Nodes.Clear(); - var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var installations = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var q in installations) { TreeNode newNode = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs index bfad9bb8..d2ddc5da 100644 --- a/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Foreign/ControlPointList.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign this.tvControlItem.AutoScroll = true; this.tvControlItem.EnableSingleClickExpand = true; - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var item in unitWorks) { TreeNode rootNode1 = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs index 0efb5e87..564f174f 100644 --- a/SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Foreign/ShoBreakdownProject.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.CQMS.Foreign this.tvControlItem.AutoScroll = true; this.tvControlItem.EnableSingleClickExpand = true; - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var item in unitWorks) { TreeNode rootNode1 = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs index 40d9df79..735f3404 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/ShowUnitWork.aspx.cs @@ -71,7 +71,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl this.trWBS.EnableIcons = true; this.trWBS.AutoScroll = true; this.trWBS.EnableSingleClickExpand = true; - var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId orderby x.UnitWorkCode select x; + var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") orderby x.UnitWorkCode select x; foreach (var q in unitWorks) { TreeNode newNode = new TreeNode(); diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..ccadda90 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,20 @@ + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 BLL.APIGetHttpService.ControlHttp(String url, String method, String contenttype, Hashtable header, String data) 位置 E:\五环\SGGL_CWCEC\SGGL\BLL\API\APIGetHttpService.cs:行号 202 + 在 FineUIPro.Web.ProjectData.Installation.btnMenuDown_Click(Object sender, EventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\ProjectData\Installation.aspx.cs:行号 252 + 在 FineUIPro.MenuButton.OnClick(EventArgs e) + 在 (MenuButton , EventArgs ) + 在 FineUIPro.MenuButton.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) +出错时间:08/22/2024 10:39:28 +出错文件:http://localhost:8579/ProjectData/Installation.aspx +IP地址:::1 +操作人员:JT + +出错时间:08/22/2024 10:39:28 + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 29220861..fec7f569 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -19232,7 +19232,7 @@ - +