20230220 003焊接修改

SGGL/BLL/HJGL/WeldingManage/PipelineService.cs

@@ -10,6 +10,7 @@ using System.IO;
 using System.Linq;
 using System.Web.UI.DataVisualization.Charting;
 using System.Web.UI.WebControls;
+using System.Windows.Media.Animation;
 using static BLL.PipelineService;
 
 namespace BLL
@@ -221,6 +222,7 @@ namespace BLL
                         }
                         if (joint_Field_count == TaskJoints_Field.Count && joint_Field_count > 0)
                         {
+                            model_pipeline.IsFinished = true;
                             ActDateEnd_FIELD = TaskJoints_Field.OrderByDescending(x => x.TaskDate).First().TaskDate.Value;
                         }
                         model_pipeline.ActStartDate = ActDateStart_FIELD;
@@ -246,7 +248,7 @@ namespace BLL
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        public static List<HJGL_Pipeline> GetView_HJGL_Pipelines(HJGL_Pipeline model)
+        public static List<HJGL_Pipeline> GetHJGL_PipelineList(HJGL_Pipeline model)
         {
             var db = Funs.DB;
             var pipelineList =( from x in Funs.DB.HJGL_Pipeline
@@ -273,6 +275,33 @@ namespace BLL
             }
             return pipelineList;
         }
+        public static List<View_HJGL_Pipeline> GetView_HJGL_Pipelines(View_HJGL_Pipeline model)
+        {
+            var db = Funs.DB;
+            var pipelineList = (from x in Funs.DB.View_HJGL_Pipeline
+                                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))*/
+                                select x).ToList();
+            if (model.IsFinished != null)
+            {
+                if (model.IsFinished == true)
+                {
+                    pipelineList = pipelineList.Where(x => x.IsFinished == true).ToList();
+                }
+                else
+                {
+                    pipelineList = pipelineList.Where(x => x.IsFinished == false || x.IsFinished == null).ToList();
+
+                }
+
+            }
+            return pipelineList;
+        }
         /// <summary>
         /// 根据unitworkId获取所有管线
         /// </summary>
@@ -761,6 +790,135 @@ namespace BLL
                 }
             }
         }
+        /// <summary>
+        /// 根据组件材料编码查询管线
+        /// </summary>
+        /// <param name="node"></param>
+        /// <param name="pipecode"></param>
+        /// <param name="MaterialCode"></param>
+        /// <param name="ProjectId"></param>
+        /// <param name="pageSize"></param>
+        public static void BindTreeNodes(FineUIPro.TreeNode node, string pipecode,string MaterialCode, string ProjectId, int pageSize)
+        {
+            //var pipeline = (from x in Funs.DB.HJGL_Pipeline
+            //                where x.ProjectId == ProjectId && x.UnitWorkId == node.NodeID
+            //           && x.PipelineCode.Contains(pipecode)
+            //                orderby x.PipelineCode
+            //                select x).ToList();
+            var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                     join y in Funs.DB.HJGL_PipeLineMat.Where(m => m.MaterialCode.Contains(MaterialCode)) on x.PipelineId equals y.PipelineId
+                     where x.ProjectId == ProjectId && x.UnitWorkId == node.NodeID && x.PipelineCode.Contains(pipecode)
+                            select x).Distinct().ToList();
+            var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == ProjectId 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 hJGL_WeldJoints where x.PipelineId == item.PipelineId /*&& x.IsTwoJoint == null*/ select x).Count();
+                    FineUIPro.TreeNode newNode = new FineUIPro.TreeNode();
+                    newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
+                    newNode.NodeID = item.PipelineId;
+                    newNode.CommandName = "管线";
+                    newNode.EnableClickEvent = true;
+                    node.Nodes.Add(newNode);
+                }
+                if (pageindex < pageCount)
+                {
+                    FineUIPro.TreeNode newNode = new FineUIPro.TreeNode();
+                    newNode.Text = "加载";
+                    newNode.NodeID = SQLHelper.GetNewID();
+                    newNode.CommandName = "加载";
+                    newNode.Icon = FineUIPro.Icon.ArrowDown;
+                    newNode.EnableClickEvent = true;
+                    node.Nodes.Add(newNode);
+                }
+            }
+        }
+        public static void BindTreeNodes(FineUIPro.TreeNode node,bool isExitWPQId, string pipecode, string ProjectId, int pageSize)
+        {
+            if (isExitWPQId)
+            {
+                string strSql = "SELECT distinct PipelineId, PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL  AND UnitWorkId =@UnitWorkId  AND WPQId IS NULL";
+                List<SqlParameter> listStr = new List<SqlParameter>();
+                listStr.Add(new SqlParameter("@UnitWorkId", node.NodeID));
+                if (!string .IsNullOrEmpty(pipecode))
+                {
+                    strSql += " and PipelineCode=@PipelineCode ";
+                    listStr.Add(new SqlParameter("@PipelineCode", ""+ pipecode + ""));
 
                 }
+                SqlParameter[] parameter = listStr.ToArray();
+                System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
+                var pipeline = Funs.TableToEntity<Model.PipeLineIdCodeItem>(dt);
+                
+                var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == ProjectId 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 hJGL_WeldJoints where x.PipelineId == item.PipelineId /*&& x.IsTwoJoint == null*/ select x).Count();
+                        FineUIPro.TreeNode newNode = new FineUIPro.TreeNode();
+                        newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
+                        newNode.NodeID = item.PipelineId;
+                        newNode.CommandName = "管线";
+                        newNode.EnableClickEvent = true;
+                        node.Nodes.Add(newNode);
+                    }
+                    if (pageindex < pageCount)
+                    {
+                        FineUIPro.TreeNode newNode = new FineUIPro.TreeNode();
+                        newNode.Text = "加载";
+                        newNode.NodeID = SQLHelper.GetNewID();
+                        newNode.CommandName = "加载";
+                        newNode.Icon = FineUIPro.Icon.ArrowDown;
+                        newNode.EnableClickEvent = true;
+                        node.Nodes.Add(newNode);
+                    }
+                }
+            }
+            else
+            {
+                var pipeline = (from x in Funs.DB.HJGL_Pipeline
+                                where x.ProjectId == ProjectId && x.UnitWorkId == node.NodeID
+                           && x.PipelineCode.Contains(pipecode)
+                                orderby x.PipelineCode
+                                select x).ToList();
+                var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == ProjectId 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 hJGL_WeldJoints where x.PipelineId == item.PipelineId /*&& x.IsTwoJoint == null*/ select x).Count();
+                        FineUIPro.TreeNode newNode = new FineUIPro.TreeNode();
+                        newNode.Text = item.PipelineCode + "【" + jotCount.ToString() + " " + "焊口" + "】";
+                        newNode.NodeID = item.PipelineId;
+                        newNode.CommandName = "管线";
+                        newNode.EnableClickEvent = true;
+                        node.Nodes.Add(newNode);
+                    }
+                    if (pageindex < pageCount)
+                    {
+                        FineUIPro.TreeNode newNode = new FineUIPro.TreeNode();
+                        newNode.Text = "加载";
+                        newNode.NodeID = SQLHelper.GetNewID();
+                        newNode.CommandName = "加载";
+                        newNode.Icon = FineUIPro.Icon.ArrowDown;
+                        newNode.EnableClickEvent = true;
+                        node.Nodes.Add(newNode);
+                    }
+                }
+
+            }
+        }
+    }
 }

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

@@ -22,9 +22,20 @@
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 <f:TextBox ID="tvPipeCode" runat="server" Label="管线号" LabelAlign="Right"
-                                    EmptyText="输入查询条件" Width="230px" LabelWidth="70px">
+                                    EmptyText="输入查询条件" Width="180px" LabelWidth="70px">
                                 </f:TextBox>
+                              
                                 <f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
+                               
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                  <f:TextBox ID="txtMaterialCode" runat="server" Label="材料编码"
+                                    EmptyText="输入查询条件" AutoPostBack="true"
+                                    Width="180px" LabelWidth="80px" LabelAlign="Right">
+                                </f:TextBox>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
                                  <f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
                                     EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
                                 </f:Button>
@@ -61,10 +72,7 @@
                                             EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="txtWeldJointCode_TextChanged"
                                             Width="240px" LabelWidth="80px" LabelAlign="Right">
                                         </f:TextBox>--%>
-                                        <f:TextBox ID="txtMaterialCode" runat="server" Label="材料编码"
+                                       
-                                            EmptyText="输入查询条件" AutoPostBack="true" 
-                                            Width="240px" LabelWidth="80px" LabelAlign="Right">
-                                        </f:TextBox>
                                         <f:ToolbarFill ID="ToolbarFill1" runat="server">
                                         </f:ToolbarFill>
                                         <%--<f:Button ID="btnSelectColumn" Text="选择显示列" Icon="ShapesManySelect"
@@ -72,7 +80,7 @@
                                         </f:Button>--%>
                                         <f:Button ID="btnNew" Text="新增" Icon="Add" runat="server" OnClick="btnNew_Click" Hidden="true">
                                         </f:Button>
-                                         <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
+                                         <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch" Hidden="true"
                                             EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
                                         </f:Button>
                                         <f:Button ID="btnPrint" Text="打印" Icon="Printer" runat="server"

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

@@ -1,6 +1,7 @@
 using BLL;
 using FastReport.Design;
 using FineUIPro.Web.HJGL.WeldingManage;
+using FineUIPro.Web.ProjectData;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -86,12 +87,38 @@ namespace FineUIPro.Web.HJGL.DataImport
                 unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
                 unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
             }
-
+            //var dbpipeLineMat = from x in Funs.DB.HJGL_PipeLineMat select x;
+            //var DBpipeline = from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId select x;
             if (unitWork1.Count() > 0)
             {
                 foreach (var q in unitWork1)
                 {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    string strSql = " SELECT DISTINCT [t0].[PipelineId] FROM [dbo].[HJGL_Pipeline] AS [t0]\r\nleft JOIN [dbo].[HJGL_PipeLineMat] AS [t1] ON [t0].[PipelineId] = [t1].[PipelineId]";
+                    strSql += "where  [t0].[UnitWorkId] =@UnitWorkId ";               
+                    List<SqlParameter> listStr = new List<SqlParameter>();
+                    listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
+
+                    if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
+                    {
+                        strSql += " and  [t1].[MaterialCode] like @MaterialCode";
+                        listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
+
+                    }
+                    if (!string.IsNullOrEmpty(tvPipeCode.Text.Trim()))
+                    {
+                        strSql += " and  [t0].[PipelineCode] like @PipelineCode";
+                        listStr.Add(new SqlParameter("@PipelineCode", "%" + tvPipeCode.Text.Trim() + "%"));
+
+                    }
+                    SqlParameter[] parameter = listStr.ToArray();
+                    DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
+                    var a = dt.Rows.Count;
+
+                    //int a = (from x in DBpipeline
+                    //         join y in dbpipeLineMat on x.PipelineId equals y.PipelineId
+                    //         where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId
+                    //         && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
+                    //         select x.PipelineId).Distinct().Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn1 = new TreeNode();
                     tn1.NodeID = q.UnitWorkId;
@@ -112,9 +139,45 @@ namespace FineUIPro.Web.HJGL.DataImport
             }
             if (unitWork2.Count() > 0)
             {
+
                 foreach (var q in unitWork2)
                 {
-                    int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count();
+                    string strSql = " SELECT DISTINCT [t0].[PipelineId] FROM [dbo].[HJGL_Pipeline] AS [t0]\r\nleft JOIN [dbo].[HJGL_PipeLineMat] AS [t1] ON [t0].[PipelineId] = [t1].[PipelineId]";
+                    strSql += "where  [t0].[UnitWorkId] =@UnitWorkId ";
+                    List<SqlParameter> listStr = new List<SqlParameter>();
+                    listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
+
+                    if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
+                    {
+                        strSql += " and  [t1].[MaterialCode] like @MaterialCode";
+                        listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
+
+                    }
+                    if (!string.IsNullOrEmpty(tvPipeCode.Text.Trim()))
+                    {
+                        strSql += " and  [t0].[PipelineCode] like @PipelineCode";
+                        listStr.Add(new SqlParameter("@PipelineCode", "%" + tvPipeCode.Text.Trim() + "%"));
+
+                    }
+                    SqlParameter[] parameter = listStr.ToArray();
+                    DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+                   var a =dt.Rows.Count;
+
+                    //var b = (from x in Funs.DB.HJGL_Pipeline
+                    //         join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId
+                    //         where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
+                    //         select x).Distinct();
+                    //var b = (from x in DBpipeline 
+                    //         join y in dbpipeLineMat on x.PipelineId equals y.PipelineId
+                    //         where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId
+                    //         && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
+                    //         select x.PipelineId).Distinct();
+                    //int a = (from x in DBpipeline
+                    //         join y in dbpipeLineMat on x.PipelineId equals y.PipelineId
+                    //         where x.PipelineCode.Contains(tvPipeCode.Text.Trim()) && x.UnitWorkId == q.UnitWorkId
+                    //         && y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
+                    //         select x.PipelineId).Distinct().Count();
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -145,7 +208,7 @@ namespace FineUIPro.Web.HJGL.DataImport
         #region 暂不有
         private void BindNodes(TreeNode node)
         {
-            BLL.PipelineService.BindTreeNodes(node, this.tvPipeCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
+            BLL.PipelineService.BindTreeNodes(node, this.tvPipeCode.Text.Trim(),txtMaterialCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
         }
         #endregion
 
@@ -223,11 +286,11 @@ namespace FineUIPro.Web.HJGL.DataImport
 								  LEFT JOIN HJGL_Pipeline line ON pipe.PipelineId=line.PipelineId
                                   WHERE line.UnitWorkId=@UnitWorkId  and line.PipeArea='1'  ";
             List<SqlParameter> listStr = new List<SqlParameter>();
-            if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
+            //if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
-            {
+            //{
-                strSql += " and lib.MaterialCode like @MaterialCode ";
+            //    strSql += " and lib.MaterialCode like @MaterialCode ";
-                listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
+            //    listStr.Add(new SqlParameter("@MaterialCode", "%" + txtMaterialCode.Text.Trim() + "%"));
-            }
+            //}
             if (!string.IsNullOrEmpty(pipelineId))
             {
                 strSql += " and pipe.PipelineId=@PipelineId order by PrefabricatedComponents ";
@@ -258,11 +321,11 @@ namespace FineUIPro.Web.HJGL.DataImport
                 listStr.Add(new SqlParameter("@PipelineId", pipelineId));
 
             }
-            if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
+            //if (!string.IsNullOrEmpty(txtMaterialCode.Text.Trim()))
-            {
+            //{
-                strSql += " and lib.MaterialCode like @MaterialCode ";
+            //    strSql += " and lib.MaterialCode like @MaterialCode ";
-                listStr.Add(new SqlParameter("@MaterialCode", "%"+txtMaterialCode.Text.Trim() + "%"));
+            //    listStr.Add(new SqlParameter("@MaterialCode", "%"+txtMaterialCode.Text.Trim() + "%"));
-            }
+            //}
             listStr.Add(new SqlParameter("@UnitWorkId", unitworkid));
             SqlParameter[] parameter = listStr.ToArray();
             DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);

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

@@ -77,6 +77,24 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.HiddenField hdUnitWorkId;
 
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
+        /// <summary>
+        /// txtMaterialCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtMaterialCode;
+
         /// <summary>
         /// btnTreeFind 控件。
         /// </summary>
@@ -122,15 +140,6 @@ namespace FineUIPro.Web.HJGL.DataImport
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
 
-        /// <summary>
-        /// txtMaterialCode 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtMaterialCode;
-
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>

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

@@ -24,6 +24,11 @@
                                 <f:TextBox ID="tvPipeCode" runat="server" Label="管线号" LabelAlign="Right"
                                     EmptyText="输入查询条件" Width="200px" LabelWidth="70px">
                                 </f:TextBox>
+                               
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
                                  <f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
                                     EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
                                 </f:Button>

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

@@ -77,6 +77,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery
         /// </remarks>
         protected global::FineUIPro.TextBox tvPipeCode;
 
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
         /// <summary>
         /// btnTreeFind 控件。
         /// </summary>

SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx

@@ -19,9 +19,12 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:TextBox ID="txtWorkArea" runat="server" Label="区域" EmptyText="输入查询条件"
+<%--                                <f:TextBox ID="txtWorkArea" runat="server" Label="区域" EmptyText="输入查询条件" Hidden="true"
                                     AutoPostBack="true" OnTextChanged="Tree_TextChanged" Width="280px" LabelWidth="50px">
-                                </f:TextBox>
+                                </f:TextBox>--%>
+                                <f:Button ID="btnrefresh" ToolTip="同步NET" Icon="ArrowRefresh"
+                                    EnablePostBack="true"  OnClick="btnrefresh_Click" runat="server">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>

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

@@ -1,9 +1,11 @@
 using BLL;
+using MiniExcelLibs;
 using Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
+using System.IO;
 using System.Linq;
 
 namespace FineUIPro.Web.HJGL.InfoQuery
@@ -21,6 +23,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
                 ViewState["Completed_pipeline"] = value;
             }
         }
+        public  static List<Model.View_HJGL_Pipeline> View_HJGL_Pipeline=new List<Model.View_HJGL_Pipeline>();
         //public string Incomplete_pipeline
         //{
         //    get
@@ -134,21 +137,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
         protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
         {
             this.BindGrid();
-            Model.Parameter3D parameter3D = new Model.Parameter3D();
-            Model.ColorModel colorModel = new Model.ColorModel();
-            colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
-            parameter3D.ColorModel = colorModel;
-            parameter3D.TagNum = Line_No;
-            parameter3D.ButtonType = "2";
-            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
-           // parameter3D.Line_No = Line_No;
-            parameter3D.Transparency = colorModel.PipelineComplete;
-            parameter3D.Finished_color = colorModel.JointCompleteColor;
-            parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
             
-            ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId)  + parameter3D.ModelName;
-            ctlAuditFlow.data = parameter3D;
-            ctlAuditFlow.BindData();
 
         }
         #endregion
@@ -187,7 +176,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
 
           //  SqlParameter[] parameter = listStr.ToArray();
           //  DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
-            Model.HJGL_Pipeline view_HJGL_Pipeline = new Model.HJGL_Pipeline();
+            Model.View_HJGL_Pipeline view_HJGL_Pipeline = new Model.View_HJGL_Pipeline();
             view_HJGL_Pipeline.ProjectId = this.CurrUser.LoginProjectId;
             view_HJGL_Pipeline.UnitWorkId = this.tvControlItem.SelectedNodeID;
             view_HJGL_Pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
@@ -201,6 +190,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
                 view_HJGL_Pipeline.IsFinished = false;
             }
             var list = BLL.PipelineService.GetView_HJGL_Pipelines(view_HJGL_Pipeline);
+            View_HJGL_Pipeline = list;
             get3DParmeter_pipeline(list);
             // 2.获取当前分页数据
             //var table = this.GetPagedDataTable(Grid1, tb1);
@@ -212,7 +202,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
 
         }
         #endregion
-        private void get3DParmeter_pipeline(List<HJGL_Pipeline> view_HJGL_Pipelines )
+        private void get3DParmeter_pipeline(List<View_HJGL_Pipeline> view_HJGL_Pipelines )
         {
             if (view_HJGL_Pipelines.Any())
             {
@@ -284,7 +274,6 @@ namespace FineUIPro.Web.HJGL.InfoQuery
         #endregion
         #endregion
 
-
         #region 查询页面
 
         /// <summary>
@@ -308,6 +297,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             this.BindGrid();
         }
         #endregion
+
         #region 导出按钮
         /// 导出按钮
         /// </summary>
@@ -315,15 +305,60 @@ namespace FineUIPro.Web.HJGL.InfoQuery
         /// <param name="e"></param>
         protected void btnOut_Click(object sender, EventArgs e)
         {
-            Response.ClearContent();
+            string path = Funs.RootPath + @"File\Excel\Temp\pipelineQuery.xlsx";
-            string filename = Funs.GetNewFileName();
+            path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx");
-            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("管线信息总览" + filename, System.Text.Encoding.UTF8) + ".xls");
+            var q = (from x in View_HJGL_Pipeline
-            Response.ContentType = "application/excel";
+                     select new
-            Response.ContentEncoding = System.Text.Encoding.UTF8;
+                     {
-            //this.Grid1.PageSize = this.;
+                         管线号 = x.PipelineCode,
-            BindGrid();
+                         是否完成=x. IsFinished,
-            Response.Write(GetGridTableHtml(Grid1));
+                         完成日期=x.FinishedDate,
-            Response.End();
+                         完成达因=x.FinishSize,
+                         总达因数=x.TotalDin,
+                         总焊口量=x.JointCount,
+                         单位名称=x.UnitName,
+                         探伤比例=x.DetectionRateCode,
+                         介质名称=x.MediumName,
+                         管道等级=x.PipingClassCode,
+                         图纸名称=x.SingleName,
+                         单线图号=x.SingleNumber,
+                         设计压力=x.DesignPress,
+                         设计温度=x.DesignTemperature,
+                         压力试验介质=x.TestMediumCode,
+                         压力试验压力=x.TestPressure,
+                         压力管道级别=x.PressurePipingClassCode,
+                         管线长度= x.PipeLenth,
+                         泄露试验介质= x.LeakMediumName,
+                         泄露试验压力=x.LeakPressure,
+                         吹洗要求=x.PCMediumName,
+                         真空试验压力=x.VacuumPressure,
+                         材质=x.MaterialCode,
+                         备注=x.Remark
+                     }).ToList();
+            MiniExcel.SaveAs(path, q);
+
+            string fileName = "管线信息总览.xlsx";
+            FileInfo info = new FileInfo(path);
+            long fileSize = info.Length;
+            System.Web.HttpContext.Current.Response.Clear();
+            System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
+            System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize);
+            System.Web.HttpContext.Current.Response.Flush();
+            System.Web.HttpContext.Current.Response.Close();
+            File.Delete(path);
+
+
+            //Response.ClearContent();
+            //string filename = Funs.GetNewFileName();
+            //Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("管线信息总览" + filename, System.Text.Encoding.UTF8) + ".xls");
+            //Response.ContentType = "application/excel";
+            //Response.ContentEncoding = System.Text.Encoding.UTF8;
+            ////this.Grid1.PageSize = this.;
+            //BindGrid();
+            //Response.Write(GetGridTableHtml(Grid1));
+            //Response.End();
         }
 
         //#pragma warning disable CS0108 // “PersonList.GetGridTableHtml(Grid)”隐藏继承的成员“PageBase.GetGridTableHtml(Grid)”。如果是有意隐藏，请使用关键字 new。
@@ -411,7 +446,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery
         protected void btnGetChart_Click(object sender, EventArgs e)
         {
             decimal PipelineComplete = 0;
-            decimal PipelineNoComplete = 0;
+            decimal PipelineNoComplete=0;
+            if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID))
+            {
+                var allline = (from x in Funs.DB.HJGL_Pipeline where x.UnitWorkId == tvControlItem.SelectedNodeID select x).ToList().Count();
+                var Completeline = (from x in Funs.DB.HJGL_Pipeline where x.UnitWorkId == tvControlItem.SelectedNodeID && x.IsFinished == true select x).ToList().Count();
+                int NoCompleteline = allline - Completeline;
+                PipelineComplete = Completeline;
+                PipelineNoComplete = NoCompleteline;
+            }
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PipelineQueryChart.aspx?PipelineComplete={0}&&PipelineNOComplete={1}", PipelineComplete, PipelineNoComplete, "编辑 - ")));
 
         }
@@ -487,5 +530,24 @@ namespace FineUIPro.Web.HJGL.InfoQuery
             }
 
         }
+
+        protected void btnrefresh_Click(object sender, EventArgs e)
+        {
+            Model.Parameter3D parameter3D = new Model.Parameter3D();
+            Model.ColorModel colorModel = new Model.ColorModel();
+            colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
+            parameter3D.ColorModel = colorModel;
+            parameter3D.TagNum = Line_No;
+            parameter3D.ButtonType = "2";
+            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+            // parameter3D.Line_No = Line_No;
+            parameter3D.Transparency = colorModel.PipelineComplete;
+            parameter3D.Finished_color = colorModel.JointCompleteColor;
+            parameter3D.Incomplete_color = colorModel.JointNOCompleteColor;
+
+            ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
+            ctlAuditFlow.data = parameter3D;
+            ctlAuditFlow.BindData();
+        }
     }
 }

SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs

@@ -60,13 +60,13 @@ namespace FineUIPro.Web.HJGL.InfoQuery
         protected global::FineUIPro.Toolbar Toolbar1;
 
         /// <summary>
-        /// txtWorkArea 控件。
+        /// btnrefresh 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtWorkArea;
+        protected global::FineUIPro.Button btnrefresh;
 
         /// <summary>
         /// tvControlItem 控件。

SGGL/FineUIPro.Web/HJGL/PersonManage/CheckerManage.aspx

@@ -17,6 +17,19 @@
                     EnableCollapse="true" Width="300px" Title="单位名称"
                     ShowBorder="true" Layout="VBox" ShowHeader="true" AutoScroll="true" BodyPadding="5px"
                     IconFont="ArrowCircleLeft">
+                    <Toolbars>
+                        <f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
+                                <f:TextBox ID="txtQueryWelderCode" runat="server" Label="焊工号"
+                                    EmptyText="输入查询条件" Width="190px" LabelWidth="80px"
+                                    LabelAlign="Right">
+                                </f:TextBox>
+                                <f:Button ID="btnQuery" ToolTip="查询" Icon="SystemSearch"
+                                    EnablePostBack="true" OnClick="btnQuery_Click1" runat="server">
+                                </f:Button>
+                            </Items>                           
+                        </f:Toolbar>
+                    </Toolbars>
                     <Items>
                         <f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" runat="server" ShowBorder="false" EnableCollapse="true"
                             EnableSingleClickExpand="true" AutoLeafIdentification="true" EnableSingleExpand="true"

SGGL/FineUIPro.Web/HJGL/PersonManage/CheckerManage.aspx.cs

@@ -110,7 +110,7 @@ namespace FineUIPro.Web.HJGL.PersonManage
                 rootNode.Text = item.UnitName;
                 rootNode.EnableClickEvent = true;
                 this.tvControlItem.Nodes.Add(rootNode);
-                var getCheckers = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Checker && x.UnitId == item.UnitId select x).ToList();
+                var getCheckers = (from x in Funs.DB.SitePerson_Person where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkPostId == Const.WorkPost_Checker && x.UnitId == item.UnitId  && x.WelderCode.Contains(txtQueryWelderCode.Text.Trim()) select x).ToList();
                 foreach (var sitem in getCheckers)
                 {
                     TreeNode tn = new TreeNode();
@@ -151,6 +151,10 @@ namespace FineUIPro.Web.HJGL.PersonManage
             BindGrid();
             this.BindGvItem();
         }
+        protected void btnQuery_Click1(object sender, EventArgs e)
+        {
+            InitTreeMenu();
+        }
         #region 获取按钮权限
         /// <summary>
         /// 获取按钮权限

SGGL/FineUIPro.Web/HJGL/PersonManage/CheckerManage.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.PersonManage {
+namespace FineUIPro.Web.HJGL.PersonManage
+{
 
 
-    public partial class CheckerManage {
+    public partial class CheckerManage
+    {
 
         /// <summary>
         /// form1 控件。
@@ -48,6 +50,33 @@ namespace FineUIPro.Web.HJGL.PersonManage {
         /// </remarks>
         protected global::FineUIPro.Panel panelLeftRegion;
 
+        /// <summary>
+        /// Toolbar3 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar3;
+
+        /// <summary>
+        /// txtQueryWelderCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtQueryWelderCode;
+
+        /// <summary>
+        /// btnQuery 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnQuery;
+
         /// <summary>
         /// tvControlItem 控件。
         /// </summary>

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

@@ -75,10 +75,7 @@
                                             EmptyText="输入查询条件" Hidden="true"
                                             Width="180px" LabelWidth="80px" LabelAlign="Right">
                                         </f:TextBox>
-                                        <f:TextBox ID="txtDesignPress" runat="server" Label="压力"
+                                        
-                                            EmptyText="输入查询条件"
-                                            Width="180px" LabelWidth="80px" LabelAlign="Right">
-                                        </f:TextBox>
                                         <f:TextBox ID="txtMaterialCode" runat="server" Label="材质"
                                             EmptyText="输入查询条件"
                                             Width="180px" LabelWidth="80px" LabelAlign="Right">

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

@@ -191,9 +191,15 @@ namespace FineUIPro.Web.HJGL.PreDesign
             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();
-            var list = BLL.PipelineService.GetView_HJGL_Pipelines(view_HJGL_Pipeline);
+            var list = BLL.PipelineService.GetHJGL_PipelineList(view_HJGL_Pipeline);
+            if (!string .IsNullOrEmpty(this.txtMaterialCode.Text.Trim()))
+            {
+                list = (from x in list
+                        join y in Funs.DB.HJGL_PipeLineMat on x.PipelineId equals y.PipelineId
+                        where y.MaterialCode.Contains(txtMaterialCode.Text.Trim())
+                        select x).Distinct().ToList();
+            }
             view_HJGL_Pipelines = list;                   
             // 2.获取当前分页数据
             Grid1.RecordCount = list.Count();
@@ -364,7 +370,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
         {
             txtPipelineCode.Text = String.Empty;
             txtSingleName.Text = String.Empty;
-            txtDesignPress.Text = String.Empty;
              txtMaterialCode.Text = String.Empty;
             BindGrid();
         }

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

@@ -185,15 +185,6 @@ namespace FineUIPro.Web.HJGL.PreDesign
         /// </remarks>
         protected global::FineUIPro.TextBox txtSingleName;
 
-        /// <summary>
-        /// txtDesignPress 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.TextBox txtDesignPress;
-
         /// <summary>
         /// txtMaterialCode 控件。
         /// </summary>

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

@@ -39,6 +39,10 @@
                                     EmptyText="输入查询条件"  Width="230px" LabelWidth="65px">
                                 </f:TextBox>
                                 <f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>                              
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
+                            <Items>
                                  <f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
                                     EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
                                 </f:Button>
@@ -130,9 +134,11 @@
                 </f:Panel>
             </Items>
         </f:Panel>
-        <f:Window ID="Window2" Title="弹出窗体" Hidden="true" EnableIFrame="true"
+        <f:Window ID="Window2" Title="匹配100%材料" Hidden="true" EnableIFrame="true"
-            EnableMaximize="true" Target="Top" EnableResize="false" runat="server" IsModal="true"
+            EnableMaximize="true" Target="Top"  runat="server"  
-            Width="1200px" Height="750px">
+            Width="650px" Height="300px" Icon="TagBlue" 
+             EnableCollapse="true" EnableResize="true"
+            IsModal="false"  AutoScroll="true" BodyPadding="10px">
         </f:Window>
     </form>
      <script type="text/javascript">

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

@@ -77,6 +77,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </remarks>
         protected global::FineUIPro.HiddenField hdUnitWorkId;
 
+        /// <summary>
+        /// Toolbar2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar2;
+
         /// <summary>
         /// btnTreeFind 控件。
         /// </summary>

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

@@ -6,8 +6,7 @@
 <head runat="server">
     <title>编辑焊接日报</title>
     <style type="text/css">
-        .customlabel span
+        .customlabel span {
-        {
             color: red;
             font-weight: bold;
         }
@@ -35,7 +34,7 @@
                                 <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="保存" Text ="保存" 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="提交"
@@ -88,13 +87,12 @@
                         </f:Form>
                     </Items>
                     <Items>
-                    <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊接日报"
+
-                        EnableCollapse="true" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true" ForceFit="true"
+                        <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="焊接日报"
+                            EnableCollapse="false" runat="server" BoxFlex="1" DataKeyNames="WeldTaskId,WeldJointId" EnableColumnLines="true" ForceFit="true"
                             AllowCellEditing="true" ClicksToEdit="1" DataIDField="WeldTaskId" AllowSorting="true" KeepCurrentSelection="true" AllowColumnLocking="true"
                             SortField="WeldJointNum" SortDirection="ASC" OnSort="Grid1_Sort" EnableCheckBoxSelect="true" CheckBoxSelectOnly="true"
-                        AllowPaging="false" IsDatabasePaging="false" PageSize="10000" EnableTextSelection="True"  DisableUnselectableRows="true"
+                            EnableTextSelection="True" DisableUnselectableRows="true" PageSize="300">
-                         EnableBigData="true"  >
-                       
                             <Columns>
                                 <f:RenderField HeaderText="焊口序号" ColumnID="WeldJointNum"
                                     DataField="WeldJointNum" SortField="WeldJointNum" FieldType="String" HeaderTextAlign="Center"

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

@@ -1,4 +1,5 @@
 using BLL;
+using FineUIPro.Web.HJGL.WeldingManage;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -248,6 +249,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             // tb = GetFilteredTable(Grid1.FilteredData, tb);
             //var table = this.GetPagedDataTable(Grid1, dt);
             Grid1.RecordCount = task.Count;
+          //  var table = task.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList();
             Grid1.DataSource = task;
             Grid1.DataBind();
 
@@ -622,6 +624,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     //}
 
                     #endregion
+                    ChanggeState();//更新焊口属性
+
                     //更新焊口属性
                     if (string.IsNullOrEmpty(errlog))
                     {
@@ -1241,13 +1245,6 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             if (!string.IsNullOrEmpty(this.WeldingDailyId))
             {
                 List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);               
-                foreach (var item in GetWeldingDailyItem)
-                {
-                   var daily= BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(WeldingDailyId);
-                    BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(item.WeldJointId,  (DateTime)daily.WeldingDate);//更改预制口实际时间和状态
-                    PipelineService.UpdataDateByWeldJointId(item.WeldJointId);//更改安装口时间和状态
-
-                }
                 this.BindGrid(GetWeldingDailyItem);  // 初始化页面
             }
             else
@@ -1256,7 +1253,21 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             }
 
         }
+        private void ChanggeState()
+        {
+            if (!string.IsNullOrEmpty(this.WeldingDailyId))
+            {
+                List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
+                foreach (var item in GetWeldingDailyItem)
+                {
+                    var daily = BLL.WeldingDailyService.GetPipeline_WeldingDailyByWeldingDailyId(WeldingDailyId);
+                    BLL.HJGL_PipelineComponentjointService.UpdateStateByWeldJointId(item.WeldJointId, (DateTime)daily.WeldingDate);//更改预制口实际时间和状态
+                    PipelineService.UpdataDateByWeldJointId(item.WeldJointId);//更改安装口时间和状态
 
+                }
+            }
+            
+        }
         protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
         {
             DataRowView row = e.DataItem as DataRowView;
@@ -1289,5 +1300,25 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 //    }
                 //}
         }
+
+        #region 分页选择下拉改变事件
+        /// <summary>
+        /// 分页选择下拉改变事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.WeldingDailyId))
+            {
+                List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
+                this.BindGrid(GetWeldingDailyItem);  // 初始化页面
+            }
+            else
+            {
+                this.BindGrid(null);
+            }
+        }
+        #endregion
     }
 }

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

@@ -29,9 +29,16 @@
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
                                 <f:TextBox ID="txtPipelineCode" runat="server" Label="管线号"
-                                    EmptyText="输入查询条件"  Width="230px" LabelWidth="65px">
+                                    EmptyText="输入查询条件"  Width="180px" LabelWidth="65px">
                                 </f:TextBox>   
+                                <f:CheckBox ID="ckNOEdit" ShowLabel="false" runat="server" Text="未录入"  Label="未录入" DisplayType="Switch" Checked="true">
+                                </f:CheckBox>
+                            </Items>
+                        </f:Toolbar>
+                        <f:Toolbar  runat="server" ToolbarAlign="Left" >
+                            <Items>                               
                                 <f:HiddenField runat="server" ID="hdUnitWorkId"></f:HiddenField>
+                                <f:ToolbarFill runat="server"></f:ToolbarFill>
                                 <f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
                                     EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
                                 </f:Button>
@@ -41,7 +48,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="false" AutoLeafIdentification="true"
                             EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
                         </f:Tree>
                     </Items>

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

@@ -1,4 +1,5 @@
 using BLL;
+using Microsoft.Office.Interop.Word;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -73,7 +74,22 @@ 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 = 0;
+                    if (ckNOEdit.Checked)
+                    {
+                        string strSql = "SELECT distinct PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL  AND UnitWorkId =@UnitWorkId  AND WPQId IS NULL";
+                        List<SqlParameter> listStr = new List<SqlParameter>();
+                        listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
+                        SqlParameter[] parameter = listStr.ToArray();
+                        System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
+                        a = dt.Rows.Count;
+
+                    }
+                    else
+                    {
+                        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,8 +113,25 @@ 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
+                    int a = 0;
-                            && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim()) select x).Count();
+                    if (ckNOEdit.Checked)
+                    {
+                        string strSql = "SELECT distinct PipelineCode FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL  AND UnitWorkId =@UnitWorkId  AND WPQId IS NULL";
+                        List<SqlParameter> listStr = new List<SqlParameter>();
+                        listStr.Add(new SqlParameter("@UnitWorkId", q.UnitWorkId));
+                        SqlParameter[] parameter = listStr.ToArray();
+                        System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
+                        a = dt.Rows.Count;
+
+                    }
+                    else
+                    {
+                         a = (from x in Funs.DB.HJGL_Pipeline
+                                 where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId
+                                && x.PipelineCode.Contains(this.txtPipelineCode.Text.Trim())
+                                 select x).Count();
+
+                    }
                     var u = BLL.UnitService.GetUnitByUnitId(q.UnitId);
                     TreeNode tn2 = new TreeNode();
                     tn2.NodeID = q.UnitWorkId;
@@ -135,7 +168,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         }
         private void BindNodes(TreeNode node)
         {
-            BLL.PipelineService.BindTreeNodes(node, this.txtPipelineCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
+            BLL.PipelineService.BindTreeNodes(node,true, this.txtPipelineCode.Text.Trim(), this.CurrUser.LoginProjectId, pageSize);
         }
         #endregion
 
@@ -163,6 +196,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             else
             {
                 if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+                {
+                    
+                    if (tvControlItem.SelectedNode.CommandName == "管线")
                     {
                         Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
                         this.hdUnitWorkId.Text = string.Empty;
@@ -172,6 +208,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                             this.BindGrid();
                         }
                     }
+                    else if (tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2)
+                    {
+                        this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.NodeID;
+                        this.BindGrid();
+                    }
+                }
             }
             
         }
@@ -188,9 +230,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                               FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
             List<SqlParameter> listStr = new List<SqlParameter> { };
 
+            if (tvControlItem.SelectedNode.CommandName == "管线")
+            {
                 strSql += " AND PipelineId =@PipelineId";
                 listStr.Add(new SqlParameter("@PipelineId", tvControlItem.SelectedNodeID));
 
+            }
+            else if (tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2)
+            {
+                strSql += " AND UnitWorkId =@UnitWorkId";
+                listStr.Add(new SqlParameter("@UnitWorkId", tvControlItem.SelectedNodeID));
+
+            }
+
             if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()))
             {
                 strSql += " AND WeldJointCode LIKE @WeldJointCode";
@@ -209,12 +261,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 }
             }
             SqlParameter[] parameter = listStr.ToArray();
-            DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
+            System.Data.DataTable dt = SQLHelper.GetDataTableRunText(strSql, parameter);
 
             // 2.获取当前分页数据
             Grid1.RecordCount = dt.Rows.Count;
             var table = this.GetPagedDataTable(Grid1, dt);
-            Grid1.DataSource = dt;
+            Grid1.DataSource = table;
             Grid1.DataBind();
         }
         #endregion

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.WeldingManage {
+namespace FineUIPro.Web.HJGL.WeldingManage
+{
 
 
-    public partial class WeldingConDate {
+    public partial class WeldingConDate
+    {
 
         /// <summary>
         /// form1 控件。
@@ -66,6 +68,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// </remarks>
         protected global::FineUIPro.TextBox txtPipelineCode;
 
+        /// <summary>
+        /// ckNOEdit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.CheckBox ckNOEdit;
+
         /// <summary>
         /// hdUnitWorkId 控件。
         /// </summary>

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

@@ -20,9 +20,12 @@
                     <Toolbars>
                         <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                             <Items>
-                                <f:TextBox ID="txtWorkArea" runat="server" Label="区域" EmptyText="输入查询条件"
+                                <%--<f:TextBox ID="txtWorkArea" runat="server" Label="区域" EmptyText="输入查询条件"
                                     AutoPostBack="true" OnTextChanged="Tree_TextChanged" Width="280px" LabelWidth="50px">
-                                </f:TextBox>
+                                </f:TextBox>--%>
+                                <f:Button ID="btnrefresh" ToolTip="同步NET" Icon="ArrowRefresh"
+                                    EnablePostBack="true"  OnClick="btnrefresh_Click" runat="server">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>

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

@@ -119,16 +119,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
         {
             this.BindGrid();
-            Model.Parameter3D parameter3D = new Model.Parameter3D();
+           
-            Model.ColorModel colorModel = new Model.ColorModel();
-            colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
-            parameter3D.ColorModel = colorModel;
-            parameter3D.TagNum = "";
-            parameter3D.ButtonType = "0";
-            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
-            //  PipelineService.GetPipelinesByUnitWordId(tvControlItem.SelectedNodeID);
-            ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
-            ctlAuditFlow.data = parameter3D;
             ctlAuditFlow.BindData();
         }
         #endregion
@@ -312,6 +303,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             ctlAuditFlow.data = parameter3D;
             ctlAuditFlow.BindData();
         }
+
+        protected void btnrefresh_Click(object sender, EventArgs e)
+        {
+            Model.Parameter3D parameter3D = new Model.Parameter3D();
+            Model.ColorModel colorModel = new Model.ColorModel();
+            colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
+            parameter3D.ColorModel = colorModel;
+            parameter3D.TagNum = "";
+            parameter3D.ButtonType = "0";
+            parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
+            //  PipelineService.GetPipelinesByUnitWordId(tvControlItem.SelectedNodeID);
+            ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName;
+            ctlAuditFlow.data = parameter3D;
+
+        }
         #endregion
 
         #region 关闭弹出窗口及刷新页面

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.designer.cs

@@ -60,13 +60,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         protected global::FineUIPro.Toolbar Toolbar1;
 
         /// <summary>
-        /// txtWorkArea 控件。
+        /// btnrefresh 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtWorkArea;
+        protected global::FineUIPro.Button btnrefresh;
 
         /// <summary>
         /// tvControlItem 控件。

SGGL/Model/HJGL/PipeLineIdCodeItem.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public  class PipeLineIdCodeItem
+    {
+        public string PipelineId { get; set; }
+        public string PipelineCode { get; set; }
+    }
+}

SGGL/Model/Model.csproj

@@ -166,6 +166,7 @@
     <Compile Include="HJGL\3DParameter.cs" />
     <Compile Include="HJGL\MaterialStockItem.cs" />
     <Compile Include="APIItem\HJGL\PackagingManageItem.cs" />
+    <Compile Include="HJGL\PipeLineIdCodeItem.cs" />
     <Compile Include="HJGL\Pipeline_ComponentQRCodeItem.cs" />
     <Compile Include="HJGL\PointBatch.cs" />
     <Compile Include="HJGL\PointBatchItem.cs" />