2022-12-09 焊接任务单树修改

SGGL/BLL/HJGL/WPQ/WPQListService.cs

@@ -229,6 +229,8 @@ namespace BLL
             // 一、材质类别相等
             var wpq1 = from x in wpq where x.Material1Class == x.Material2Class select x;
             foreach (var item in wpq1)
+            {
+                try
                 {
                     // 满足WPS第一个条件：焊接方法为“PAW、SMAW、SAW、GMAW、FCAW、GTAW”且材质类别属于Fe-1~Fe-5A
                     if ((item.WeldingMethodCode == "PAW" || item.WeldingMethodCode == "SMAW" || item.WeldingMethodCode == "SAW" || item.WeldingMethodCode == "GMAW" || item.WeldingMethodCode == "FCAW" || item.WeldingMethodCode == "GTAW")
@@ -367,6 +369,13 @@ namespace BLL
                         }
                     }
                 }
+                catch (Exception ex )
+                {
+                    ErrLogInfo.WriteLog(ex.ToString());
+                    continue ;
+                }
+               
+            }
             // 一、材质类别不相等
             var wpq2 = from x in wpq where x.Material1Class != x.Material2Class select x;
             foreach (var item in wpq2)

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

@@ -1,10 +1,13 @@
 using Aspose.Words;
 using BLL;
+using Model;
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using System.Web.UI.WebControls;
+using System.Windows.Forms;
+
 namespace FineUIPro.Web.HJGL.WeldingManage
 {
     public partial class SelectTaskWeldJoint : PageBase
@@ -81,7 +84,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 ViewState["SelectedList"] = value;
             }
         }
-
+        public List<HJGL_Pipeline> Tree_hJGL_Pipelines;
+        public int pageindex=1;
+        public int pageindex_2=1;
+        public int page;
         #endregion
 
         #region 加载页面
@@ -96,7 +102,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             {
                 HJGL_MaterialService.materialStockItems_FIELD = new List<Model.MaterialStockItem>();
                 HJGL_MaterialService.materialStockItems_SHOP = new List<Model.MaterialStockItem>();
-
+                pageindex = 1;
+                pageindex_2 = 1;
+                Tree_hJGL_Pipelines =new List<HJGL_Pipeline> ();
                 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);
@@ -158,6 +166,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </summary>
         private void InitTreeMenu()
         {
+            pageindex = 1;
+            pageindex_2 = 1;
             this.tvControlItem.Nodes.Clear();
             TreeNode rootNode1 = new TreeNode();
             rootNode1.NodeID = BLL.PipelineService.PipeArea_SHOP;
@@ -204,11 +214,29 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         }
         void AddTreeNode(string PipeArea , TreeNode node )
         {
+            
             var iso = (from x in PipelineService.hJGL_Pipelines where x.UnitWorkId == this.UnitWorkId && x.UnitId == this.UnitId && x.PipeArea == PipeArea orderby x.PipelineCode select x).ToList();           
             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();
             }
+            int pagenum = 1 ;
+            switch (PipeArea)
+            {
+                case "1":
+                    pagenum = pageindex;
+                    break;
+                case "2":
+                    pagenum = pageindex_2;
+                    break;
+            }
+        
+            var Count = iso.Count();
+            if (pagenum <= Count)
+            {
+                iso = iso.Skip(30 * (pagenum - 1)).Take(30).ToList(); ;
+
+            }
             var joints = from x in WeldJointService.hJGL_WeldJoints  select x;
             foreach (var item in iso)
             {
@@ -225,6 +253,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 newNode.ToolTip = item.PipelineCode;
                 newNode.EnableClickEvent = true;
                 node.Nodes.Add(newNode);
+                
+            }
+            if (pagenum < Count)
+            {
+                TreeNode newNode = new TreeNode();
+                newNode.Text = "下一页";
+                newNode.NodeID = "下一页";
+                newNode.Icon = Icon.ArrowDown;
+                newNode.CommandName = PipeArea;
+                newNode.EnableClickEvent = true;
+                node.Nodes.Add(newNode);
             }
         }
         protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e)
@@ -320,8 +359,33 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// <param name="sender"></param>
         /// <param name="e"></param>
         protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
+        {
+            if (e.NodeID == "下一页")
+            {
+                
+                if (e.Node.CommandName == "1")
+                {
+                    pageindex = pageindex + 1;
+                    TreeNode treeNode = e.Node.ParentNode;
+                    treeNode.Nodes.Remove(e.Node);
+                    AddTreeNode(BLL.PipelineService.PipeArea_SHOP, e.Node.ParentNode);
+
+                }
+                else if (e.Node.CommandName == "2")
+                {
+                    pageindex_2 = pageindex_2 + 1; 
+                    TreeNode treeNode = e.Node.ParentNode;
+                    treeNode.Nodes.Remove(e.Node);
+
+                    AddTreeNode(BLL.PipelineService.PipeArea_FIELD, e.Node.ParentNode);
+
+                }
+            }
+            else
             {
                 this.BindGrid();
+
+            }
         }
         #endregion
         #region 排序