From fe4a0933ec73d3e064b6f3a2c1410d705e613e7b Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 9 Dec 2022 18:08:25 +0800 Subject: [PATCH] =?UTF-8?q?2022-12-09=20=E7=84=8A=E6=8E=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=8D=95=E6=A0=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/HJGL/WPQ/WPQListService.cs | 149 ++++++++++-------- .../WeldingManage/SelectTaskWeldJoint.aspx.cs | 76 ++++++++- 2 files changed, 149 insertions(+), 76 deletions(-) diff --git a/SGGL/BLL/HJGL/WPQ/WPQListService.cs b/SGGL/BLL/HJGL/WPQ/WPQListService.cs index 1942fdda..0804e534 100644 --- a/SGGL/BLL/HJGL/WPQ/WPQListService.cs +++ b/SGGL/BLL/HJGL/WPQ/WPQListService.cs @@ -230,20 +230,84 @@ namespace BLL var wpq1 = from x in wpq where x.Material1Class == x.Material2Class select x; foreach (var item in wpq1) { - // 满足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") - && (item.SNClass1 == "1" || item.SNClass1 == "2" || item.SNClass1 == "3" || item.SNClass1 == "4" || item.SNClass1 == "5A")) + try { - // 满足:焊口材质1”等于且“焊口材质2”小于WPS材质类别 - if (item.Material1Class == mat1.MaterialClass && Convert.ToInt32(item.SNClass2) > m2) + // 满足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") + && (item.SNClass1 == "1" || item.SNClass1 == "2" || item.SNClass1 == "3" || item.SNClass1 == "4" || item.SNClass1 == "5A")) { - list.Add(item); - } - // 满足:焊口“材质2”等于且“焊口材质1”小于WPS材质类别 - else if (item.Material2Class == mat2.MaterialClass && Convert.ToInt32(item.SNClass1) > m1) - { - list.Add(item); + // 满足:焊口材质1”等于且“焊口材质2”小于WPS材质类别 + if (item.Material1Class == mat1.MaterialClass && Convert.ToInt32(item.SNClass2) > m2) + { + list.Add(item); + } + // 满足:焊口“材质2”等于且“焊口材质1”小于WPS材质类别 + else if (item.Material2Class == mat2.MaterialClass && Convert.ToInt32(item.SNClass1) > m1) + { + list.Add(item); + } + else + { + // WPS“材质1”与“材质2”“组别”相等 + if (item.Material1Group == item.Material2Group) + { + //≠“Fe-1-2” + if (item.Material1Group != "Fe-1-2") + { + //焊口“材质1”与“材质2”组别关系 + //相等且等于WPS材质组别 + if (mat1.MaterialGroup == mat2.MaterialGroup && mat1.MaterialGroup == item.Material1Group) + { + list.Add(item); + } + //“材质1”等于且“材质2”小于WPS材质组别 + else if (mat1.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup2 && Convert.ToInt32(item.SNGroup1) > g2) + { + list.Add(item); + } + //“材质2”等于且“材质1”小于WPS材质组别 + else if (mat2.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup1 && Convert.ToInt32(item.SNGroup1) > g1) + { + list.Add(item); + } + } + //＝“Fe-1-2” + else + { + //=“Fe-1-2” + if (mat1.MaterialGroup == "Fe-1-2" && mat2.MaterialGroup == "Fe-1-2") + { + list.Add(item); + } + //=“Fe-1-1” + else if (mat1.MaterialGroup == "Fe-1-1" && mat2.MaterialGroup == "Fe-1-1") + { + list.Add(item); + } + //“材质1”等于且“材质2”小于WPS材质组别 + else if (mat1.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup2 && Convert.ToInt32(item.SNGroup1) > g2) + { + list.Add(item); + } + //“材质2”等于且“材质1”小于WPS材质组别 + else if (mat2.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup1 && Convert.ToInt32(item.SNGroup1) > g1) + { + list.Add(item); + } + } + } + //WPS“材质1”与“材质2”“组别”不相等 + else + { + //"与WPS一致（材1 = WPS材1，且材2 = WPS材2或材2 = WPS材1，且材1 = WPS材2）" + if ((mat1.MaterialGroup == item.Material1Group && mat2.MaterialGroup == item.Material2Group) || (mat2.MaterialGroup == item.Material1Group && mat1.MaterialGroup == item.Material2Group)) + { + list.Add(item); + } + } + } } + //其他 else { // WPS“材质1”与“材质2”“组别”相等 @@ -305,67 +369,12 @@ namespace BLL } } } - //其他 - else + catch (Exception ex ) { - // WPS“材质1”与“材质2”“组别”相等 - if (item.Material1Group == item.Material2Group) - { - //≠“Fe-1-2” - if (item.Material1Group != "Fe-1-2") - { - //焊口“材质1”与“材质2”组别关系 - //相等且等于WPS材质组别 - if (mat1.MaterialGroup == mat2.MaterialGroup && mat1.MaterialGroup == item.Material1Group) - { - list.Add(item); - } - //“材质1”等于且“材质2”小于WPS材质组别 - else if (mat1.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup2 && Convert.ToInt32(item.SNGroup1) > g2) - { - list.Add(item); - } - //“材质2”等于且“材质1”小于WPS材质组别 - else if (mat2.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup1 && Convert.ToInt32(item.SNGroup1) > g1) - { - list.Add(item); - } - } - //＝“Fe-1-2” - else - { - //=“Fe-1-2” - if (mat1.MaterialGroup == "Fe-1-2" && mat2.MaterialGroup == "Fe-1-2") - { - list.Add(item); - } - //=“Fe-1-1” - else if (mat1.MaterialGroup == "Fe-1-1" && mat2.MaterialGroup == "Fe-1-1") - { - list.Add(item); - } - //“材质1”等于且“材质2”小于WPS材质组别 - else if (mat1.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup2 && Convert.ToInt32(item.SNGroup1) > g2) - { - list.Add(item); - } - //“材质2”等于且“材质1”小于WPS材质组别 - else if (mat2.MaterialGroup == item.Material1Group && item.PreGroup1 == preGroup1 && Convert.ToInt32(item.SNGroup1) > g1) - { - list.Add(item); - } - } - } - //WPS“材质1”与“材质2”“组别”不相等 - else - { - //"与WPS一致（材1 = WPS材1，且材2 = WPS材2或材2 = WPS材1，且材1 = WPS材2）" - if ((mat1.MaterialGroup == item.Material1Group && mat2.MaterialGroup == item.Material2Group) || (mat2.MaterialGroup == item.Material1Group && mat1.MaterialGroup == item.Material2Group)) - { - list.Add(item); - } - } + ErrLogInfo.WriteLog(ex.ToString()); + continue ; } + } // 一、材质类别不相等 var wpq2 = from x in wpq where x.Material1Class != x.Material2Class select x; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs index c2c287c7..339ccfa5 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs +++ b/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 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(); HJGL_MaterialService.materialStockItems_SHOP = new List(); - + pageindex = 1; + pageindex_2 = 1; + Tree_hJGL_Pipelines =new List (); 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 /// 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(); + + 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) @@ -251,7 +290,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// /// 数据绑定 /// - private void BindGrid() + private void BindGrid() { string pipelineId = this.tvControlItem.SelectedNodeID; @@ -321,7 +360,32 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { - this.BindGrid(); + 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 排序