Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

DataBase/版本日志/SGGLDB_V2022-11-23.sql

@@ -0,0 +1,6 @@
+alter table  [dbo].[HJGL_MaterialCodeLib] alter column  [MaterialName] nvarchar(300)
+alter table  [dbo].[HJGL_MaterialCodeLib] alter column  MaterialSpec nvarchar(300)
+alter table  [dbo].[HJGL_MaterialCodeLib] alter column  MaterialMade nvarchar(300)
+alter table  [dbo].[HJGL_MaterialCodeLib] alter column  [MaterialDef] nvarchar(3000)
+alter table  [dbo].[HJGL_MaterialCodeLib] alter column  PipeGrade nvarchar(300)
+alter table  [dbo].[HJGL_MaterialCodeLib] alter column  MaterialUnit nvarchar(300)

DataBase/版本日志/SGGLDB_V2022-11-24.sql

@@ -0,0 +1 @@
+alter table [dbo].[HJGL_MaterialManage] alter column [SpecificationAndModel] nvarchar(1000)

SGGL/BLL/Common/Funs.cs

@@ -1022,11 +1022,17 @@ namespace BLL
                 T entity = new T();
                 foreach (PropertyInfo p in pArray)
                 {
+                    if (string.IsNullOrEmpty(row[p.Name].ToString()))
+                    {
+                        p.SetValue(entity, "", null);
+                        continue;
+                    }
                     if (row[p.Name] is Int64)
                     {
                         p.SetValue(entity, Convert.ToInt32(row[p.Name]), null);
                         continue;
                     }
+                   
                     p.SetValue(entity, row[p.Name], null);
                 }
                 list.Add(entity);

SGGL/BLL/HJGL/BaseInfo/MaterialCodeLibService.cs

@@ -1,6 +1,7 @@
 namespace BLL
 {
     using Model;
+    using System.Collections.Generic;
     using System.Linq;
     public static class MaterialCodeLibService
     {
@@ -12,7 +13,11 @@
         {
             return Funs.DB.HJGL_MaterialCodeLib.FirstOrDefault(e => e.MaterialCode == materialCode);
         }
-
+        public static List<Model.HJGL_MaterialCodeLib> GetMaterialCodeLibList()
+        {
+            var q = (from x in Funs.DB.HJGL_MaterialCodeLib select x).ToList();
+            return q;
+        }
         /// <summary>
         /// 增加材料库信息
         /// </summary>
@@ -34,7 +39,12 @@
             db.HJGL_MaterialCodeLib.InsertOnSubmit(newCodeLib);
             db.SubmitChanges();
         }
-
+        public static void AddBulkMaterialCodeLib(List<Model.HJGL_MaterialCodeLib> codeLib)
+        {
+            Model.SGGLDB db = Funs.DB;
+            db.HJGL_MaterialCodeLib.InsertAllOnSubmit(codeLib);
+            db.SubmitChanges();
+        }
         /// <summary>
         /// 修改材料库信息 
         /// </summary>

SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs

@@ -9,6 +9,22 @@ namespace BLL
 {
     public class HJGL_MaterialService
     {
+        /// <summary>
+        /// 工程预制库存
+        /// </summary>
+        public static List<Model.MaterialStockItem> materialStockItems_SHOP
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 现场安装库存
+        /// </summary>
+        public static List<Model.MaterialStockItem> materialStockItems_FIELD
+        {
+            get;
+            set;
+        }
         /// <summary>
         /// 获取材料信息
         /// </summary>
@@ -96,7 +112,6 @@ namespace BLL
                                 mat.MaterialCode,
                                 lib.MaterialName,
                                 lib.MaterialSpec,
-                                lib.MaterialMade,
                                 lib.MaterialUnit,
                                 sum( mat.Num)+ISNULL( aa.Num,0) as MaterialNum
                                 from HJGL_MaterialManage mat
@@ -125,7 +140,6 @@ namespace BLL
                                 mat.MaterialCode,
                                 lib.MaterialName,
                                 lib.MaterialSpec,
-                                lib.MaterialMade,
                                 lib.MaterialUnit,
                                 sum( mat.Num)+ISNULL( aa.Num,0) as MaterialNum
                                 from Material_Material mat
@@ -240,12 +254,30 @@ namespace BLL
                 if (q != null && q.Count() > 0)  //判断管线是否有关联材料 
                 {
                     var pipemodel = BLL.PipelineService.GetPipelineByPipelineId(pipelineid);
-                    List<Model.MaterialStockItem> list = GetMaterialStockItems(projectid, pipemodel.PipeArea);
+                    List<Model.MaterialStockItem> materialStockItems = new List<Model.MaterialStockItem>();
-                    if (list != null && list.Count > 0)   //判断是否有库存信息
+                    if (pipemodel.PipeArea==PipelineService.PipeArea_SHOP)
+                    {
+                        if (HJGL_MaterialService.materialStockItems_SHOP.Count == 0)
+                        {
+                            HJGL_MaterialService.materialStockItems_SHOP = GetMaterialStockItems(projectid, pipemodel.PipeArea);
+                        }
+                        materialStockItems = materialStockItems_SHOP;
+                    }
+                    else if (pipemodel.PipeArea == PipelineService.PipeArea_FIELD)
+                    {
+                        if(HJGL_MaterialService.materialStockItems_FIELD.Count == 0)
+                        {
+                            HJGL_MaterialService.materialStockItems_FIELD = GetMaterialStockItems(projectid, pipemodel.PipeArea);
+                        }
+                        materialStockItems = materialStockItems_FIELD;
+                    }
+                    
+                    //List<Model.MaterialStockItem> materialStockItems = GetMaterialStockItems(projectid, pipemodel.PipeArea);
+                    if (materialStockItems != null && materialStockItems.Count > 0)   //判断是否有库存信息
                     {
                         foreach (var item in q)
                         {
-                            var StockMater = list.Where(x => x.MaterialCode == item.MaterialCode).FirstOrDefault();
+                            var StockMater = materialStockItems.Where(x => x.MaterialCode == item.MaterialCode).FirstOrDefault();
                             if (StockMater != null) //判断该材料是否存在库存  
                             {
                                 var StockNum = StockMater.MaterialNum;

SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs

@@ -93,7 +93,7 @@ namespace BLL
                 {
                     model.PipelineId = PipelineId;
                     model.PipelineComponentCode = model_mat.PrefabricatedComponents;
-                    model.DrawingName = model_mat.PrefabricatedComponents.Substring(0, model_mat.PrefabricatedComponents.LastIndexOf('-'));   
+                    model.DrawingName = model_mat.PrefabricatedComponents.Substring(0, model_mat.PrefabricatedComponents.LastIndexOf('-')).Replace("\"", "");   
                     model.State = state_0;
                     UpdatePipelineComponent(model);
                 }
@@ -103,7 +103,7 @@ namespace BLL
                     model.PipelineComponentId = SQLHelper.GetNewID();
                     model.PipelineId = PipelineId;
                     model.PipelineComponentCode = model_mat.PrefabricatedComponents;
-                    model.DrawingName = model_mat.PrefabricatedComponents.Substring(0, model_mat.PrefabricatedComponents.LastIndexOf('-'));
+                    model.DrawingName = model_mat.PrefabricatedComponents.Substring(0, model_mat.PrefabricatedComponents.LastIndexOf('-')).Replace("\"", "");
                     model.State = state_0;
                     AddPipelineComponent(model);
                 }

SGGL/BLL/HJGL/WeldingManage/PipelineService.cs

@@ -24,7 +24,13 @@ namespace BLL
         /// 现场安装
         /// </summary>
         public const string  PipeArea_FIELD = "2";
-
+        public static List<Model.HJGL_Pipeline> hJGL_Pipelines
+        {
+             
+                get;
+                set;
+            
+        }
         /// <summary>
         /// 实际日期类型
         /// </summary>
@@ -54,7 +60,11 @@ namespace BLL
             list[1] = new ListItem("现场安装", PipeArea_FIELD);
             return list;
         }
-
+        public static void RestPipelineAndJoints(string projectid )
+        {
+            PipelineService.hJGL_Pipelines = PipelineService.GetPipelinesByProjectId(projectid);
+            WeldJointService.hJGL_WeldJoints = WeldJointService.GetWeldJointByProjectid(projectid);
+        }
         /// <summary>
         /// 根据管线ID获取管线信息
         /// </summary>
@@ -65,11 +75,7 @@ namespace BLL
             return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineId == pipelineId);
         }
         public static void GetStateByPipelineId(string pipelineId)
-        {//< f:ListItem Value = "0" Text = "未开始" />
+        {
-        //                                < f:ListItem Value = "1" Text = "未开始且延误" />
-        //                                < f:ListItem Value = "2" Text = "开始" />
-        //                                < f:ListItem Value = "3" Text = "已开始且延误" />
-        //                                < f:ListItem Value = "4" Text = "完成" />
             var mdoel = GetPipelineByPipelineId(pipelineId);
             var PlanStartDate = mdoel.PlanStartDate;
             var PlanEndDate = mdoel.PlanEndDate;
@@ -161,18 +167,18 @@ namespace BLL
         {
             return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineCode == pipelineCode);
         }
-        public static List<View_HJGL_Pipeline> GetView_HJGL_Pipelines(View_HJGL_Pipeline  model)
+        public static List<HJGL_Pipeline> GetView_HJGL_Pipelines(HJGL_Pipeline model)
         {
             var db = Funs.DB;
-            var pipelineList =( from x in db.View_HJGL_Pipeline
+            var pipelineList =( from x in hJGL_Pipelines
-                               where 
+                                where 
                                   (string.IsNullOrEmpty(model.ProjectId) || x.ProjectId.Contains(model.ProjectId))
                                && (string.IsNullOrEmpty(model.UnitWorkId) || x.UnitWorkId.Contains(model.UnitWorkId))
                                && (string.IsNullOrEmpty(model.PipelineCode) || x.PipelineCode.Contains(model.PipelineCode))
                                && (string.IsNullOrEmpty(model.SingleName) || x.SingleName.Contains(model.SingleName))
                                && (string.IsNullOrEmpty(model.DesignPress) || x.DesignPress.Contains(model.DesignPress))
-                               && (string.IsNullOrEmpty(model.MaterialCode) || x.MaterialCode.Contains(model.MaterialCode))
+                                /* && (string.IsNullOrEmpty(model.MaterialCode) || x.MaterialCode.Contains(model.MaterialCode))*/
-                               select x).ToList();
+                                select x).ToList();
             if (model.IsFinished!=null)
             {
                 if (model.IsFinished==true)
@@ -200,6 +206,17 @@ namespace BLL
             return q;
         }
         /// <summary>
+        /// 根据项目获取所有管线
+        /// </summary>
+        /// <param name="ProjectId"></param>
+        /// <returns></returns>
+        public static List<Model.HJGL_Pipeline> GetPipelinesByProjectId(string ProjectId)
+        {
+
+            var q = Funs.DB.HJGL_Pipeline.Where(e => e.ProjectId == ProjectId).ToList();
+            return q;
+        }
+        /// <summary>
         /// 根据管线ID获取管线信息
         /// </summary>
         /// <param name="pipelineName"></param>
@@ -385,10 +402,28 @@ namespace BLL
             }
         }
 
-        /// <summary>
+        public static bool IsExistPipelineCode(string pipelineCode, string unitWorkId)
-        /// 添加作业管线
+        {
-        /// </summary>
+            Model.SGGLDB db = Funs.DB;
-        /// <param name="pipeline"></param>
+            Model.HJGL_Pipeline q = null;
+            q = Funs.DB.HJGL_Pipeline.FirstOrDefault(x => x.PipelineCode == pipelineCode && x.UnitWorkId == unitWorkId);                 
+            if (q != null)
+            {
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        public static HJGL_Pipeline GetPipelineByCode(string pipelineCode, string unitWorkId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HJGL_Pipeline q = null;
+            q = Funs.DB.HJGL_Pipeline.FirstOrDefault(x => x.PipelineCode == pipelineCode && x.UnitWorkId == unitWorkId);
+            return q;
+        }
+         
         public static void AddPipeline(Model.HJGL_Pipeline pipeline)
         {
             Model.SGGLDB db = Funs.DB;

SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs

@@ -1,11 +1,21 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Web;
 
 namespace BLL
 {
     public static class WeldJointService
     {
+        public static List<Model.HJGL_WeldJoint>  hJGL_WeldJoints
+        {
+
+            get;
+            set;
+
+        }
         /// <summary>
         /// 根据焊口Id获取焊口信息
         /// </summary>
@@ -59,6 +69,15 @@ namespace BLL
             var q = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == PipelineId  select x).ToList();
             return q;
         }
+
+        public static Model.HJGL_WeldJoint GetWeldJointsByWeldJointCode(string PipelineId, string WeldJointCode)
+        { 
+            var q=(from x in Funs.DB.HJGL_WeldJoint where x.PipelineId==PipelineId && x.WeldJointCode==WeldJointCode select x ).FirstOrDefault();
+        
+            return q;
+        }
+
+
         /// <summary>
         /// 添加
         /// </summary>
@@ -312,6 +331,26 @@ namespace BLL
             Model.SGGLDB db = Funs.DB;
             return db.View_HJGL_WeldJoint.FirstOrDefault(e => e.WeldJointId == weldJointId);
         }
+        public static List<Model.HJGL_WeldJoint> GetWeldJointByUnitworkId(string UnitWorkId)
+        {
+            Model.SGGLDB db = Funs.DB;
+            var q = (from x in db.HJGL_WeldJoint
+                    join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId into tt
+                    from g in tt.DefaultIfEmpty()
+                    where g.UnitWorkId == UnitWorkId 
+                     select x).ToList();
+
+            return q;
+        }
+        public   static   List<Model.HJGL_WeldJoint> GetWeldJointByProjectid(string ProjectId)
+        {
+            Model.SGGLDB db = Funs.DB;
+
+            var q = (from x in db.HJGL_WeldJoint
+                     where x.ProjectId == ProjectId
+                     select x).ToList();
+            return q;
+         }
 
         /// <summary>
         /// 根据焊口Id获取插入焊口数

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -102,8 +102,8 @@
     <Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="MiniExcel, Version=1.26.5.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="MiniExcel, Version=1.29.0.0, Culture=neutral, PublicKeyToken=e7310002a53eac39, processorArchitecture=MSIL">
-      <HintPath>..\packages\MiniExcel.1.26.5\lib\net45\MiniExcel.dll</HintPath>
+      <HintPath>..\packages\MiniExcel.1.29.0\lib\net45\MiniExcel.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>

SGGL/FineUIPro.Web/HJGL/BaseInfo/MaterialCodeLibIn.aspx.cs

@@ -85,7 +85,8 @@ namespace FineUIPro.Web.HJGL.BaseInfo
             string message = string.Empty;
             errorInfos = string.Empty;
             List<HJGL_MaterialCodeLib> codeLib = new List<HJGL_MaterialCodeLib>();
-
+            List<HJGL_MaterialCodeLib> codeLib_update = new List<HJGL_MaterialCodeLib>();
+            var materialcodelist =MaterialCodeLibService.GetMaterialCodeLibList();  
             if (this.fuAttachUrl.HasFile == false)
             {
                 ShowNotify("请选择Excel文件!", MessageBoxIcon.Warning);
@@ -155,7 +156,17 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                     //= SQLHelper.GetNewID(typeof(Model.Editor_CostReport));
                     if (!codeLib.Select(x => x.MaterialCode).Contains(item.MaterialCode))
                     {
-                        codeLib.Add(item);
+ 
+                        if (materialcodelist.Select(x => x.MaterialCode).Contains(item.MaterialCode))
+                        {
+                            codeLib_update.Add(item);
+                        }
+                        else
+                        {
+                            codeLib.Add(item);
+
+                        }
+
                     }
 
                     #endregion
@@ -173,8 +184,41 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                 Alert.ShowInTop(errorInfos, MessageBoxIcon.Warning);
                 return;
             }
+            codeLib = (from x in codeLib 
+                    select new HJGL_MaterialCodeLib
+                    {
+                        MaterialCode=x.MaterialCode,
+                        MaterialDef=x.MaterialDef,
+                        MaterialSpec=x.MaterialSpec,
+                        MaterialUnit=x.MaterialUnit,
+                        MaterialName=x.MaterialName,
 
-            foreach (var item in codeLib)
+                    }).DistinctBy(temp=> new 
+                    {
+                        temp.MaterialCode,
+                        temp.MaterialDef,
+                        temp.MaterialSpec,
+                        temp.MaterialUnit,
+                        temp.MaterialName
+                    }).ToList();
+            codeLib_update = (from x in codeLib_update
+                              select new HJGL_MaterialCodeLib
+                       {
+                           MaterialCode = x.MaterialCode,
+                           MaterialDef = x.MaterialDef,
+                           MaterialSpec = x.MaterialSpec,
+                           MaterialUnit = x.MaterialUnit,
+                           MaterialName = x.MaterialName,
+
+                       }).DistinctBy(temp => new
+                       {
+                           temp.MaterialCode,
+                           temp.MaterialDef,
+                           temp.MaterialSpec,
+                           temp.MaterialUnit,
+                           temp.MaterialName
+                       }).ToList();
+            foreach (var item in codeLib_update)
             {
                 var mewCostReport = BLL.MaterialCodeLibService.GetMaterialCodeLib(item.MaterialCode);
                 if (mewCostReport == null)
@@ -186,7 +230,7 @@ namespace FineUIPro.Web.HJGL.BaseInfo
                     BLL.MaterialCodeLibService.UpdateMaterialCodeLib(item);
                 }
             }
-
+            MaterialCodeLibService.AddBulkMaterialCodeLib(codeLib);
             ShowNotify("数据导入成功!", MessageBoxIcon.Success);
             PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
 

SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx

@@ -98,7 +98,7 @@
                                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="工厂预制"  
                                                     EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipeLineMatId"
                                                     EnableColumnLines="true" DataIDField="PipeLineMatId" AllowSorting="true"
-                                                    SortField="PipeLineMatId" SortDirection="ASC" OnSort="Grid1_Sort"
+                                                    SortField="PrefabricatedComponents" SortDirection="ASC" OnSort="Grid1_Sort"
                                                     EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
                                                     <Columns>
                                                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
@@ -218,7 +218,12 @@
             EnableMaximize="true" Target="Top" EnableResize="false" runat="server" OnClose="Window5_Close"
             IsModal="true" Width="800px" Height="560px">
         </f:Window>
-
+        <f:Menu ID="Menu1" runat="server">
+            <f:MenuButton ID="btnDelMatGrid1"  OnClick="btnDelMatGrid1_Click" EnablePostBack="true"
+                ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
+                Text="删除" Icon="Delete">
+            </f:MenuButton>
+        </f:Menu>
         <f:Menu ID="Menu2" runat="server">
             <f:MenuButton ID="btnDelMat" OnClick="btnDelMat_Click" EnablePostBack="true"
                 ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server"
@@ -228,6 +233,7 @@
  
     </form>
     <script type="text/javascript">
+        var menuID1 = '<%= Menu1.ClientID %>';
         var menuID2 = '<%= Menu2.ClientID %>';
         // 返回false，来阻止浏览器右键菜单
 
@@ -236,7 +242,7 @@
             return false;
         }
         function onRowContextMenu1(event, rowId) {
-            F(menuID2).show();  //showAt(event.pageX, event.pageY);
+            F(menuID1).show();  //showAt(event.pageX, event.pageY);
             return false;
         }
         function onGridDataLoad(event) {

SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.cs

@@ -1,4 +1,5 @@
 using BLL;
+using FineUIPro.Web.HJGL.WeldingManage;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -87,7 +88,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             {
                 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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
@@ -110,7 +111,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             {
                 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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -171,33 +172,38 @@ namespace FineUIPro.Web.HJGL.DataImport
 
         protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
         {
-            e.Node.Nodes.Clear();
+            if (e.Node.Nodes[0].NodeID == "加载管线...")
-            if (e.Node.CommandName == "单位工程")
             {
-                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                e.Node.Nodes.Clear();
-                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
+                if (e.Node.CommandName == "单位工程")
-                               && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
-                                orderby x.PipelineCode
-                                select x).ToList();
-                foreach (var item in pipeline)
                 {
-                    var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
+                    var pipeline = (from x in PipelineService.hJGL_Pipelines
-                    //var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null && x.WeldingDailyId != null select x).Count();
+                                    where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
-                    TreeNode newNode = new TreeNode();
+                                   && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
-                    //if (jotCount > weldJotCount)
+                                    orderby x.PipelineCode
-                    //{
+                                    select x).ToList();
-                    //    newNode.Text = "<font color='#EE0000'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
+                    foreach (var item in pipeline)
-                    //}
+                    {
-                    //else
+                        var jotCount = (from x in WeldJointService.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();
-                    //    newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
+                        TreeNode newNode = new TreeNode();
-                    //}
+                        //if (jotCount > weldJotCount)
-                    newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
+                        //{
-                    newNode.NodeID = item.PipelineId;
+                        //    newNode.Text = "<font color='#EE0000'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
-                    newNode.EnableClickEvent = true;
+                        //}
-                    e.Node.Nodes.Add(newNode);
+                        //else
+                        //{
+                        //    newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
+                        //}
+                        newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
+                        newNode.NodeID = item.PipelineId;
+                        newNode.EnableClickEvent = true;
+                        e.Node.Nodes.Add(newNode);
+                    }
                 }
+
             }
+           
         }
 
 
@@ -214,8 +220,8 @@ namespace FineUIPro.Web.HJGL.DataImport
                 if (tvControlItem.SelectedNode.CommandName== "单位工程")
                 {
                     this.hdUnitWorkId.Text=tvControlItem.SelectedNode.NodeID.ToString();
-                    this.BindGrid1("", this.hdUnitWorkId.Text);
+                    //this.BindGrid1("", this.hdUnitWorkId.Text);
-                    this.BindGrid2("", this.hdUnitWorkId.Text);
+                    //this.BindGrid2("", this.hdUnitWorkId.Text);
 
                 }
                 else
@@ -261,7 +267,7 @@ namespace FineUIPro.Web.HJGL.DataImport
             List<SqlParameter> listStr = new List<SqlParameter>();
             if (!string.IsNullOrEmpty(pipelineId))
             {
-                strSql += " and pipe.PipelineId=@PipelineId ";
+                strSql += " and pipe.PipelineId=@PipelineId order by PrefabricatedComponents";
                 listStr.Add(new SqlParameter("@PipelineId", pipelineId));
 
             }
@@ -430,6 +436,32 @@ namespace FineUIPro.Web.HJGL.DataImport
                 ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
             }
         }
+        protected void btnDelMatGrid1_Click(object sender, EventArgs e)
+        {
+            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldJointMenuId, Const.BtnDelete))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 0)
+                {
+                    Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                    return;
+                }
+
+                foreach (string rowID in Grid1.SelectedRowIDArray)
+                {
+
+                    BLL.PipelineMatService.DeletePipeLineMat(rowID);
+
+                    ShowNotify("删除成功！", MessageBoxIcon.Success);
+
+                }
+
+                  //this.BindGrid1(this.Grid1.SelectedRowID);
+            }
+            else
+            {
+                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+            }
+        }
         #endregion
 
         #endregion
@@ -860,5 +892,7 @@ namespace FineUIPro.Web.HJGL.DataImport
         {
         }
         #endregion
+
+        
     }
 }

SGGL/FineUIPro.Web/HJGL/DataImport/MaterialInformation.aspx.designer.cs

@@ -284,6 +284,24 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.Window Window5;
 
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
+
+        /// <summary>
+        /// btnDelMatGrid1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnDelMatGrid1;
+
         /// <summary>
         /// Menu2 控件。
         /// </summary>

SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs

@@ -145,7 +145,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             {
                 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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where   x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
@@ -168,8 +168,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             {
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in Funs.DB.HJGL_Pipeline
+                    int a = (from x in PipelineService.hJGL_Pipelines
-                             where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId
+                             where   x.UnitWorkId == q.UnitWorkId
                                                         && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
 
                              select x).Count();
@@ -280,24 +280,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             e.Node.Nodes.Clear();
             if (e.Node.CommandName == "单位工程")
             {
-                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                var pipeline = (from x in PipelineService.hJGL_Pipelines
-                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
+                                where x.UnitWorkId == e.Node.NodeID
                            && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
                                 orderby x.PipelineCode
                                 select x).ToList();
                 foreach (var item in pipeline)
                 {
-                    var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId /*&& x.IsTwoJoint == null*/ select x).Count();
+                    var jotCount = (from x in WeldJointService.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)
-                    //{
-                    //    newNode.Text = "<font color='#EE0000'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
-                    //}
-                    //else
-                    //{
-                    //    newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
-                    //}
                     newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
                     newNode.NodeID = item.PipelineId;
                     newNode.CommandName = "管线";

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 Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  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 Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -187,7 +187,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
 
           //  SqlParameter[] parameter = listStr.ToArray();
           //  DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-            Model.View_HJGL_Pipeline view_HJGL_Pipeline = new Model.View_HJGL_Pipeline();
+            Model.HJGL_Pipeline view_HJGL_Pipeline = new Model.HJGL_Pipeline();
             view_HJGL_Pipeline.ProjectId = this.CurrUser.LoginProjectId;
             view_HJGL_Pipeline.UnitWorkId = this.tvControlItem.SelectedNodeID;
             view_HJGL_Pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
@@ -212,7 +212,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
 
         }
         #endregion
-        private void get3DParmeter_pipeline(List<View_HJGL_Pipeline> view_HJGL_Pipelines )
+        private void get3DParmeter_pipeline(List<HJGL_Pipeline> view_HJGL_Pipelines )
         {
             if (view_HJGL_Pipelines.Any())
             {

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx

@@ -94,12 +94,13 @@
                             </Toolbars>
                             <Items>
                                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管线信息"  ForceFit="true"
-                                    EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
+                                    EnableCollapse="false" runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
                                     AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId"
-                                    AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true"
+                                    AllowSorting="true"   OnSort="Grid1_Sort" EnableCheckBoxSelect="true" SortDirection="PipelineCode"
-                                    AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
+                                    AllowPaging="true"  OnPageIndexChange="Grid1_PageIndexChange"
                                     OnRowClick="Grid1_RowClick"   EnableRowClickEvent="true"
-                                    EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick">
+                                    EnableTextSelection="True" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick"
+                                    IsDatabasePaging="true" PageSize="200" EnableBigDataRowTip="false"   EnableBigData="true"  IsFluid="true"  >
                                     <Columns>
                                         <f:RowNumberField EnablePagingNumber="true" HeaderText="序号"
                                             Width="60px" HeaderTextAlign="Center" TextAlign="Center" />
@@ -121,7 +122,7 @@
                                         </f:TemplateField>
                                     </Columns>
 
-                                    <PageItems>
+                                    <%--<PageItems>
                                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
                                         </f:ToolbarSeparator>
                                         <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
@@ -134,7 +135,7 @@
                                             <f:ListItem Text="25" Value="25" />
                                             <f:ListItem Text="所有行" Value="10000" />
                                         </f:DropDownList>
-                                    </PageItems>
+                                    </PageItems>--%>
                                 </f:Grid>
                             </Items>
                         </f:Panel>

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs

@@ -1,4 +1,5 @@
 using BLL;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -11,6 +12,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
       
     public partial class PipelingDivide : PageBase
     {
+        public static List<Model.HJGL_Pipeline> view_HJGL_Pipelines =new List<Model.HJGL_Pipeline>();
         public decimal PipelineComplete
         {
             get
@@ -50,7 +52,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
 
             if (!IsPostBack)
             {
-                this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
+               // this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
                 this.InitTreeMenu();//加载树
                 PipelineComplete = 0;
                 PipelineNOComplete = 0;
@@ -116,7 +118,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
@@ -130,7 +132,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -152,6 +154,16 @@ namespace FineUIPro.Web.HJGL.PreDesign
         protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
         {
             this.BindGrid();
+            var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP);
+            if (q.Any())
+            {
+                List<string> listpipecode = new List<string>();
+                foreach (var item in q)
+                {
+                    listpipecode.Add("/" + item.PipelineCode);
+                }
+                Line_No = string.Join(",", listpipecode);
+            }
             Model.Parameter3D parameter3D = new Model.Parameter3D();
             Model.ColorModel colorModel = new Model.ColorModel();
             colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
@@ -173,33 +185,25 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </summary>
         private void BindGrid()
         {
-            
+            PipelineService.RestPipelineAndJoints(this.CurrUser.LoginProjectId);
-            Model.View_HJGL_Pipeline view_HJGL_Pipeline = new Model.View_HJGL_Pipeline();
+            Model.HJGL_Pipeline view_HJGL_Pipeline = new Model.HJGL_Pipeline();
             view_HJGL_Pipeline.ProjectId = this.CurrUser.LoginProjectId;
             view_HJGL_Pipeline.UnitWorkId = this.tvControlItem.SelectedNodeID;
             view_HJGL_Pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
             view_HJGL_Pipeline.SingleName = this.txtSingleName.Text.Trim();
             view_HJGL_Pipeline.DesignPress=this.txtDesignPress.Text.Trim();
-            view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim();
+           // view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim();
             var list = BLL.PipelineService.GetView_HJGL_Pipelines(view_HJGL_Pipeline);
-            var q = list.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP );
+            view_HJGL_Pipelines = list;                   
-            var q2 = list.Where(x => x.PipeArea == PipelineService.PipeArea_FIELD );
-            if (q.Any())
-            {
-                List<string> listpipecode = new List<string>();
-                foreach (var item in q)
-                {
-                    listpipecode.Add("/" + item.PipelineCode);
-                }
-                Line_No = string.Join(",", listpipecode);
-            }
-           
-            PipelineComplete = q.Count();
-            PipelineNOComplete = q2.Count();
             // 2.获取当前分页数据
             Grid1.RecordCount = list.Count();
-            //list = GetFilteredTable(Grid1.FilteredData, list);
+ 
-            var table = this.GetPagedDataTable(Grid1, list);
+            // 2.获取当前分页数据
+           
+            // 3.绑定到Grid
+  
+            
+             var table = this.GetPagedDataTable(Grid1, list);
             Grid1.DataSource = table;
             Grid1.DataBind();
         }
@@ -241,7 +245,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// <param name="e"></param>
         protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
         {
-            Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+          //  Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
             BindGrid();
         }
         #endregion
@@ -325,7 +329,11 @@ namespace FineUIPro.Web.HJGL.PreDesign
         #region 按钮事件
         protected void btnGetChart_Click(object sender, EventArgs e)
         {
-            
+            var q = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP);
+            var q2 = view_HJGL_Pipelines.Where(x => x.PipeArea == PipelineService.PipeArea_FIELD);
+            PipelineComplete = q.Count();
+            PipelineNOComplete = q2.Count();
+
             PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("PipelingDivideChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNOComplete, "编辑 - ")));
 
         }

SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs

@@ -239,33 +239,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label txt;
 
-        /// <summary>
-        /// ToolbarSeparator1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-
-        /// <summary>
-        /// ToolbarText1 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.ToolbarText ToolbarText1;
-
-        /// <summary>
-        /// ddlPageSize 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList ddlPageSize;
-
         /// <summary>
         /// Window1 控件。
         /// </summary>

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs

@@ -77,7 +77,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 foreach (var q in unitWork1)
                 {
-                    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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  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;
@@ -94,7 +94,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
             {
                 foreach (var q in unitWork2)
                 {
-                    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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  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;
@@ -116,7 +116,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 Funs.DB.HJGL_Pipeline where x.PipeArea == "1" select x;
+            var pipelines = from x in PipelineService.hJGL_Pipelines where 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())

SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipelineQRCodeIn.aspx.cs

@@ -150,7 +150,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             Model.ResponeData responeData = new Model.ResponeData();
 
-            string result = string.Empty;
+            //string result = string.Empty;
+            List<string> result = new List<string>  () ;
             int ic, ir;
             ic = pds.Columns.Count;
             ir = pds.Rows.Count;
@@ -175,39 +176,41 @@ namespace FineUIPro.Web.HJGL.PreDesign
 
                     if (string.IsNullOrEmpty(pipelinecode))
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|";
+                        //result += "第" + (i + 2).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|";
+                        result.Add("第" + (i + 2).ToString() + "行," + "管线号" + "," + "此项为必填项！");
                     }
                     else
                     {
                         pipeline = getPipeline.FirstOrDefault(x => x.PipelineCode == pipelinecode);
                         if (pipeline == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "不存在此管线号" + "|";
+                            //result += "第" + (i + 2).ToString() + "行," + "不存在此管线号" + "|";
-
+                            result.Add("不存在此管线号-"+ pipelinecode);
                             continue;
                         }
                     }
                     if (string.IsNullOrEmpty(PipelineComponentCode))
                     {
-                        result += "第" + (i + 2).ToString() + "行," + "预制组件" + "," + "此项为必填项！" + "|";
+                        //result += "第" + (i + 2).ToString() + "行," + "预制组件" + "," + "此项为必填项！" + "|";
+                        result.Add("第" + (i + 2).ToString() + "行," + "预制组件" + "," + "此项为必填项！");
                     }
                     else
                     {
                         hJGL_Pipeline_Component = HJGL_PipelineComponentService.GetPipelineComponentByCodeandpipelineId(PipelineComponentCode, pipeline.PipelineId);
                         if (hJGL_Pipeline_Component == null)
                         {
-                            result += "第" + (i + 2).ToString() + "行," + "不存在此预制组件 " + PipelineComponentCode + " |";
+                            //result += "第" + (i + 2).ToString() + "行," + "不存在此预制组件 " + PipelineComponentCode + " |";
-
+                            result.Add("不存在此预制组件-" + PipelineComponentCode);
                             continue;
                         }
                     }
                                          
                 }              
-                if (!string.IsNullOrEmpty(result))
+                if (result.Count>0)
                 {
                     PipelineList.Clear();
-                    result = result.Substring(0, result.LastIndexOf("|"));
+                   // result = result.Substring(0, result.LastIndexOf("|"));
-                    errorInfos = result;
+                    errorInfos = string .Join("|", result.Distinct()) ;
                     //Alert alert = new Alert();
                     //alert.Message = result;
                     //alert.Target = Target.Self;

SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs

@@ -81,7 +81,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
@@ -98,7 +98,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -120,9 +120,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         private void BindNodes(TreeNode node)
         {
             List<Model.HJGL_Pipeline> pipeline = new List<Model.HJGL_Pipeline>();
-            var pipelines = from x in Funs.DB.HJGL_Pipeline select x;
+            pipeline = (from x in PipelineService.hJGL_Pipelines
-            pipeline = (from x in pipelines
+                        where  x.UnitWorkId == node.NodeID
-                        where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID
                        && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
                         orderby x.PipelineCode
                         select x).ToList();
@@ -140,8 +139,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 //    newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
                 //}  
 
-                var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count();
+                var jotCount = (from x in WeldJointService.hJGL_WeldJoints where x.PipelineId == item.PipelineId && x.IsTwoJoint == true select x).Count();
-                var AuditCount= (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == true && x.AuditDate !=null 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();
                 TreeNode newNode = new TreeNode();
 
                 if (jotCount== AuditCount) //全部审核

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListIn.aspx.cs

@@ -70,7 +70,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     return;
                 }
                 string IsXls = Path.GetExtension(this.fuAttachUrl.FileName).ToString().Trim().ToLower();
-                if (IsXls != ".xls")
+                if (IsXls != ".xlsx")
                 {
                     ShowNotify("只可以选择Excel文件！", MessageBoxIcon.Warning);
                     return;
@@ -108,37 +108,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// <param name="filename">Excel文件路径名</param>
         private void ImportXlsToData(string fileName)
         {
-            //支持.xls和.xlsx，即包括office2010等版本的   HDR=Yes代表第一行是标题，不是数据；
+             try
-            //string cmdText = "Provider=Microsoft.ACE.OLEDB.4.0;Data Source={0};Extended Properties='Excel 8.0; HDR=Yes; IMEX=1'";
-
-            ////建立连接
-            //OleDbConnection conn = new OleDbConnection(string.Format(cmdText, fileName));
-            try
             {
-                //打开连接
+                 string oleDBConnString = String.Empty;
-                //if (conn.State == ConnectionState.Broken || conn.State == ConnectionState.Closed)
-                //{
-                //    conn.Open();
-                //}
-                //OleDbDataAdapter oleAdMaster = null;
-                //DataTable m_tableName = new DataTable();
-                //DataSet ds = new DataSet();
-                //m_tableName = conn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null);
-
-                //if (m_tableName != null && m_tableName.Rows.Count > 0)
-                //{
-
-                //    m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim();
-
-                //}
-                //string sqlMaster;
-                //sqlMaster = " SELECT *  FROM [" + m_tableName.TableName + "]";
-                //oleAdMaster = new OleDbDataAdapter(sqlMaster, conn);
-                //oleAdMaster.Fill(ds, "m_tableName");
-                //oleAdMaster.Dispose();
-                //conn.Close();
-                //conn.Dispose();
-                string oleDBConnString = String.Empty;
                 oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;";
                 oleDBConnString += "Data Source=";
                 oleDBConnString += fileName;

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs

@@ -1006,7 +1006,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         pipeline.WeldJointCode = col19;
                     }
 
-                    string col20 = pds[i].U;
+                    string col20 = pds[i].U.ToString();
                     if (!string.IsNullOrEmpty(col20))
                     {
                         var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col20);
@@ -1025,7 +1025,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         result += "第" + (i + 1).ToString() + "行," + "材质1" + "," + "此项为必填项！" + "|";
                     }
 
-                    string col21 = pds[i].V;
+                    string col21 = pds[i].V.ToString();
                     if (!string.IsNullOrEmpty(col21))
                     {
                         var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col21);
@@ -1381,6 +1381,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 }
 
                 ShowNotify("导入成功！", MessageBoxIcon.Success);
+                PipelineService.RestPipelineAndJoints(this.CurrUser.LoginProjectId);
+
                 PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
             }
             else
@@ -1485,7 +1487,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         #endregion
         void addPipelines(List<Model.View_HJGL_WeldJoint> PipelineList, string UnitWorkId)
         {
-            var getPipeline = from x in Funs.DB.View_HJGL_WeldJoint where x.UnitWorkId == UnitWorkId select x;
+           // var getPipeline = from x in Funs.DB.View_HJGL_WeldJoint where x.UnitWorkId == UnitWorkId select x;
             var   pipelines = (from x in PipelineList
                          select new Model.HJGL_Pipeline
                          {
@@ -1565,8 +1567,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 pipeline.MaterialId = pipelines[i].MaterialId;
                 pipeline.Remark = pipelines[i].Remark;
 
-                var isExistPipelineCode = getPipeline.FirstOrDefault(x => x.PipelineCode == pipeline.PipelineCode && x.UnitWorkId == UnitWorkId);
+                var isExistPipelineCode = PipelineService.GetPipelineByCode(pipeline.PipelineCode, pipeline.UnitWorkId);
-                if (isExistPipelineCode != null) // 更新管线
+                if (isExistPipelineCode!=null) // 更新管线
                 {
                     pipeline.PipelineId = isExistPipelineCode.PipelineId;
                     BLL.PipelineService.UpdatePipeline(pipeline);
@@ -1582,7 +1584,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         }
         void addHJGL_WeldJoints(List<Model.View_HJGL_WeldJoint> PipelineList, string UnitWorkId)
         {
-            var getweldjonts = from x in Funs.DB.View_HJGL_WeldJoint where x.UnitWorkId == UnitWorkId select x;
             var getpipelines= from y in Funs.DB.HJGL_Pipeline where y.UnitWorkId== UnitWorkId select y;
             List<Model.HJGL_WeldJoint> weldJoints_add = new List<Model.HJGL_WeldJoint>();
 
@@ -1637,7 +1638,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 weldJoint.JointAttribute = weldJoints[i].JointAttribute;
                 weldJoint.ProjectId = weldJoints[i].ProjectId;
 
-                var isExistJot = getweldjonts.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == PipelineList[i].WeldJointCode);
+                var isExistJot = WeldJointService.GetWeldJointsByWeldJointCode(weldJoint.PipelineId, weldJoint.WeldJointCode);
                 if (isExistJot != null) // 更新焊口
                 {
                     weldJoint.WeldJointId = isExistJot.WeldJointId;
@@ -1683,6 +1684,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
                 }
                 BLL.HJGL_DesignBasisDataImportVerSionLogService.UpdateVersion(this.CurrUser.LoginProjectId, unitworkId, version, DataClassification);
+                PipelineService.RestPipelineAndJoints(this.CurrUser.LoginProjectId);
 
                 ShowNotify("恢复成功！");
 

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx

@@ -55,7 +55,7 @@
                                     EnableCollapse="false" runat="server" BoxFlex="1" DataKeyNames="DesignBasisDataImportId"
                                     AllowColumnLocking="true" EnableColumnLines="true" DataIDField="DesignBasisDataImportId"
                                     AllowSorting="true" SortField="CreateDate" SortDirection="ASC"   EnableMultiSelect="false"
-                                    IsDatabasePaging="false" PageSize="15" >
+                                    IsDatabasePaging="false" AllowPaging="true"  PageSize="300" EnableBigDataRowTip="false"  EnableBigData="true">
                                     <Columns>
                                         <f:RowNumberField EnablePagingNumber="true" HeaderText="编号"
                                             Width="60px" HeaderTextAlign="Center" TextAlign="Center" />

SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineMatIn.aspx.cs

@@ -141,6 +141,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         private Model.ResponeData AddDatasetToSQL(DataTable pds, int Cols)
         {
             Model.ResponeData responeData = new Model.ResponeData();
+            List<string> result = new List<string>();
 
             int ic, ir;
             ic = pds.Columns.Count;
@@ -167,27 +168,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     string unitworkId = string.Empty;
                     unitworkId = Request.Params["UnitWorkId"];
                     string PipeArea=string.Empty;//管线划分  1工厂预制 2现场施工
-                    //if (dv[i]["主项编号"] != null && !string.IsNullOrEmpty(dv[i]["主项编号"].ToString()))
-                    //{
-                    //    var unitWork = from x in Funs.DB.WBS_UnitWork where x.ProjectId == CurrUser.LoginProjectId && x.UnitWorkCode == dv[i]["主项编号"].ToString() && x.ProjectType == "2" select x;
-                    //    if (unitWork.Count() > 0)
-                    //    {
-                    //        unitworkId = unitWork.First().UnitWorkId;
-                    //    }
-                    //    else
-                    //    {
-                    //        errorInfos += (i + 2) + "Line, [主项编号] 不存在</br>";
-                    //    }
-
-                    //}
-                    //else
-                    //{
-                    //    errorInfos += (i + 2) + "Line, [主项编号] 不能为空</br>";
-                    //}
 
                     if (dv[i]["管线号"] != null && !string.IsNullOrEmpty(dv[i]["管线号"].ToString()))
                     {
-                        var pipeline = from x in Funs.DB.HJGL_Pipeline where x.UnitWorkId == unitworkId && x.PipelineCode == dv[i]["管线号"].ToString() select x;
+                        var pipeline = from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == unitworkId && x.PipelineCode == dv[i]["管线号"].ToString().Trim() select x;
                         if (pipeline.Count() > 0)
                         {
                             item.PipelineId = pipeline.First().PipelineId;
@@ -195,13 +179,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         }
                         else
                         {
-                            errorInfos += (i + 2) + "Line,"+ dv[i]["管线号"].ToString() + " [管线号] 不存在</br>";
+                            // errorInfos += (i + 2) + "Line,"+ dv[i]["管线号"].ToString() + " [管线号] 不存在</br>";
+                            result.Add("不存在此管线号-" + dv[i]["管线号"].ToString());
+
+
                         }
 
                     }
                     else
                     {
-                        errorInfos += (i + 2) + "Line, [管线号] 不能为空</br>";
+                        //errorInfos += (i + 2) + "Line, [管线号] 不能为空</br>";
+                        result.Add((i + 2) + "Line, [管线号] 不能为空</br>");
                     }
                     //if (dv[i]["管线划分"] != null && !string.IsNullOrEmpty(dv[i]["管线划分"].ToString()))
                     //{
@@ -240,13 +228,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         }
                         else
                         {
-                            errorInfos += (i + 2) + "Line," + dv[i]["材料编码"].ToString() + " [材料编码] 不存在</br>";
+                            //errorInfos += (i + 2) + "Line," + dv[i]["材料编码"].ToString() + " [材料编码] 不存在</br>";
+                            result.Add("不存在此材料编码-" + dv[i]["材料编码"].ToString());
+
                         }
 
                     }
                     else
                     {
-                        errorInfos += (i + 2) + "Line, [材料编码] 不能为空</br>";
+                        //errorInfos += (i + 2) + "Line, [材料编码] 不能为空</br>";
+                        result.Add((i + 2) + "Line, [材料编码] 不能为空</br>");
                     }
 
                     if (dv[i]["数量"] != null && !string.IsNullOrEmpty(dv[i]["数量"].ToString()))
@@ -258,13 +249,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         }
                         catch (Exception)
                         {
-                            errorInfos += "第" + (i + 2).ToString() + "行," + "数量格式输入有误</br>";
+                            //errorInfos += "第" + (i + 2).ToString() + "行," + "数量格式输入有误</br>";
+                            result.Add("第" + (i + 2).ToString() + "行," + "数量格式输入有误</br>");
                         }
 
                     }
                     else
                     {
-                        errorInfos += (i + 2) + "Line, [数量] 不能为空</br>";
+                        //errorInfos += (i + 2) + "Line, [数量] 不能为空</br>";
+                        result.Add((i + 2) + "Line, [数量] 不能为空</br>");
                     }
 
                     if (PipeArea=="1")
@@ -276,7 +269,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                         }
                         else
                         {
-                            errorInfos += (i + 2) + "Line, [预制组件] 不能为空</br>";
+                            result.Add((i + 2) + "Line, [预制组件] 不能为空</br>");
                         }
                     }
                     var model = matList.Where(x => x.PipelineId == item.PipelineId && x.MaterialCode == item.MaterialCode && x.PrefabricatedComponents == item.PrefabricatedComponents);
@@ -320,12 +313,18 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 responeData.message = "没有数据";
 
             }
-
+            if (result.Count > 0)
-            if (!string.IsNullOrEmpty(errorInfos))
+            {                
-            {
+                // result = result.Substring(0, result.LastIndexOf("|"));
+                errorInfos = string.Join("|", result.Distinct());
+                //Alert alert = new Alert();
+                //alert.Message = result;
+                //alert.Target = Target.Self;
+                //alert.Show();
                 responeData.code = 0;
                 responeData.message = errorInfos;
             }
+            
             return responeData;
         }
         #endregion

SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx

@@ -36,7 +36,7 @@
                     <Items>
                          <f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="管线列表"
                             OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
-                            EnableSingleClickExpand="true" AutoLeafIdentification="true"
+                            EnableSingleClickExpand="true" AutoLeafIdentification="true" OnNodeExpand="tvControlItem_TreeNodeExpanded"
                             EnableTextSelection="true" >
                         </f:Tree>
                     </Items>

SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs

@@ -94,6 +94,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             if (!IsPostBack)
             {
+                HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>();
+                HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>();
+
                 this.txtTaskDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(1));
                 this.txtTaskCode.Text = BLL.WeldTaskService.GetTaskCodeByDate(this.CurrUser.LoginProjectId, this.txtTaskDate.Text);
                 BLL.Base_WeldingLocationServie.InitWeldingLocationDropDownList(drpWeldingLocation, true);
@@ -161,19 +164,35 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             rootNode1.Text = "工厂预制";
             rootNode1.CommandName = "工厂预制";
             rootNode1.EnableClickEvent = true;
-            rootNode1.Selectable = true;
+            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();
+            if (a > 0)
+            {
+                // BindNodes(tn1);
+                TreeNode newNode = new TreeNode();
+                newNode.Text = "加载管线...";
+                newNode.NodeID = "加载管线...";
+                rootNode1.Nodes.Add(newNode);
+            }
+
             TreeNode rootNode2 = new TreeNode();
             rootNode2.NodeID = BLL.PipelineService.PipeArea_FIELD;
             rootNode2.Text = "现场安装";
             rootNode2.CommandName = "现场安装";
             rootNode2.EnableClickEvent = true;
-            rootNode2.Expanded = true;
+            rootNode2.EnableExpandEvent = true;
             this.tvControlItem.Nodes.Add(rootNode2);
-            AddTreeNode(BLL.PipelineService.PipeArea_SHOP, rootNode1);
+            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();
-            AddTreeNode(BLL.PipelineService.PipeArea_FIELD, rootNode2);
+            if (b > 0)
-
+            {
+                // BindNodes(tn1);
+                TreeNode newNode = new TreeNode();
+                newNode.Text = "加载管线...";
+                newNode.NodeID = "加载管线...";
+                rootNode2.Nodes.Add(newNode);
+            }
             //TreeNode rootNode = new TreeNode();
             //rootNode.Text = "管线号";
             //rootNode.NodeID = "0";
@@ -185,12 +204,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         }
         void AddTreeNode(string PipeArea , TreeNode node )
         {
-            var iso = (from x in Funs.DB.HJGL_Pipeline where x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipeArea orderby x.PipelineCode select x).ToList();
+            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();
             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();
             }
-            var joints = from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x;
+            var joints = from x in WeldJointService.hJGL_WeldJoints  select x;
             foreach (var item in iso)
             {
                 TreeNode newNode = new TreeNode();
@@ -208,14 +227,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 node.Nodes.Add(newNode);
             }
         }
+        protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
+        {
+            if (e.Node.Nodes[0].NodeID == "加载管线...")
+            {
+                e.Node.Nodes.Clear();
+                if (e.Node.CommandName == "工厂预制")
+                {
+                    AddTreeNode(BLL.PipelineService.PipeArea_SHOP, e.Node);
 
-        #endregion
+                }
+                else if (e.Node.CommandName == "现场安装")
+                {
+                    AddTreeNode(BLL.PipelineService.PipeArea_FIELD, e.Node);
 
-        #region 数据绑定
+                }
-        /// <summary>
+            }
-        /// 数据绑定
+            
-        /// </summary>
+        }
-        private void BindGrid()
+            #endregion
+
+            #region 数据绑定
+            /// <summary>
+            /// 数据绑定
+            /// </summary>
+            private void BindGrid()
         {
             string pipelineId = this.tvControlItem.SelectedNodeID;
 

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs

@@ -1,21 +1,27 @@
-using BLL;
+using Apache.NMS.ActiveMQ.Threads;
+using BLL;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 using System.Web;
 
 namespace FineUIPro.Web.HJGL.WeldingManage
 {
     public partial class WeldJointList : PageBase
     {
+        public static List<Model.HJGL_WeldJoint> WeldJointlist = new  List<Model.HJGL_WeldJoint>();
+
         protected void Page_Load(object sender, EventArgs e)
         {
 
             if (!IsPostBack)
             {
+               // WeldJointlist = WeldJointService.GetWeldJointByProjectid(this.CurrUser.LoginProjectId);
                 this.InitTreeMenu();//加载树
                                     //显示列
                                     //Model.Sys_UserShowColumns c = BLL.UserShowColumnsService.GetColumnsByUserId(this.CurrUser.PersonId, "Joint");
@@ -173,36 +179,33 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             //}
         }
         #endregion
-
+      
         protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
         {
+
             e.Node.Nodes.Clear();
              
             if (e.Node.CommandName == "单位工程")
             {
-                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                var pipeline = (from x in BLL.PipelineService.hJGL_Pipelines
-                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
+                                where  x.UnitWorkId == e.Node.NodeID  && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
-                               && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim())
                                 orderby x.PipelineCode
                                 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 = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
+                    //var jotCount = WeldJointlist.Where(x => x.PipelineId == item.PipelineId).Count();
-                    //var weldJotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null && x.WeldingDailyId != null select x).Count();
+                    var jotCount = WeldJointService.hJGL_WeldJoints.Where(x => x.PipelineId == item.PipelineId).Count();
                     TreeNode newNode = new TreeNode();
-                    //if (jotCount > weldJotCount)
-                    //{
-                    //    newNode.Text = "<font color='#EE0000'>" + item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】" + "</font>";
-                    //}
-                    //else
-                    //{
-                    //    newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
-                    //}
                     newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
                     newNode.NodeID = item.PipelineId;
                     newNode.EnableClickEvent = true;
                     e.Node.Nodes.Add(newNode);
+
                 }
+ 
             }
         }
 

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs

@@ -37,6 +37,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             if (!IsPostBack)
             {
                 PipeArea = Request.Params["PipeArea"];
+                HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>();
+                HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>();
+
                 this.InitTreeMenu();//加载树
             }
         }
@@ -96,7 +99,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 foreach (var q in unitWork1)
                 {
                      
-                    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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where 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;
@@ -119,7 +122,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 foreach (var q in unitWork2)
                 {
-                    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();
+                    int a = (from x in PipelineService.hJGL_Pipelines where 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;
@@ -151,14 +154,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             if (e.Node.CommandName == "单位工程")
             {
                 
-                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                var pipeline = (from x in PipelineService.hJGL_Pipelines
-                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea
+                                where x.UnitWorkId == e.Node.NodeID && x.PipeArea == PipeArea
                                 orderby x.PipelineCode
                                 select x).ToList();
                 if (!string .IsNullOrEmpty (txtPipelineCode.Text.Trim()))
                 {
                     pipeline= pipeline.Where(x => x.PipelineCode.Contains(txtPipelineCode.Text.Trim())).ToList();
                 }
+
                 foreach (var item in pipeline)
                 {
                     //var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();

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 Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where  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 Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where 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,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             e.Node.Nodes.Clear();
             if (e.Node.CommandName == "单位工程")
             {
-                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                var pipeline = (from x in PipelineService.hJGL_Pipelines
-                                where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID
+                                where  x.UnitWorkId == e.Node.NodeID
                            && x.PipelineCode.Contains(txtPipelineCode.Text.Trim())
                                 orderby x.PipelineCode
                                 select x).ToList();
                 foreach (var item in pipeline)
                 {
-                    var jotCount = (from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == item.PipelineId && x.IsTwoJoint == null select x).Count();
+                    var jotCount = (from x in WeldJointService.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)

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 Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where 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 Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    int a = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == q.UnitWorkId select x).Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;

SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx.cs

@@ -1,5 +1,5 @@
 using System;
-
+using BLL;
 namespace FineUIPro.Web
 {
     public partial class mainMenu_HJGL_AVEVA : PageBase
@@ -8,6 +8,8 @@ namespace FineUIPro.Web
         {
             ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
             ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7CArea-15A";
+            PipelineService.RestPipelineAndJoints(this.CurrUser.LoginProjectId);
+             
         }
     }
 }

SGGL/FineUIPro.Web/index.aspx

@@ -666,12 +666,12 @@
             // refreshWhenExist： 添加选项卡时，如果选项卡已经存在，是否刷新内部IFrame
             // refreshWhenTabChange: 切换选项卡时，是否刷新内部IFrame
             F.initTreeTabStrip(mainMenu, mainTabStrip, true, false, false);
-            var themeTitle = F.cookie('Theme_Pro_Title');
+            //var themeTitle = F.cookie('Theme_Pro_Title');
-            var themeName = F.cookie('Theme_Pro');
+            //var themeName = F.cookie('Theme_Pro');
-            if (themeTitle) {
+            //if (themeTitle) {
-                F.removeCookie('Theme_Pro_Title');
+            //    F.removeCookie('Theme_Pro_Title');
-                //notify('主题更改为：' + themeTitle + '（' + themeName + '）');
+            //    //notify('主题更改为：' + themeTitle + '（' + themeName + '）');
-            }
+            //}
         });
     </script>
 </body>