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

20240813 单位工程加载问题

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs
+1 -1
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)
SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs
+2 -2
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++)
SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs
+3 -1
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++)
{
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs
+2 -2
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
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs
+2 -2
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++)
SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
+2 -2
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++)
SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs
+2 -2
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++)
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
+2 -2
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;
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs
+2 -2
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++)
SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
+2 -2
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
SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs
+2 -2
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++)
SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs
+2 -2
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++)
SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs
+5 -2
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;
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs
+2 -2
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)
SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs
+1 -1
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)