diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 1e4add15..98c9e3cf 100644
Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ
diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
index 6ee295b8..9074166b 100644
--- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
@@ -170,7 +170,7 @@ namespace BLL
         public static List<HJGL_Pipeline> GetView_HJGL_Pipelines(HJGL_Pipeline model)
         {
             var db = Funs.DB;
-            var pipelineList =( from x in hJGL_Pipelines
+            var pipelineList =( from x in Funs.DB.HJGL_Pipeline
                                 where 
                                   (string.IsNullOrEmpty(model.ProjectId) || x.ProjectId.Contains(model.ProjectId))
                                && (string.IsNullOrEmpty(model.UnitWorkId) || x.UnitWorkId.Contains(model.UnitWorkId))
diff --git a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
index 56fdfc57..cbe9122f 100644
--- a/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs
@@ -1,4 +1,5 @@
 using BLL;
+using FastReport.Design;
 using FineUIPro.Web.HJGL.WeldingManage;
 using System;
 using System.Collections.Generic;
@@ -88,7 +89,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
@@ -111,7 +112,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
@@ -177,14 +178,15 @@ namespace FineUIPro.Web.HJGL.DataImport
                 e.Node.Nodes.Clear();
                 if (e.Node.CommandName == "单位工程")
                 {
-                    var pipeline = (from x in PipelineService.hJGL_Pipelines
+                    var pipeline = (from x in Funs.DB.HJGL_Pipeline
                                     where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
                                    && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
                                     orderby x.PipelineCode
                                     select x).ToList();
+                    var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x ).ToList();
                     foreach (var item in pipeline)
                     {
-                        var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
+                        var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
                         //var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null && x.WeldingDailyId != null select x).Count();
                         TreeNode newNode = new TreeNode();
                         //if (jotCount > weldJotCount)
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
index 1058c8da..874ee2fa 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
@@ -147,7 +147,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
                 {
                     if (q != null)
                     {
-                        int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count();
+                        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;
@@ -171,8 +171,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines
-                             where   x.UnitWorkId == q.UnitWorkId
+                    int a = (from x in Funs.DB.HJGL_Pipeline
+                             where x.ProjectId == this.CurrUser.LoginProjectId &&  x.UnitWorkId == q.UnitWorkId
                                                         && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
 
                              select x).Count();
@@ -283,14 +283,16 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             e.Node.Nodes.Clear();
             if (e.Node.CommandName == "单位工程")
             {
-                var pipeline = (from x in PipelineService.hJGL_Pipelines
-                                where x.UnitWorkId == e.Node.NodeID
+                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
                            && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
                                 orderby x.PipelineCode
                                 select x).ToList();
+                var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
+
                 foreach (var item in pipeline)
                 {
-                    var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId /*&& x.IsTwoJoint == null*/ select x).Count();
+                    var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId /*&& x.IsTwoJoint == null*/ select x).Count();
                     TreeNode newNode = new TreeNode();
                     newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
                     newNode.NodeID = item.PipelineId;
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
index 65c84030..06c4cb2f 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
@@ -98,7 +98,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
@@ -112,7 +112,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
index 640bfefa..5e8c3031 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
@@ -118,7 +118,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
@@ -132,7 +132,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
index af3431ea..df7d065f 100644
--- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs
@@ -81,7 +81,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" select x).Count();
+                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
@@ -109,7 +109,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" select x).Count();
+                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == "1" select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -142,7 +142,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
         private void BindNodes(TreeNode node)
         { 
             List<Model.HJGL_Pipeline> pipeline = new List<Model.HJGL_Pipeline>();
-            var pipelines = from x in PipelineService.hJGL_Pipelines where x.PipeArea == "1" select x;
+            var pipelines = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId &&  x.PipeArea == "1" select x;
             pipeline = (from x in pipelines
                         where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
                        && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
index 1f405b6c..ee570cef 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
@@ -82,7 +82,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
@@ -106,7 +106,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
@@ -135,16 +135,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         private void BindNodes(TreeNode node)
         {
             List<Model.HJGL_Pipeline> pipeline = new List<Model.HJGL_Pipeline>();
-            pipeline = (from x in PipelineService.hJGL_Pipelines
-                        where  x.UnitWorkId == node.NodeID
+            pipeline = (from x in Funs.DB.HJGL_Pipeline
+                        where x.ProjectId == this.CurrUser.LoginProjectId &&   x.UnitWorkId == node.NodeID
                        && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
                         orderby x.PipelineCode
                         select x).ToList();
+            var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
+
             int pageindex = int.Parse(node.CommandName.Split('|')[0]);
             int pageCount = int.Parse(node.CommandName.Split('|')[1]);
             if (pageindex <= pageCount)
             {
                 pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList();
+
                 foreach (var item in pipeline)
                 {
                     //var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count();
@@ -159,8 +162,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     //    newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
                     //}  
 
-                    var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count();
-                    var AuditCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true && x.AuditDate != null select x).Count();
+                    var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count();
+                    var AuditCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true && x.AuditDate != null select x).Count();
                     TreeNode newNode = new TreeNode();
 
                     if (jotCount == AuditCount) //全部审核
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs
index 9c26b075..acfad345 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs
@@ -171,7 +171,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
                     if (dv[i]["管线号"] != null && !string.IsNullOrEmpty(dv[i]["管线号"].ToString()))
                     {
-                        var pipeline = from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == unitworkId && x.PipelineCode == dv[i]["管线号"].ToString().Trim() select x;
+                        var pipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == unitworkId && x.PipelineCode == dv[i]["管线号"].ToString().Trim() select x;
                         if (pipeline.Count() > 0)
                         {
                             item.PipelineId = pipeline.First().PipelineId;
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
index 3d8aa67c..b35c0e59 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs
@@ -177,7 +177,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             rootNode1.EnableExpandEvent = true;          
             this.tvControlItem.Nodes.Add(rootNode1);
 
-            int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_SHOP select x).Count();
+            int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_SHOP select x).Count();
             if (a > 0)
             {
                 // BindNodes(tn1);
@@ -194,7 +194,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             rootNode2.EnableClickEvent = true;
             rootNode2.EnableExpandEvent = true;
             this.tvControlItem.Nodes.Add(rootNode2);
-            int b = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_FIELD select x).Count();
+            int b = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipelineService.PipeArea_FIELD select x).Count();
             if (b > 0)
             {
                 // BindNodes(tn1);
@@ -215,7 +215,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         void AddTreeNode(string PipeArea , TreeNode node )
         {
             
-            var iso = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipeArea orderby x.PipelineCode select x).ToList();           
+            var iso = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipeArea orderby x.PipelineCode select x).ToList();           
             if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
             {             
                 iso = (from x in iso where x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) orderby x.PipelineCode select x).ToList();
@@ -235,7 +235,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             if (pagenum <= Funs.GetEndPageNumber(Count,pageSize))
             {
                 iso = iso.Skip(pageSize * (pagenum - 1)).Take(pageSize).ToList(); ;
-                var joints = from x in WeldJointService.hJGL_WeldJoints select x;
+                var joints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
                 foreach (var item in iso)
                 {
                     TreeNode newNode = new TreeNode();
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
index 2d9662f4..68f39730 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
@@ -187,17 +187,18 @@ namespace FineUIPro.Web.HJGL.WeldingManage
              
             if (e.Node.CommandName == "单位工程")
             {
-                var pipeline = (from x in BLL.PipelineService.hJGL_Pipelines
-                                where  x.UnitWorkId == e.Node.NodeID  && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
+                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID  && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
                                 orderby x.PipelineCode
                                 select x).ToList();
-               
+                var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
+
                 // var WeldJointlist = (from x in Funs.DB.View_HJGL_WeldJoint where x.UnitWorkId == e.Node.NodeID && x.IsTwoJoint == null select x).ToList();
 
                 foreach (var item in pipeline)
                 {
                     //var jotCount = WeldJointlist.Where(x => x.PipelineId == item.PipelineId).Count();
-                    var jotCount = WeldJointService.hJGL_WeldJoints.Where(x => x.PipelineId == item.PipelineId).Count();
+                    var jotCount = hJGL_WeldJoints.Where(x => x.PipelineId == item.PipelineId).Count();
                     TreeNode newNode = new TreeNode();
                     newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
                     newNode.NodeID = item.PipelineId;
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
index f0b7359d..14b84f56 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
@@ -99,7 +99,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 foreach (var q in unitWork1)
                 {
                      
-                    int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count();
+                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
@@ -122,7 +122,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count();
+                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && x.PipeArea == PipeArea select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -154,8 +154,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             if (e.Node.CommandName == "单位工程")
             {
                 
-                var pipeline = (from x in PipelineService.hJGL_Pipelines
-                                where x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea
+                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea
                                 orderby x.PipelineCode
                                 select x).ToList();
                 if (!string .IsNullOrEmpty (txtPipelineCode.Text.Trim()))
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
index 54399005..8a1568ff 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
@@ -35,9 +35,12 @@
                            <f:TextBox ID="txtPipelineCode" runat="server" Label="管线号" AutoPostBack="true" LabelAlign="Right" OnTextChanged="drpJointAttribute_SelectedIndexChanged"></f:TextBox>
                             <f:ToolbarFill ID="ToolbarFill1" runat="server">
                             </f:ToolbarFill>
-                            <f:Button ID="btnSave" ToolTip="保存" Icon="SystemSave" runat="server"
+                            <f:Button ID="btnSave" ToolTip="保存" Text ="保存" Icon="SystemSave" runat="server"
                                 OnClick="btnSave_Click">
                             </f:Button>
+                            <f:Button ID="btnAccept" Icon="Accept" runat="server" ToolTip="提交" Text="提交"
+                                            OnClick="btnAccept_Click">
+                                        </f:Button>
                         </Items>
                     </f:Toolbar>
                 </Toolbars>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index 5f867f08..e0ae892e 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
@@ -617,12 +617,14 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     if (string.IsNullOrEmpty(errlog))
                     {
                         ShowNotify("保存成功！", MessageBoxIcon.Success);
-                        PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+                        drpJointAttribute_SelectedIndexChanged(null, null);
+                        //PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
                     }
                     else
                     {
                         // string okj = ActiveWindow.GetWriteBackValueReference(newWeldReportMain.WeldingDailyId) + ActiveWindow.GetHidePostBackReference();
                         Alert.ShowInTop("保存成功！" + "焊接明细中" + errlog, "提交结果", MessageBoxIcon.Warning);
+                        drpJointAttribute_SelectedIndexChanged(null, null);
                         // ShowAlert("焊接明细中" + errlog, MessageBoxIcon.Warning);
                     }
                 }
@@ -637,7 +639,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
                 return;
             }
+           
         }
+
+        protected void btnAccept_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+
+        }
+
         #endregion
 
         #region 焊工资质判断
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
index 96d4ccd0..95f10054 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.WeldingProcess.WeldingManage {
-    
-    
-    public partial class WeldReportEdit {
-        
+namespace FineUIPro.Web.WeldingProcess.WeldingManage
+{
+
+
+    public partial class WeldReportEdit
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-        
+
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
-        
+
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-        
+
         /// <summary>
         /// hdItemsString 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdItemsString;
-        
+
         /// <summary>
         /// hdTablerId 控件。
         /// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdTablerId;
-        
+
         /// <summary>
         /// drpJointAttribute 控件。
         /// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpJointAttribute;
-        
+
         /// <summary>
         /// txtPipelineCode 控件。
         /// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPipelineCode;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -110,7 +112,16 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-        
+
+        /// <summary>
+        /// btnAccept 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnAccept;
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtWeldingDailyCode 控件。
         /// </summary>
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWeldingDailyCode;
-        
+
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-        
+
         /// <summary>
         /// drpUnitWork 控件。
         /// </summary>
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitWork;
-        
+
         /// <summary>
         /// txtWeldingDate 控件。
         /// </summary>
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtWeldingDate;
-        
+
         /// <summary>
         /// txtTabler 控件。
         /// </summary>
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTabler;
-        
+
         /// <summary>
         /// txtTableDate 控件。
         /// </summary>
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtTableDate;
-        
+
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRemark;
-        
+
         /// <summary>
         /// lbAmount 控件。
         /// </summary>
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbAmount;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// lbPipeArea 控件。
         /// </summary>
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbPipeArea;
-        
+
         /// <summary>
         /// drpCoverWelderId 控件。
         /// </summary>
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCoverWelderId;
-        
+
         /// <summary>
         /// drpBackingWelderId 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
index 9890cd19..e1e8731e 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
@@ -71,7 +71,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
@@ -94,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
@@ -124,14 +124,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             e.Node.Nodes.Clear();
             if (e.Node.CommandName == "单位工程")
             {
-                var pipeline = (from x in PipelineService.hJGL_Pipelines
-                                where  x.UnitWorkId == e.Node.NodeID
+                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
                            && x.PipelineCode.Contains(txtPipelineCode.Text.Trim())
                                 orderby x.PipelineCode
                                 select x).ToList();
+                var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList();
+
                 foreach (var item in pipeline)
                 {
-                    var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
+                    var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
                     //var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null && x.WeldingDailyId != null select x).Count();
 
                     //if (jotCount > weldJotCount)
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
index 46960c8f..b71c1534 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
@@ -83,7 +83,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count();
+                    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;