lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20240813 单位工程加载问题

This commit is contained in:
毕文静 2024-08-13 14:45:57 +08:00
parent df1e3a4424
commit 97e26468a4
50 changed files with 910 additions and 776 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/BLL/API/APIBaseInfoService.cs
View File

@ -106,7 +106,7 @@ namespace BLL
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var getDataLists = (from x in db.WBS_UnitWork
where x.ProjectId == projectId && x.UnitId == unitId && x.SuperUnitWork == null
where x.ProjectId == projectId && x.UnitId == unitId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select new Model.BaseInfoItem
{

2
SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs
View File

@ -152,7 +152,7 @@ namespace FineUIPro.Web.CQMS.Check
if (e.Node.CommandName == "ProjectType") //展开工程类型
{
var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null||x.SuperUnitWork=="0") && x.ProjectType == e.Node.NodeID
select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)
@ -403,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs
View File

@ -169,7 +169,9 @@ 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;
for (int i = 0; i < ir; i++)
{

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs
View File

@ -171,7 +171,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)
{
@ -428,7 +428,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork=="0")
select x;
var oldViewInfos = from x in Funs.DB.Comprehensive_DesignChangeOrder

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)
@ -412,7 +412,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)
@ -429,7 +429,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)
@ -403,7 +403,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
var posts = from x in Funs.DB.Base_Post select x;
@ -456,7 +456,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
var posts = from x in Funs.DB.Base_Post select x;

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)
@ -397,7 +397,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
var users = from x in Funs.DB.Project_ProjectUser
@ -478,7 +478,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
var users = from x in Funs.DB.Project_ProjectUser

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs
View File

@ -173,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)
@ -379,7 +379,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)

4
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs
View File

@ -175,7 +175,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)
@ -407,7 +407,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
select x;
for (int i = 1; i < ir; i++)

7
SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs
View File

@ -166,7 +166,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
join y in Funs.DB.Project_ProjectUnit on x.UnitId equals y.UnitId
where y.ProjectId == this.CurrUser.LoginProjectId && (y.UnitType == Const.ProjectUnitType_1 || y.UnitType == Const.ProjectUnitType_2)
select x;
var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null orderby x.UnitWorkCode select x;
var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select x;
var cns = from x in Funs.DB.Base_CNProfessional select x;
for (int i = 1; i < ir; i++)
@ -394,7 +397,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
select x;
var cns = from x in Funs.DB.Base_CNProfessional select x;
var ins = from x in Funs.DB.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null select x;
var ins = 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_SiteVisaManagement
where x.ProjectId == this.CurrUser.LoginProjectId
select x;

4
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs
View File

@ -121,7 +121,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (e.Node.CommandName == "ProjectType") //展开工程类型
{
var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectType == e.Node.NodeID
select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0)
@ -1033,7 +1033,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
rootNode.Expanded = true;
var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == projectType
where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectType == projectType
select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0)

2
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs
View File

@ -120,7 +120,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (e.Node.CommandName == "ProjectType") //展开工程类型
{
var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectType == e.Node.NodeID
select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0)

20
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -0,0 +1,20 @@
错误信息开始=====>
错误类型:NullReferenceException
错误信息:未将对象引用设置到对象的实例。
错误堆栈:
在 FineUIPro.Web.ProjectData.UnitWork.getWBSSet() 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\ProjectData\UnitWork.aspx.cs:行号 461
在 FineUIPro.Web.ProjectData.UnitWork.Window2_Close(Object sender, WindowCloseEventArgs e) 位置 E:\五环\SGGL_CWCEC\SGGL\FineUIPro.Web\ProjectData\UnitWork.aspx.cs:行号 221
在 FineUIPro.Window.OnClose(WindowCloseEventArgs e)
在 (Window , WindowCloseEventArgs )
在 FineUIPro.Window.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/13/2024 14:44:02
出错文件:http://localhost:8579/ProjectData/UnitWork.aspx
IP地址:::1
操作人员:JT
出错时间:08/13/2024 14:44:02

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19216,7 +19216,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs
View File

@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs
View File

@ -72,7 +72,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs
View File

@ -70,7 +70,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs
View File

@ -72,7 +72,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs
View File

@ -74,7 +74,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs
View File

@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs
View File

@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.LeakVacuum
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.HJGL_LV_LeakVacuum> LeakVacuumLists = (from x in Funs.DB.HJGL_LV_LeakVacuum where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
View File

@ -73,7 +73,7 @@ namespace FineUIPro.Web.HJGL.NDT
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
View File

@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
View File

@ -48,7 +48,7 @@ namespace FineUIPro.Web.HJGL.PointTrust
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaningLists = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs
View File

@ -91,7 +91,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs
View File

@ -72,7 +72,7 @@ namespace FineUIPro.Web.HJGL.PurgingCleaning
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.HJGL_PC_PurgingCleaning> PurgingCleaning = (from x in Funs.DB.HJGL_PC_PurgingCleaning where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs
View File

@ -117,7 +117,7 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs
View File

@ -90,7 +90,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId && x.TableDate >= startTime && x.TableDate < endTime

2
SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs
View File

@ -88,7 +88,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();

32
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
View File

@ -84,7 +84,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
@ -283,34 +283,44 @@ namespace FineUIPro.Web.HJGL.TestPackage
if (!string.IsNullOrEmpty(testPackageManage.Check2))
{
drpPressureTest.SelectedValue = testPackageManage.Check2;
} if (!string.IsNullOrEmpty(testPackageManage.Check3))
}
if (!string.IsNullOrEmpty(testPackageManage.Check3))
{
drpWorkRecord.SelectedValue = testPackageManage.Check3;
} if (!string.IsNullOrEmpty(testPackageManage.Check4))
}
if (!string.IsNullOrEmpty(testPackageManage.Check4))
{
drpNDTConform.SelectedValue = testPackageManage.Check4;
} if (!string.IsNullOrEmpty(testPackageManage.Check5))
}
if (!string.IsNullOrEmpty(testPackageManage.Check5))
{
drpHotConform.SelectedValue = testPackageManage.Check5;
} if (!string.IsNullOrEmpty(testPackageManage.Check6))
}
if (!string.IsNullOrEmpty(testPackageManage.Check6))
{
drpInstallationCorrectness.SelectedValue = testPackageManage.Check6;
} if (!string.IsNullOrEmpty(testPackageManage.Check7))
}
if (!string.IsNullOrEmpty(testPackageManage.Check7))
{
drpMarkClearly.SelectedValue = testPackageManage.Check7;
} if (!string.IsNullOrEmpty(testPackageManage.Check8))
}
if (!string.IsNullOrEmpty(testPackageManage.Check8))
{
drpIsolationOpening.SelectedValue = testPackageManage.Check8;
} if (!string.IsNullOrEmpty(testPackageManage.Check9))
}
if (!string.IsNullOrEmpty(testPackageManage.Check9))
{
drpConstructionPlanAsk.SelectedValue = testPackageManage.Check9;
} if (!string.IsNullOrEmpty(testPackageManage.Check10))
}
if (!string.IsNullOrEmpty(testPackageManage.Check10))
{
drpCover.SelectedValue = testPackageManage.Check10;
} if (!string.IsNullOrEmpty(testPackageManage.Check11))
}
if (!string.IsNullOrEmpty(testPackageManage.Check11))
{
drpMeetRequirements.SelectedValue = testPackageManage.Check11;
} if (!string.IsNullOrEmpty(testPackageManage.Check12))
}
if (!string.IsNullOrEmpty(testPackageManage.Check12))
{
drpStainlessTestWater.SelectedValue = testPackageManage.Check12;
}

111
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs
View File

@ -1,4 +1,16 @@
using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Linq; using BLL; using Newtonsoft.Json.Linq; namespace FineUIPro.Web.HJGL.TestPackage { public partial class TestPackageComplete : PageBase { #region 定义项
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using BLL;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.HJGL.TestPackage
{
public partial class TestPackageComplete : PageBase
{
#region 定义项
/// <summary>
/// 试压包主键
/// </summary>
@ -14,7 +26,25 @@
}
}
#endregion
#region 加载页面 /// <summary> /// 加载页面 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Page_Load(object sender, EventArgs e) { if (!IsPostBack) { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.PTP_ID = string.Empty; this.InitTreeMenu();//加载树 } } #endregion #region 加载树装置-单位-工作区
#region 加载页面
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.PTP_ID = string.Empty;
this.InitTreeMenu();//加载树
}
}
#endregion
#region 加载树装置-单位-工作区
/// <summary>
/// 加载树
/// </summary>
@ -40,7 +70,7 @@
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId
@ -97,7 +127,9 @@
}
}
}
#endregion #region 绑定树节点
#endregion
#region 绑定树节点
/// <summary>
/// 绑定树节点
/// </summary>
@ -150,6 +182,7 @@
}
#endregion
#region 数据绑定
/// <summary>
/// 数据绑定
@ -212,13 +245,79 @@
}
#endregion
#endregion
#region 分页排序
#region 页索引改变事件 /// <summary> /// 页索引改变事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) { BindGrid(); } #endregion #region 排序 /// <summary> /// 排序 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Grid1_Sort(object sender, GridSortEventArgs e) { BindGrid(); } #endregion #region 分页选择下拉改变事件 /// <summary> /// 分页选择下拉改变事件 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) { Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); BindGrid(); } #endregion #endregion #region 关闭弹出窗口及刷新页面 /// <summary> /// 关闭弹出窗口 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Window1_Close(object sender, WindowCloseEventArgs e) { this.PTP_ID = this.hdPTP_ID.Text; this.BindGrid(); this.InitTreeMenu(); this.hdPTP_ID.Text = string.Empty; } /// <summary> /// 查询 /// </summary> /// <param name="sender"></param> /// <param name="e"></param> protected void Tree_TextChanged(object sender, EventArgs e) { this.InitTreeMenu(); this.BindGrid(); }
#region 页索引改变事件
/// <summary>
/// 页索引改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
#endregion
#region 排序
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
#endregion
#region 分页选择下拉改变事件
/// <summary>
/// 分页选择下拉改变事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
#endregion
#endregion
#region 关闭弹出窗口及刷新页面
/// <summary>
/// 关闭弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, WindowCloseEventArgs e)
{
this.PTP_ID = this.hdPTP_ID.Text;
this.BindGrid();
this.InitTreeMenu();
this.hdPTP_ID.Text = string.Empty;
}
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Tree_TextChanged(object sender, EventArgs e)
{
this.InitTreeMenu();
this.BindGrid();
}
#endregion
protected void btnMenuModify_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdPTP_ID.ClientID)+ Window1.GetShowReference(String.Format("TestPackageCompleteEdit.aspx?PTP_ID={0}", this.tvControlItem.SelectedNodeID, "操作 - ")));
}
} }
}
}

2
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
View File

@ -73,7 +73,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.PTP_TestPackage> testPackageLists = (from x in Funs.DB.PTP_TestPackage
where x.ProjectId == this.CurrUser.LoginProjectId

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs
View File

@ -57,7 +57,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs
View File

@ -47,7 +47,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
View File

@ -58,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
View File

@ -49,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
View File

@ -64,7 +64,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
var unitWorkList = (from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.SuperUnitWork == null && x.UnitId != null && x.ProjectType != null
&& (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.UnitId != null && x.ProjectType != null
select x).ToList();
List<Model.WBS_UnitWork> unitWork1 = null;

2
SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
View File

@ -293,7 +293,7 @@ namespace FineUIPro.Web.HSSE.Check
{
string info = string.Empty;
var unitWorks = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.ProjectId && x.SuperUnitWork == null
where x.ProjectId == this.ProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0")
orderby x.UnitWorkCode
select new
{

2
SGGL/FineUIPro.Web/JDGL/Check/ProgressShow.aspx.cs
View File

@ -117,7 +117,7 @@ namespace FineUIPro.Web.JDGL.Check
if (e.Node.CommandName == "ProjectType") //展开工程类型
{
var trUnitWork = from x in Funs.DB.WBS_UnitWork
where x.ProjectId == this.CurrUser.LoginProjectId && x.SuperUnitWork == null && x.ProjectType == e.Node.NodeID
where x.ProjectId == this.CurrUser.LoginProjectId && (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectType == e.Node.NodeID
select x;
trUnitWork = trUnitWork.OrderBy(x => x.UnitWorkCode);
if (trUnitWork.Count() > 0)

2
SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.cs
View File

@ -37,7 +37,7 @@ namespace FineUIPro.Web.ProjectData
BLL.WorkPostService.InitWorkPostDropDownList(this.drpWorkPost, true);
CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true);
CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true);
gvUnitWork.DataSource = (from x in Funs.DB.WBS_UnitWork where x.SuperUnitWork == null && x.ProjectId == this.CurrUser.LoginProjectId select x);
gvUnitWork.DataSource = (from x in Funs.DB.WBS_UnitWork where (x.SuperUnitWork == null || x.SuperUnitWork == "0") && x.ProjectId == this.CurrUser.LoginProjectId select x);
gvUnitWork.DataBind();
this.ProjectUserId = Request.QueryString["ProjectUserId"];
if (!String.IsNullOrEmpty(this.ProjectUserId))

2
SGGL/FineUIPro.Web/Web.config
View File

@ -12,7 +12,7 @@
<appSettings>
<!--连接字符串-->
<!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="智慧施工管理信息系统V1.0"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>