From 97e26468a40af826d38e4a0b63c79dc0e29f1a85 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 13 Aug 2024 14:45:57 +0800
Subject: [PATCH] =?UTF-8?q?20240813=20=E5=8D=95=E4=BD=8D=E5=B7=A5=E7=A8=8B?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/API/APIBaseInfoService.cs            |   2 +-
 SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs |   2 +-
 .../ConTechnologyDisclosureDataIn.aspx.cs     |   4 +-
 .../DataDistributionDataIn.aspx.cs            |   4 +-
 .../DesignChangeOrderDataIn.aspx.cs           |   4 +-
 .../Comprehensive/DesignDetailsDataIn.aspx.cs |   4 +-
 .../DesignDrawingsDataIn.aspx.cs              |   4 +-
 .../GeneralPlanApprovalDataIn.aspx.cs         |   4 +-
 .../InspectionPersonDataIn.aspx.cs            |   4 +-
 .../MajorPlanApprovalDataIn.aspx.cs           |   4 +-
 .../Comprehensive/NCRManagementDataIn.aspx.cs |   4 +-
 .../QualityAccidentDataIn.aspx.cs             |   4 +-
 .../ReviewDrawingsDataIn.aspx.cs              |   4 +-
 .../SiteVisaManagementDataIn.aspx.cs          |   7 +-
 .../CQMS/WBS/ControlItemAndCycle.aspx.cs      |   4 +-
 .../CQMS/WBS/ControlItemAndCycleShow.aspx.cs  |   2 +-
 SGGL/FineUIPro.Web/ErrLog.txt                 |  20 +
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj       |   2 +-
 .../HJGL/HotProcessHard/HardFeedback.aspx.cs  |   2 +-
 .../HJGL/HotProcessHard/HardReport.aspx.cs    |   2 +-
 .../HJGL/HotProcessHard/HardTrust.aspx.cs     |   2 +-
 .../HotProcessHard/HotProessFeedback.aspx.cs  |   2 +-
 .../HotProcessHard/HotProessReport.aspx.cs    |   2 +-
 .../HotProcessHard/HotProessTrust.aspx.cs     |   2 +-
 .../HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs   |   2 +-
 .../HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs   |   2 +-
 .../LeakVacuum/LeakVacuumComplete.aspx.cs     |   2 +-
 .../HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs    |   2 +-
 SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs  |   2 +-
 .../HJGL/PointTrust/PointBatch.aspx.cs        |   2 +-
 .../HJGL/PointTrust/TrustBatch.aspx.cs        |   2 +-
 .../PurgingCleaning/PC_ItemEndCheck.aspx.cs   |   2 +-
 .../PurgingCleaningAudit.aspx.cs              |   2 +-
 .../PurgingCleaningComplete.aspx.cs           |   2 +-
 .../PurgingCleaningEdit.aspx.cs               |   2 +-
 .../RepairAndExpand/RepairAndExpand.aspx.cs   |   2 +-
 .../HJGL/TestPackage/BItemEndCheck.aspx.cs    |   2 +-
 .../HJGL/TestPackage/ItemEndCheck.aspx.cs     |   2 +-
 .../HJGL/TestPackage/TestPackageAudit.aspx.cs | 996 +++++++++---------
 .../TestPackage/TestPackageComplete.aspx.cs   | 547 ++++++----
 .../HJGL/TestPackage/TestPackageEdit.aspx.cs  |   2 +-
 .../HJGL/WeldingManage/PipelineList.aspx.cs   |   2 +-
 .../WeldingManage/PreWeldReportAudit.aspx.cs  |   2 +-
 .../HJGL/WeldingManage/WeldJointList.aspx.cs  |   2 +-
 .../HJGL/WeldingManage/WeldReport.aspx.cs     |   2 +-
 .../HJGL/WeldingManage/WeldTask.aspx.cs       |   2 +-
 .../HSSE/Check/CheckSpecialEdit.aspx.cs       |   2 +-
 .../JDGL/Check/ProgressShow.aspx.cs           |   2 +-
 .../ProjectData/ProjectUserSave.aspx.cs       |   2 +-
 SGGL/FineUIPro.Web/Web.config                 |   2 +-
 50 files changed, 910 insertions(+), 776 deletions(-)

diff --git a/SGGL/BLL/API/APIBaseInfoService.cs b/SGGL/BLL/API/APIBaseInfoService.cs
index f070b873..1a647d0c 100644
--- a/SGGL/BLL/API/APIBaseInfoService.cs
+++ b/SGGL/BLL/API/APIBaseInfoService.cs
@@ -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
                                     {
diff --git a/SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs
index 328d5b52..5d1fe3ed 100644
--- a/SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Check/ShowWBS.aspx.cs
@@ -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)
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs
index b58b1674..882753da 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ConTechnologyDisclosureDataIn.aspx.cs
@@ -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++)
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs
index a938d139..6f925940 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionDataIn.aspx.cs
@@ -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++)
                 {
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs
index 6e2530d7..7ee6dc37 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderDataIn.aspx.cs
@@ -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
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs
index 11c6711e..d0f1bec4 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsDataIn.aspx.cs
@@ -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++)
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
index d867b7cb..6f128b7e 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsDataIn.aspx.cs
@@ -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++)
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs
index 2c31f4ac..ba97526f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/GeneralPlanApprovalDataIn.aspx.cs
@@ -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++)
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
index b2f87b15..4349c26a 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs
index 976e4f5b..4e79929f 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalDataIn.aspx.cs
@@ -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++)
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
index 3d2e31e4..06d87761 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementDataIn.aspx.cs
@@ -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
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs
index 59f0caad..73cc5f0b 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentDataIn.aspx.cs
@@ -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++)
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs
index 7a8a273c..32ee348a 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ReviewDrawingsDataIn.aspx.cs
@@ -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++)
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs
index f56ed2ff..e6d9a421 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementDataIn.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs
index 68e185f9..b3b4d224 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycle.aspx.cs
@@ -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)
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs
index 9b159685..4a908769 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ControlItemAndCycleShow.aspx.cs
@@ -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)
diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt
index e69de29b..669dacf8 100644
--- a/SGGL/FineUIPro.Web/ErrLog.txt
+++ b/SGGL/FineUIPro.Web/ErrLog.txt
@@ -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
+
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index b538f6f6..7efa2411 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -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">
diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs
index 5c35e911..4c73f94e 100644
--- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardFeedback.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs
index 98871080..50292da9 100644
--- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs
index 427718c2..5ad5f21c 100644
--- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs
index 74da28b6..de60c08c 100644
--- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessFeedback.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs
index 9c085f7e..5ff5758b 100644
--- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs
index 87ffe368..8d6abcba 100644
--- a/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs
index 81ee4eac..4099b7f0 100644
--- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LV_ItemEndCheck.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs
index 0f4c7c6a..14cbee7c 100644
--- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumAudit.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs
index d392c0a8..20b4d63b 100644
--- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumComplete.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs
index b98d1794..b8135b3a 100644
--- a/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/LeakVacuum/LeakVacuumEdit.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
index f6bb6a51..ee2807f9 100644
--- a/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/NDT/NDTBatch.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
index 45d10b19..046b6be3 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/PointBatch.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
index 36eb13f9..49c86b41 100644
--- a/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PointTrust/TrustBatch.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs
index 9a66e5f4..652355dc 100644
--- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PC_ItemEndCheck.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs
index 45d1a61b..a06316c5 100644
--- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningAudit.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs
index 5f302f42..67379b6f 100644
--- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningComplete.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs
index 1a0e5102..e32a3b79 100644
--- a/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PurgingCleaning/PurgingCleaningEdit.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs
index d7405b2a..37ec217b 100644
--- a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairAndExpand.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs
index de588b2b..00526305 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/BItemEndCheck.aspx.cs
@@ -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
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs
index 1e439a22..a5dc571a 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/ItemEndCheck.aspx.cs
@@ -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();
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
index 21511d4b..5e82a1b6 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
@@ -1,494 +1,504 @@
-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 TestPackageAudit : PageBase
-    {
-        #region 定义项
-        /// <summary>
-        /// 试压包主键
-        /// </summary>
-        public string PTP_ID
-        {
-            get
-            {
-                return (string)ViewState["PTP_ID"];
-            }
-            set
-            {
-                ViewState["PTP_ID"] = value;
-            }
-        }
-        /// <summary>
-        /// 未通过数
-        /// </summary>
-        public int Count
-        {
-            get
-            {
-                return (int)ViewState["Count"];
-            }
-            set
-            {
-                ViewState["Count"] = value;
-            }
-        }
-        #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 加载树装置-单位-工作区
-        /// <summary>
-        /// 加载树
-        /// </summary>
-        private void InitTreeMenu()
-        {
-            this.tvControlItem.Nodes.Clear();
-
-            TreeNode rootNode1 = new TreeNode();
-            rootNode1.NodeID = "1";
-            rootNode1.Text = "建筑工程";
-            rootNode1.CommandName = "建筑工程";
-            this.tvControlItem.Nodes.Add(rootNode1);
-
-            TreeNode rootNode2 = new TreeNode();
-            rootNode2.NodeID = "2";
-            rootNode2.Text = "安装工程";
-            rootNode2.CommandName = "安装工程";
-            rootNode2.Expanded = true;
-            this.tvControlItem.Nodes.Add(rootNode2);
-            var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
-            // 获取当前用户所在单位
-            var currUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId);
-
-            var unitWorkList = (from x in Funs.DB.WBS_UnitWork
-                                where x.ProjectId == this.CurrUser.LoginProjectId
-                                      && x.SuperUnitWork == null && 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();
-            List<Model.WBS_UnitWork> unitWork1 = null;
-            List<Model.WBS_UnitWork> unitWork2 = null;
-
-            // 当前为施工单位，只能操作本单位的数据
-            if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
-            {
-                unitWork1 = (from x in unitWorkList
-                             where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
-                             select x).ToList();
-                unitWork2 = (from x in unitWorkList
-                             where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
-                             select x).ToList();
-            }
-            else
-            {
-                unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
-                unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
-            }
-
-            if (unitWork1.Count() > 0)
-            {
-                foreach (var q in unitWork1)
-                {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
-                    var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
-                    TreeNode tn1 = new TreeNode();
-                    tn1.NodeID = q.UnitWorkId;
-                    tn1.Text = q.UnitWorkName;
-                    tn1.ToolTip = "施工单位：" + u.UnitName;
-                    tn1.CommandName = "单位工程";
-                    rootNode1.Nodes.Add(tn1);
-                    var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
-                    BindNodes(tn1, testPackageUnitList);
-                }
-            }
-            if (unitWork2.Count() > 0)
-            {
-                foreach (var q in unitWork2)
-                {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
-                    var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
-                    TreeNode tn2 = new TreeNode();
-                    tn2.NodeID = q.UnitWorkId;
-                    tn2.Text = q.UnitWorkName;
-                    tn2.ToolTip = "施工单位：" + u.UnitName;
-                    tn2.CommandName = "单位工程";
-                    rootNode2.Nodes.Add(tn2);
-                    var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
-                    BindNodes(tn2, testPackageUnitList);
-                }
-            }
-        }
-        #endregion
-
-        #region 绑定树节点
-        /// <summary>
-        ///  绑定树节点
-        /// </summary>
-        /// <param name="node"></param>
-        private void BindNodes(TreeNode node, List<Model.PTP_TestPackage> testPackageUnitList)
-        {
-            if (node.CommandName == "单位工程")
-            {
-                var dReports = from x in testPackageUnitList
-                               where x.UnitWorkId == node.NodeID
-                               orderby x.TestPackageNo descending
-                               select x;
-                foreach (var item in dReports)
-                {
-                    TreeNode newNode = new TreeNode();
-                    if (!string.IsNullOrEmpty(item.TestPackageNo))
-                    {
-                        newNode.Text = item.TestPackageNo;
-                    }
-                    else
-                    {
-                        newNode.Text = "未知";
-                    }
-                    if (!item.AduditDate.HasValue || string.IsNullOrEmpty(item.Auditer))
-                    {
-                        newNode.Text = "<font color='#FF7575'>" + newNode.Text + "</font>";
-                        node.Text = "<font color='#FF7575'>" + node.Text + "</font>";
-                    }
-                    newNode.NodeID = item.PTP_ID;
-                    newNode.EnableClickEvent = true;
-                    node.Nodes.Add(newNode);
-                }
-            }
-        }
-        #endregion
-
-        #region 点击TreeView
-        /// <summary>
-        /// 点击TreeView
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
-        {
-            this.PTP_ID = tvControlItem.SelectedNodeID;
-            this.BindGrid();
-            btnAudit.Hidden = false;
-        }
-        #endregion
-
-        #region 数据绑定
-        /// <summary>
-        /// 数据绑定
-        /// </summary>
-        private void BindGrid()
-        {
-            this.SetTextTemp();
-            this.PageInfoLoad(); ///页面输入保存信息
-            string strSql = @"SELECT * FROM dbo.View_PTP_TestPackageAudit
-                             WHERE ProjectId= @ProjectId AND PTP_ID=@PTP_ID";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID));
-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-            // 2.获取当前分页数据
-            //var table = this.GetPagedDataTable(Grid1, tb1);
-            Grid1.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
-            Grid1.DataBind();
-            this.ShowGridItem();
-        }
-
-        /// <summary>
-        /// 行颜色设置
-        /// </summary>
-        private void ShowGridItem()
-        {
-            Count = 0;
-            int Count1 = 0, Count2 = 0, Count3 = 0, Count4 = 0;
-            int rowsCount = this.Grid1.Rows.Count;
-            for (int i = 0; i < rowsCount; i++)
-            {
-                int IsoInfoCount = Funs.GetNewIntOrZero(this.Grid1.Rows[i].Values[3].ToString()); //总焊口
-                int IsoInfoCountT = Funs.GetNewIntOrZero(this.Grid1.Rows[i].Values[4].ToString()); //完成总焊口
-                int CountS = Funs.GetNewIntOrZero(this.Grid1.Rows[i].Values[5].ToString()); //合格数
-                int CountU = Funs.GetNewIntOrZero(this.Grid1.Rows[i].Values[6].ToString());  //不合格数
-                decimal Rate = 0;
-                bool convertible = decimal.TryParse(this.Grid1.Rows[i].Values[9].ToString(), out Rate); //应检测比例
-                decimal Ratio = Funs.GetNewDecimalOrZero(this.Grid1.Rows[i].Values[10].ToString()); //实际检测比例
-
-                if (IsoInfoCount > IsoInfoCountT) //未焊完
-                {
-                    Count1 += 1;
-                    this.Grid1.Rows[i].RowCssClass = "Cyan";
-                }
-                else if (Rate > Ratio) //已焊完，未达检测比例
-                {
-                    Count2 += 1;
-                    this.Grid1.Rows[i].RowCssClass = "Yellow";
-                }
-                else if (CountU > 0) //已焊完，已达检测比例，但有不合格
-                {
-                    Count3 += 1;
-                    this.Grid1.Rows[i].RowCssClass = "Green";
-                }
-                else
-                {
-                    Count4 += 1;
-                    this.Grid1.Rows[i].RowCssClass = "Purple";
-                }
-            }
-
-            Count = Count1 + Count2 + Count2;
-            this.lab1.Text = Count1.ToString();
-            this.lab2.Text = Count2.ToString();
-            this.lab3.Text = Count3.ToString();
-            this.lab4.Text = Count4.ToString();
-        }
-        #region 加载页面输入保存信息
-        /// <summary>
-        /// 加载页面输入保存信息
-        /// </summary>
-        private void PageInfoLoad()
-        {
-            var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
-            if (testPackageManage != null)
-            {
-                this.txtTestPackageNo.Text = testPackageManage.TestPackageNo;
-                this.txtTestPackageName.Text = testPackageManage.TestPackageName;
-                this.txtRemark.Text = testPackageManage.Remark;
-                this.txtadjustTestPressure.Text = testPackageManage.AdjustTestPressure;
-                if (!string.IsNullOrEmpty(testPackageManage.Check1))
-                {
-                    drpInstallationSpecification.SelectedValue = testPackageManage.Check1;
-                }
-                if (!string.IsNullOrEmpty(testPackageManage.Check2))
-                {
-                    drpPressureTest.SelectedValue = testPackageManage.Check2;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check3))
-                {
-                    drpWorkRecord.SelectedValue = testPackageManage.Check3;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check4))
-                {
-                    drpNDTConform.SelectedValue = testPackageManage.Check4;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check5))
-                {
-                    drpHotConform.SelectedValue = testPackageManage.Check5;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check6))
-                {
-                    drpInstallationCorrectness.SelectedValue = testPackageManage.Check6;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check7))
-                {
-                    drpMarkClearly.SelectedValue = testPackageManage.Check7;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check8))
-                {
-                    drpIsolationOpening.SelectedValue = testPackageManage.Check8;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check9))
-                {
-                    drpConstructionPlanAsk.SelectedValue = testPackageManage.Check9;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check10))
-                {
-                    drpCover.SelectedValue = testPackageManage.Check10;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check11))
-                {
-                    drpMeetRequirements.SelectedValue = testPackageManage.Check11;
-                }
                if (!string.IsNullOrEmpty(testPackageManage.Check12))
-                {
-                    drpStainlessTestWater.SelectedValue = testPackageManage.Check12;
-                }
-            }
-        }
-        #endregion
-
-
-        #region 清空输入框
-        /// <summary>
-        /// 清空输入框
-        /// </summary>
-        private void SetTextTemp()
-        {
-            this.txtTestPackageNo.Text = string.Empty;
-            this.txtRemark.Text = string.Empty;
-        }
-        #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 试压前条件确认
-        #region 审核检测单
-        /// <summary>
-        /// 审核检测单
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnAudit_Click(object sender, EventArgs e)
-        {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageAuditMenuId, Const.BtnAuditing))
-            {
-                var updateTestPackage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
-                if (updateTestPackage != null)
-                {
-                    if (Count == 0)
-                    {
-                        string isnoHot = BLL.TestPackageEditService.IsExistNoHotHardItem(this.PTP_ID);
-                        if (string.IsNullOrEmpty(isnoHot))
-                        {
-                            string inspectionIsoRate = BLL.TestPackageEditService.InspectionIsoRate(this.PTP_ID);
-                            if (string.IsNullOrEmpty(inspectionIsoRate))
-                            {
-                                updateTestPackage.Check1 = drpInstallationSpecification.SelectedValue;
-                                updateTestPackage.Check2 = drpPressureTest.SelectedValue;
-                                updateTestPackage.Check3 = drpWorkRecord.SelectedValue;
-                                updateTestPackage.Check4 = drpNDTConform.SelectedValue;
-                                updateTestPackage.Check5 = drpHotConform.SelectedValue;
-                                updateTestPackage.Check6 = drpInstallationCorrectness.SelectedValue;
-                                updateTestPackage.Check7 = drpMarkClearly.SelectedValue;
-                                updateTestPackage.Check8 = drpIsolationOpening.SelectedValue;
-                                updateTestPackage.Check9 = drpConstructionPlanAsk.SelectedValue;
-                                updateTestPackage.Check10 = drpCover.SelectedValue;
-                                updateTestPackage.Check11 = drpMeetRequirements.SelectedValue;
-                                updateTestPackage.Check12 = drpStainlessTestWater.SelectedValue;
-                                updateTestPackage.AduditDate = DateTime.Now;
-                                updateTestPackage.Auditer = this.CurrUser.UserId;
-                                BLL.TestPackageEditService.UpdateTestPackage(updateTestPackage);
-                                this.InitTreeMenu();
-                                this.BindGrid();
-                                ShowNotify("保存成功！", MessageBoxIcon.Success);
-                            }
-                            else
-                            {
-                                Alert.ShowInTop(inspectionIsoRate, MessageBoxIcon.Warning);
-                                return;
-                            }
-                        }
-                        else
-                        {
-                            Alert.ShowInTop(isnoHot, MessageBoxIcon.Warning);
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        Alert.ShowInTop("管线未全部通过不允许确认操作！", MessageBoxIcon.Warning);
-                        return;
-                    }
-                }
-                else
-                {
-                    Alert.ShowInTop("请选择要确认的单据！", MessageBoxIcon.Warning);
-                    return;
-                }
-            }
-            else
-            {
-                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-        #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        
-
-        #region  试压包打印
-        /// <summary>
-        ///  试压包打印
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnPrint_Click(object sender, EventArgs e)
-        {
-            if (!string.IsNullOrEmpty(this.PTP_ID))
-            {
-                //string reportId = BLL.Const.HJGL_TrustReportId; // 试压包打印  待做模板                             
-                //PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}", reportId, this.PTP_ID, string.Empty, "打印 - ")));
-            }
-            else
-            {
-                ShowNotify("请选择无损委托记录！", MessageBoxIcon.Warning);
-                return;
-            }
-        }
-        #endregion
-    }
+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 TestPackageAudit : PageBase
+    {
+        #region 定义项
+        /// <summary>
+        /// 试压包主键
+        /// </summary>
+        public string PTP_ID
+        {
+            get
+            {
+                return (string)ViewState["PTP_ID"];
+            }
+            set
+            {
+                ViewState["PTP_ID"] = value;
+            }
+        }
+        /// <summary>
+        /// 未通过数
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return (int)ViewState["Count"];
+            }
+            set
+            {
+                ViewState["Count"] = value;
+            }
+        }
+        #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 加载树装置-单位-工作区
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.tvControlItem.Nodes.Clear();
+
+            TreeNode rootNode1 = new TreeNode();
+            rootNode1.NodeID = "1";
+            rootNode1.Text = "建筑工程";
+            rootNode1.CommandName = "建筑工程";
+            this.tvControlItem.Nodes.Add(rootNode1);
+
+            TreeNode rootNode2 = new TreeNode();
+            rootNode2.NodeID = "2";
+            rootNode2.Text = "安装工程";
+            rootNode2.CommandName = "安装工程";
+            rootNode2.Expanded = true;
+            this.tvControlItem.Nodes.Add(rootNode2);
+            var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
+            // 获取当前用户所在单位
+            var currUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId);
+
+            var unitWorkList = (from x in Funs.DB.WBS_UnitWork
+                                where x.ProjectId == this.CurrUser.LoginProjectId
+                                      && (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();
+            List<Model.WBS_UnitWork> unitWork1 = null;
+            List<Model.WBS_UnitWork> unitWork2 = null;
+
+            // 当前为施工单位，只能操作本单位的数据
+            if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
+            {
+                unitWork1 = (from x in unitWorkList
+                             where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
+                             select x).ToList();
+                unitWork2 = (from x in unitWorkList
+                             where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
+                             select x).ToList();
+            }
+            else
+            {
+                unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
+                unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
+            }
+
+            if (unitWork1.Count() > 0)
+            {
+                foreach (var q in unitWork1)
+                {
+                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
+                    TreeNode tn1 = new TreeNode();
+                    tn1.NodeID = q.UnitWorkId;
+                    tn1.Text = q.UnitWorkName;
+                    tn1.ToolTip = "施工单位：" + u.UnitName;
+                    tn1.CommandName = "单位工程";
+                    rootNode1.Nodes.Add(tn1);
+                    var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
+                    BindNodes(tn1, testPackageUnitList);
+                }
+            }
+            if (unitWork2.Count() > 0)
+            {
+                foreach (var q in unitWork2)
+                {
+                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
+                    TreeNode tn2 = new TreeNode();
+                    tn2.NodeID = q.UnitWorkId;
+                    tn2.Text = q.UnitWorkName;
+                    tn2.ToolTip = "施工单位：" + u.UnitName;
+                    tn2.CommandName = "单位工程";
+                    rootNode2.Nodes.Add(tn2);
+                    var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
+                    BindNodes(tn2, testPackageUnitList);
+                }
+            }
+        }
+        #endregion
+
+        #region 绑定树节点
+        /// <summary>
+        ///  绑定树节点
+        /// </summary>
+        /// <param name="node"></param>
+        private void BindNodes(TreeNode node, List<Model.PTP_TestPackage> testPackageUnitList)
+        {
+            if (node.CommandName == "单位工程")
+            {
+                var dReports = from x in testPackageUnitList
+                               where x.UnitWorkId == node.NodeID
+                               orderby x.TestPackageNo descending
+                               select x;
+                foreach (var item in dReports)
+                {
+                    TreeNode newNode = new TreeNode();
+                    if (!string.IsNullOrEmpty(item.TestPackageNo))
+                    {
+                        newNode.Text = item.TestPackageNo;
+                    }
+                    else
+                    {
+                        newNode.Text = "未知";
+                    }
+                    if (!item.AduditDate.HasValue || string.IsNullOrEmpty(item.Auditer))
+                    {
+                        newNode.Text = "<font color='#FF7575'>" + newNode.Text + "</font>";
+                        node.Text = "<font color='#FF7575'>" + node.Text + "</font>";
+                    }
+                    newNode.NodeID = item.PTP_ID;
+                    newNode.EnableClickEvent = true;
+                    node.Nodes.Add(newNode);
+                }
+            }
+        }
+        #endregion
+
+        #region 点击TreeView
+        /// <summary>
+        /// 点击TreeView
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            this.PTP_ID = tvControlItem.SelectedNodeID;
+            this.BindGrid();
+            btnAudit.Hidden = false;
+        }
+        #endregion
+
+        #region 数据绑定
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        private void BindGrid()
+        {
+            this.SetTextTemp();
+            this.PageInfoLoad(); ///页面输入保存信息
+            string strSql = @"SELECT * FROM dbo.View_PTP_TestPackageAudit
+                             WHERE ProjectId= @ProjectId AND PTP_ID=@PTP_ID";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            // 2.获取当前分页数据
+            //var table = this.GetPagedDataTable(Grid1, tb1);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+            this.ShowGridItem();
+        }
+
+        /// <summary>
+        /// 行颜色设置
+        /// </summary>
+        private void ShowGridItem()
+        {
+            Count = 0;
+            int Count1 = 0, Count2 = 0, Count3 = 0, Count4 = 0;
+            int rowsCount = this.Grid1.Rows.Count;
+            for (int i = 0; i < rowsCount; i++)
+            {
+                int IsoInfoCount = Funs.GetNewIntOrZero(this.Grid1.Rows[i].Values[3].ToString()); //总焊口
+                int IsoInfoCountT = Funs.GetNewIntOrZero(this.Grid1.Rows[i].Values[4].ToString()); //完成总焊口
+                int CountS = Funs.GetNewIntOrZero(this.Grid1.Rows[i].Values[5].ToString()); //合格数
+                int CountU = Funs.GetNewIntOrZero(this.Grid1.Rows[i].Values[6].ToString());  //不合格数
+                decimal Rate = 0;
+                bool convertible = decimal.TryParse(this.Grid1.Rows[i].Values[9].ToString(), out Rate); //应检测比例
+                decimal Ratio = Funs.GetNewDecimalOrZero(this.Grid1.Rows[i].Values[10].ToString()); //实际检测比例
+
+                if (IsoInfoCount > IsoInfoCountT) //未焊完
+                {
+                    Count1 += 1;
+                    this.Grid1.Rows[i].RowCssClass = "Cyan";
+                }
+                else if (Rate > Ratio) //已焊完，未达检测比例
+                {
+                    Count2 += 1;
+                    this.Grid1.Rows[i].RowCssClass = "Yellow";
+                }
+                else if (CountU > 0) //已焊完，已达检测比例，但有不合格
+                {
+                    Count3 += 1;
+                    this.Grid1.Rows[i].RowCssClass = "Green";
+                }
+                else
+                {
+                    Count4 += 1;
+                    this.Grid1.Rows[i].RowCssClass = "Purple";
+                }
+            }
+
+            Count = Count1 + Count2 + Count2;
+            this.lab1.Text = Count1.ToString();
+            this.lab2.Text = Count2.ToString();
+            this.lab3.Text = Count3.ToString();
+            this.lab4.Text = Count4.ToString();
+        }
+        #region 加载页面输入保存信息
+        /// <summary>
+        /// 加载页面输入保存信息
+        /// </summary>
+        private void PageInfoLoad()
+        {
+            var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
+            if (testPackageManage != null)
+            {
+                this.txtTestPackageNo.Text = testPackageManage.TestPackageNo;
+                this.txtTestPackageName.Text = testPackageManage.TestPackageName;
+                this.txtRemark.Text = testPackageManage.Remark;
+                this.txtadjustTestPressure.Text = testPackageManage.AdjustTestPressure;
+                if (!string.IsNullOrEmpty(testPackageManage.Check1))
+                {
+                    drpInstallationSpecification.SelectedValue = testPackageManage.Check1;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check2))
+                {
+                    drpPressureTest.SelectedValue = testPackageManage.Check2;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check3))
+                {
+                    drpWorkRecord.SelectedValue = testPackageManage.Check3;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check4))
+                {
+                    drpNDTConform.SelectedValue = testPackageManage.Check4;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check5))
+                {
+                    drpHotConform.SelectedValue = testPackageManage.Check5;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check6))
+                {
+                    drpInstallationCorrectness.SelectedValue = testPackageManage.Check6;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check7))
+                {
+                    drpMarkClearly.SelectedValue = testPackageManage.Check7;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check8))
+                {
+                    drpIsolationOpening.SelectedValue = testPackageManage.Check8;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check9))
+                {
+                    drpConstructionPlanAsk.SelectedValue = testPackageManage.Check9;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check10))
+                {
+                    drpCover.SelectedValue = testPackageManage.Check10;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check11))
+                {
+                    drpMeetRequirements.SelectedValue = testPackageManage.Check11;
+                }
+                if (!string.IsNullOrEmpty(testPackageManage.Check12))
+                {
+                    drpStainlessTestWater.SelectedValue = testPackageManage.Check12;
+                }
+            }
+        }
+        #endregion
+
+
+        #region 清空输入框
+        /// <summary>
+        /// 清空输入框
+        /// </summary>
+        private void SetTextTemp()
+        {
+            this.txtTestPackageNo.Text = string.Empty;
+            this.txtRemark.Text = string.Empty;
+        }
+        #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 试压前条件确认
+        #region 审核检测单
+        /// <summary>
+        /// 审核检测单
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnAudit_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageAuditMenuId, Const.BtnAuditing))
+            {
+                var updateTestPackage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
+                if (updateTestPackage != null)
+                {
+                    if (Count == 0)
+                    {
+                        string isnoHot = BLL.TestPackageEditService.IsExistNoHotHardItem(this.PTP_ID);
+                        if (string.IsNullOrEmpty(isnoHot))
+                        {
+                            string inspectionIsoRate = BLL.TestPackageEditService.InspectionIsoRate(this.PTP_ID);
+                            if (string.IsNullOrEmpty(inspectionIsoRate))
+                            {
+                                updateTestPackage.Check1 = drpInstallationSpecification.SelectedValue;
+                                updateTestPackage.Check2 = drpPressureTest.SelectedValue;
+                                updateTestPackage.Check3 = drpWorkRecord.SelectedValue;
+                                updateTestPackage.Check4 = drpNDTConform.SelectedValue;
+                                updateTestPackage.Check5 = drpHotConform.SelectedValue;
+                                updateTestPackage.Check6 = drpInstallationCorrectness.SelectedValue;
+                                updateTestPackage.Check7 = drpMarkClearly.SelectedValue;
+                                updateTestPackage.Check8 = drpIsolationOpening.SelectedValue;
+                                updateTestPackage.Check9 = drpConstructionPlanAsk.SelectedValue;
+                                updateTestPackage.Check10 = drpCover.SelectedValue;
+                                updateTestPackage.Check11 = drpMeetRequirements.SelectedValue;
+                                updateTestPackage.Check12 = drpStainlessTestWater.SelectedValue;
+                                updateTestPackage.AduditDate = DateTime.Now;
+                                updateTestPackage.Auditer = this.CurrUser.UserId;
+                                BLL.TestPackageEditService.UpdateTestPackage(updateTestPackage);
+                                this.InitTreeMenu();
+                                this.BindGrid();
+                                ShowNotify("保存成功！", MessageBoxIcon.Success);
+                            }
+                            else
+                            {
+                                Alert.ShowInTop(inspectionIsoRate, MessageBoxIcon.Warning);
+                                return;
+                            }
+                        }
+                        else
+                        {
+                            Alert.ShowInTop(isnoHot, MessageBoxIcon.Warning);
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        Alert.ShowInTop("管线未全部通过不允许确认操作！", MessageBoxIcon.Warning);
+                        return;
+                    }
+                }
+                else
+                {
+                    Alert.ShowInTop("请选择要确认的单据！", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            else
+            {
+                Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #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        
+
+        #region  试压包打印
+        /// <summary>
+        ///  试压包打印
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnPrint_Click(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.PTP_ID))
+            {
+                //string reportId = BLL.Const.HJGL_TrustReportId; // 试压包打印  待做模板                             
+                //PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}", reportId, this.PTP_ID, string.Empty, "打印 - ")));
+            }
+            else
+            {
+                ShowNotify("请选择无损委托记录！", MessageBoxIcon.Warning);
+                return;
+            }
+        }
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs
index 9014fa83..775e9d03 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageComplete.aspx.cs
@@ -1,224 +1,323 @@
-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>
-        public string PTP_ID
-        {
-            get
-            {
-                return (string)ViewState["PTP_ID"];
-            }
-            set
-            {
-                ViewState["PTP_ID"] = value;
-            }
-        }
-        #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 加载树装置-单位-工作区
-        /// <summary>
-        /// 加载树
-        /// </summary>
-        private void InitTreeMenu()
-        {
-            this.tvControlItem.Nodes.Clear();
-
-            TreeNode rootNode1 = new TreeNode();
-            rootNode1.NodeID = "1";
-            rootNode1.Text = "建筑工程";
-            rootNode1.CommandName = "建筑工程";
-            this.tvControlItem.Nodes.Add(rootNode1);
-
-            TreeNode rootNode2 = new TreeNode();
-            rootNode2.NodeID = "2";
-            rootNode2.Text = "安装工程";
-            rootNode2.CommandName = "安装工程";
-            rootNode2.Expanded = true;
-            this.tvControlItem.Nodes.Add(rootNode2);
-            var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
-            // 获取当前用户所在单位
-            var currUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId);
-
-            var unitWorkList = (from x in Funs.DB.WBS_UnitWork
-                                where x.ProjectId == this.CurrUser.LoginProjectId
-                                      && x.SuperUnitWork == null && 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();
-            List<Model.WBS_UnitWork> unitWork1 = null;
-            List<Model.WBS_UnitWork> unitWork2 = null;
-
-            // 当前为施工单位，只能操作本单位的数据
-            if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
-            {
-                unitWork1 = (from x in unitWorkList
-                             where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
-                             select x).ToList();
-                unitWork2 = (from x in unitWorkList
-                             where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
-                             select x).ToList();
-            }
-            else
-            {
-                unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
-                unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
-            }
-
-            if (unitWork1.Count() > 0)
-            {
-                foreach (var q in unitWork1)
-                {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
-                    var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
-                    TreeNode tn1 = new TreeNode();
-                    tn1.NodeID = q.UnitWorkId;
-                    tn1.Text = q.UnitWorkName;
-                    tn1.ToolTip = "施工单位：" + u.UnitName;
-                    tn1.CommandName = "单位工程";
-                    rootNode1.Nodes.Add(tn1);
-                    var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
-                    BindNodes(tn1, testPackageUnitList);
-                }
-            }
-            if (unitWork2.Count() > 0)
-            {
-                foreach (var q in unitWork2)
-                {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
-                    var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
-                    TreeNode tn2 = new TreeNode();
-                    tn2.NodeID = q.UnitWorkId;
-                    tn2.Text = q.UnitWorkName;
-                    tn2.ToolTip = "施工单位：" + u.UnitName;
-                    tn2.CommandName = "单位工程";
-                    rootNode2.Nodes.Add(tn2);
-                    var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
-                    BindNodes(tn2, testPackageUnitList);
-                }
-            }
-        }
-        #endregion

        #region 绑定树节点
-        /// <summary>
-        ///  绑定树节点
-        /// </summary>
-        /// <param name="node"></param>
-        private void BindNodes(TreeNode node, List<Model.PTP_TestPackage> testPackageUnitList)
-        {
-            if (node.CommandName == "单位工程")
-            {
-                var dReports = from x in testPackageUnitList
-                               where x.UnitWorkId == node.NodeID
-                               && x.State == Const.TestPackage_Complete
-                               orderby x.TestPackageNo descending
-                               select x;
-                foreach (var item in dReports)
-                {
-                    TreeNode newNode = new TreeNode();
-                    if (!string.IsNullOrEmpty(item.TestPackageNo))
-                    {
-                        newNode.Text = item.TestPackageNo;
-                    }
-                    else
-                    {
-                        newNode.Text = "未知";
-                    }
-                    if (!item.AduditDate.HasValue || string.IsNullOrEmpty(item.Auditer))
-                    {
-                        newNode.Text = "<font color='#FF7575'>" + newNode.Text + "</font>";
-                        node.Text = "<font color='#FF7575'>" + node.Text + "</font>";
-                    }
-                    newNode.NodeID = item.PTP_ID;
-                    newNode.EnableClickEvent = true;
-                    newNode.CommandName = "TestPackage";
-                    node.Nodes.Add(newNode);
-                }
-            }
-        }
-
-        #endregion
-
-        #region 点击TreeView
-        /// <summary>
-        /// 点击TreeView
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
-        {
-            this.PTP_ID = tvControlItem.SelectedNodeID;
-            this.BindGrid();
-        }
-
-        #endregion

-        #region 数据绑定
-        /// <summary>
-        /// 数据绑定
-        /// </summary>
-        private void BindGrid()
-        {
-            this.SetTextTemp();
-            this.PageInfoLoad(); ///页面输入保存信息
-            string strSql = @" SELECT ptpPipe.PT_PipeId, ptpPipe.PTP_ID, ptpPipe.PipelineId, ptpPipe.DesignPress, 
-                               ptpPipe.DesignTemperature, ptpPipe.AmbientTemperature, ptpPipe.TestMedium, 
-                               ptpPipe.TestMediumTemperature, ptpPipe.TestPressure, ptpPipe.HoldingTime,IsoInfo.PipelineCode,testMedium.MediumName
-                               FROM dbo.PTP_PipelineList AS ptpPipe 
-                               LEFT JOIN dbo.HJGL_Pipeline AS IsoInfo ON  ptpPipe.PipelineId = IsoInfo.PipelineId
-							   LEFT JOIN dbo.Base_TestMedium  AS testMedium ON testMedium.TestMediumId = IsoInfo.TestMedium
-                               WHERE  ptpPipe.PTP_ID=@PTP_ID";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID));
-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-            // 2.获取当前分页数据
-            //var table = this.GetPagedDataTable(Grid1, tb1);
-            Grid1.RecordCount = tb.Rows.Count;
-            var table = this.GetPagedDataTable(Grid1, tb);
-            Grid1.DataSource = table;
-            Grid1.DataBind();
-        }
-
-        #region 加载页面输入保存信息
-        /// <summary>
-        /// 加载页面输入保存信息
-        /// </summary>
-        private void PageInfoLoad()
-        {
-            var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
-            if (testPackageManage != null)
-            {
-                this.txtadjustTestPressure.Text = testPackageManage.AdjustTestPressure;
-                this.txtAmbientTemperature.Text = testPackageManage.AmbientTemperature.ToString();
-                this.txtFinishDef.Text = testPackageManage.FinishDef;
-                this.txtHoldingTime.Text = testPackageManage.HoldingTime.ToString();
-                this.txtTestDate.Text = testPackageManage.TestDate?.ToString("yyyy-MM-dd");
-                this.txtTestMediumTemperature.Text = testPackageManage.TestMediumTemperature.ToString();
-            }
-        }
-        #endregion
-
-        #region 清空页面输入信息
-        /// <summary>
-        /// 清空页面输入信息
-        /// </summary>
-        private void SetTextTemp()
-        {
-            this.txtadjustTestPressure.Text = string.Empty;
-            this.txtAmbientTemperature.Text = string.Empty;
-            this.txtFinishDef.Text = string.Empty;
-            this.txtHoldingTime.Text = string.Empty;
-            this.txtTestDate.Text = string.Empty;
-            this.txtTestMediumTemperature.Text = string.Empty;
-        }
-        #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();
        }
-
-        #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, "操作 - ")));
-        }
-    }
}
\ No newline at end of file
+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>
+        public string PTP_ID
+        {
+            get
+            {
+                return (string)ViewState["PTP_ID"];
+            }
+            set
+            {
+                ViewState["PTP_ID"] = value;
+            }
+        }
+        #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 加载树装置-单位-工作区
+        /// <summary>
+        /// 加载树
+        /// </summary>
+        private void InitTreeMenu()
+        {
+            this.tvControlItem.Nodes.Clear();
+
+            TreeNode rootNode1 = new TreeNode();
+            rootNode1.NodeID = "1";
+            rootNode1.Text = "建筑工程";
+            rootNode1.CommandName = "建筑工程";
+            this.tvControlItem.Nodes.Add(rootNode1);
+
+            TreeNode rootNode2 = new TreeNode();
+            rootNode2.NodeID = "2";
+            rootNode2.Text = "安装工程";
+            rootNode2.CommandName = "安装工程";
+            rootNode2.Expanded = true;
+            this.tvControlItem.Nodes.Add(rootNode2);
+            var pUnits = (from x in Funs.DB.Project_ProjectUnit where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
+            // 获取当前用户所在单位
+            var currUnit = pUnits.FirstOrDefault(x => x.UnitId == this.CurrUser.UnitId);
+
+            var unitWorkList = (from x in Funs.DB.WBS_UnitWork
+                                where x.ProjectId == this.CurrUser.LoginProjectId
+                                      && (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();
+            List<Model.WBS_UnitWork> unitWork1 = null;
+            List<Model.WBS_UnitWork> unitWork2 = null;
+
+            // 当前为施工单位，只能操作本单位的数据
+            if (currUnit != null && currUnit.UnitType == Const.ProjectUnitType_2)
+            {
+                unitWork1 = (from x in unitWorkList
+                             where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "1"
+                             select x).ToList();
+                unitWork2 = (from x in unitWorkList
+                             where x.UnitId == this.CurrUser.UnitId && x.ProjectType == "2"
+                             select x).ToList();
+            }
+            else
+            {
+                unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
+                unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
+            }
+
+            if (unitWork1.Count() > 0)
+            {
+                foreach (var q in unitWork1)
+                {
+                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
+                    TreeNode tn1 = new TreeNode();
+                    tn1.NodeID = q.UnitWorkId;
+                    tn1.Text = q.UnitWorkName;
+                    tn1.ToolTip = "施工单位：" + u.UnitName;
+                    tn1.CommandName = "单位工程";
+                    rootNode1.Nodes.Add(tn1);
+                    var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
+                    BindNodes(tn1, testPackageUnitList);
+                }
+            }
+            if (unitWork2.Count() > 0)
+            {
+                foreach (var q in unitWork2)
+                {
+                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
+                    TreeNode tn2 = new TreeNode();
+                    tn2.NodeID = q.UnitWorkId;
+                    tn2.Text = q.UnitWorkName;
+                    tn2.ToolTip = "施工单位：" + u.UnitName;
+                    tn2.CommandName = "单位工程";
+                    rootNode2.Nodes.Add(tn2);
+                    var testPackageUnitList = testPackageLists.Where(x => x.UnitWorkId == q.UnitWorkId).ToList();
+                    BindNodes(tn2, testPackageUnitList);
+                }
+            }
+        }
+        #endregion
+
+        #region 绑定树节点
+        /// <summary>
+        ///  绑定树节点
+        /// </summary>
+        /// <param name="node"></param>
+        private void BindNodes(TreeNode node, List<Model.PTP_TestPackage> testPackageUnitList)
+        {
+            if (node.CommandName == "单位工程")
+            {
+                var dReports = from x in testPackageUnitList
+                               where x.UnitWorkId == node.NodeID
+                               && x.State == Const.TestPackage_Complete
+                               orderby x.TestPackageNo descending
+                               select x;
+                foreach (var item in dReports)
+                {
+                    TreeNode newNode = new TreeNode();
+                    if (!string.IsNullOrEmpty(item.TestPackageNo))
+                    {
+                        newNode.Text = item.TestPackageNo;
+                    }
+                    else
+                    {
+                        newNode.Text = "未知";
+                    }
+                    if (!item.AduditDate.HasValue || string.IsNullOrEmpty(item.Auditer))
+                    {
+                        newNode.Text = "<font color='#FF7575'>" + newNode.Text + "</font>";
+                        node.Text = "<font color='#FF7575'>" + node.Text + "</font>";
+                    }
+                    newNode.NodeID = item.PTP_ID;
+                    newNode.EnableClickEvent = true;
+                    newNode.CommandName = "TestPackage";
+                    node.Nodes.Add(newNode);
+                }
+            }
+        }
+
+        #endregion
+
+        #region 点击TreeView
+        /// <summary>
+        /// 点击TreeView
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            this.PTP_ID = tvControlItem.SelectedNodeID;
+            this.BindGrid();
+        }
+
+        #endregion
+
+        #region 数据绑定
+        /// <summary>
+        /// 数据绑定
+        /// </summary>
+        private void BindGrid()
+        {
+            this.SetTextTemp();
+            this.PageInfoLoad(); ///页面输入保存信息
+            string strSql = @" SELECT ptpPipe.PT_PipeId, ptpPipe.PTP_ID, ptpPipe.PipelineId, ptpPipe.DesignPress, 
+                               ptpPipe.DesignTemperature, ptpPipe.AmbientTemperature, ptpPipe.TestMedium, 
+                               ptpPipe.TestMediumTemperature, ptpPipe.TestPressure, ptpPipe.HoldingTime,IsoInfo.PipelineCode,testMedium.MediumName
+                               FROM dbo.PTP_PipelineList AS ptpPipe 
+                               LEFT JOIN dbo.HJGL_Pipeline AS IsoInfo ON  ptpPipe.PipelineId = IsoInfo.PipelineId
+							   LEFT JOIN dbo.Base_TestMedium  AS testMedium ON testMedium.TestMediumId = IsoInfo.TestMedium
+                               WHERE  ptpPipe.PTP_ID=@PTP_ID";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+            listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID));
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+            // 2.获取当前分页数据
+            //var table = this.GetPagedDataTable(Grid1, tb1);
+            Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        #region 加载页面输入保存信息
+        /// <summary>
+        /// 加载页面输入保存信息
+        /// </summary>
+        private void PageInfoLoad()
+        {
+            var testPackageManage = BLL.TestPackageEditService.GetTestPackageByID(this.PTP_ID);
+            if (testPackageManage != null)
+            {
+                this.txtadjustTestPressure.Text = testPackageManage.AdjustTestPressure;
+                this.txtAmbientTemperature.Text = testPackageManage.AmbientTemperature.ToString();
+                this.txtFinishDef.Text = testPackageManage.FinishDef;
+                this.txtHoldingTime.Text = testPackageManage.HoldingTime.ToString();
+                this.txtTestDate.Text = testPackageManage.TestDate?.ToString("yyyy-MM-dd");
+                this.txtTestMediumTemperature.Text = testPackageManage.TestMediumTemperature.ToString();
+            }
+        }
+        #endregion
+
+        #region 清空页面输入信息
+        /// <summary>
+        /// 清空页面输入信息
+        /// </summary>
+        private void SetTextTemp()
+        {
+            this.txtadjustTestPressure.Text = string.Empty;
+            this.txtAmbientTemperature.Text = string.Empty;
+            this.txtFinishDef.Text = string.Empty;
+            this.txtHoldingTime.Text = string.Empty;
+            this.txtTestDate.Text = string.Empty;
+            this.txtTestMediumTemperature.Text = string.Empty;
+        }
+        #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();
+        }
+
+        #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, "操作 - ")));
+        }
+    }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
index 39de8a00..f2edfc51 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
@@ -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
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs
index 31538cf9..bde54510 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineList.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs
index 391df9dc..dc24c69c 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PreWeldReportAudit.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
index 8dfbfdb0..94daa881 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
index 6c066ef5..45269a07 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
index 8b50d855..851ae848 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx.cs
@@ -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;
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
index 94442632..4b9b613c 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialEdit.aspx.cs
@@ -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
                             {
diff --git a/SGGL/FineUIPro.Web/JDGL/Check/ProgressShow.aspx.cs b/SGGL/FineUIPro.Web/JDGL/Check/ProgressShow.aspx.cs
index cb5b6970..18c5b281 100644
--- a/SGGL/FineUIPro.Web/JDGL/Check/ProgressShow.aspx.cs
+++ b/SGGL/FineUIPro.Web/JDGL/Check/ProgressShow.aspx.cs
@@ -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)
diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.cs
index 0ce9ba2b..166d94ff 100644
--- a/SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.cs
+++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUserSave.aspx.cs
@@ -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))
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index f50b26d3..9fc55c34 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -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/;"/>