diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs index 9145a3ec..d1603fa1 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineService.cs @@ -1,4 +1,5 @@ using MiniExcelLibs; +using Model; using System; using System.Collections.Generic; using System.Data; @@ -40,6 +41,33 @@ namespace BLL { return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineCode == pipelineCode); } + public static List GetView_HJGL_Pipelines(View_HJGL_Pipeline model) + { + var db = Funs.DB; + var pipelineList =( from x in 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; + } /// /// 根据unitworkId获取所有管线 /// diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs index 5c71cf0a..a229aacc 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs @@ -369,7 +369,18 @@ namespace BLL var q = (from x in Funs.DB.View_HJGL_WeldJoint where x.PipelineId == pipelineId orderby x.WeldJointCode select x).ToList(); return q; } - + public static List GetViewWeldJointsBymodel(Model.View_HJGL_WeldJoint model) + { + var q = (from x in Funs.DB.View_HJGL_WeldJoint + where + (string.IsNullOrEmpty(model.ProjectId) || x.ProjectId.Contains(model.ProjectId)) + && (string.IsNullOrEmpty(model.UnitWorkId) || x.UnitWorkId.Contains(model.UnitWorkId)) + && (string.IsNullOrEmpty(model.PipelineId) || x.PipelineId.Contains(model.PipelineId)) + && (string.IsNullOrEmpty(model.PipelineCode) || x.PipelineCode.Contains(model.PipelineCode)) + && (string.IsNullOrEmpty(model.WeldJointCode) || x.WeldJointCode.Contains(model.WeldJointCode)) + orderby x.WeldJointCode select x).ToList(); + return q; + } /// /// 根据壁厚计算焊口达因 /// diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index 2f9bb582..3ee0b620 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -58,3 +58,257 @@ IP地址:::1 出错时间:10/18/2022 15:41:53 + +错误信息开始=====> +错误类型:EvaluateException +错误信息:未找到列 [材料编码]。 +错误堆栈: + 在 System.Data.NameNode.Bind(DataTable table, List`1 list) + 在 System.Data.BinaryNode.Bind(DataTable table, List`1 list) + 在 System.Data.BinaryNode.Bind(DataTable table, List`1 list) + 在 System.Data.BinaryNode.Bind(DataTable table, List`1 list) + 在 System.Data.DataExpression.Bind(DataTable table) + 在 System.Data.DataExpression..ctor(DataTable table, String expression, Type type) + 在 System.Data.DataTable.Select(String filterExpression) + 在 FineUIPro.Web.HJGL.WeldingManage.PipelineMatIn.AddDatasetToSQL(DataTable pds, Int32 Cols) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingManage\PipelineMatIn.aspx.cs:行号 155 + 在 FineUIPro.Web.HJGL.WeldingManage.PipelineMatIn.btnAudit_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingManage\PipelineMatIn.aspx.cs:行号 377 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/24/2022 01:24:42 +出错文件:http://localhost:8008/HJGL/WeldingManage/PipelineMatIn.aspx?UnitWorkId=5c955308-1645-4575-acbf-68dd66c4179a +IP地址:::1 +操作人员:JT + +出错时间:10/24/2022 01:24:42 + + +错误信息开始=====> +错误类型:InvalidOperationException +错误信息:序列不包含任何元素 +错误堆栈: + 在 System.Linq.Enumerable.First[TSource](IEnumerable`1 source) + 在 FineUIPro.Web.HJGL.PreDesign.PipelingDivide.ConvertPipeArea(Object PipeArea) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\PipelingDivide.aspx.cs:行号 375 + 在 ASP.hjgl_predesign_pipelingdivide_aspx.__DataBindingtxt(Object sender, EventArgs e) 位置 d:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\PipelingDivide.aspx:行号 119 + 在 System.Web.UI.Control.OnDataBinding(EventArgs e) + 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding) + 在 System.Web.UI.Control.DataBind() + 在 System.Web.UI.Control.DataBindChildren() + 在 System.Web.UI.Control.DataBind(Boolean raiseOnDataBinding) + 在 System.Web.UI.Control.DataBind() + 在 (Control ) + 在 FineUIPro.GridRow.BkpgFeAELTFlAvoTrOBrConfcLJbA() + 在 (GridRow ) + 在 FineUIPro.Grid.BkpgFeAELTFlAvoTrOBrConfcLJbA(Int32 , Object ) + 在 (Grid , Int32 , Object ) + 在 FineUIPro.Grid.LDChsdiaqdhUTcxBcQPMKyQFfjEDB(DataTable , Boolean ) + 在 (Grid , DataTable , Boolean ) + 在 FineUIPro.Grid.DataBind(Boolean keepCurrentData) + 在 (Grid , Boolean ) + 在 FineUIPro.Grid.DataBind() + 在 FineUIPro.Web.HJGL.PreDesign.PipelingDivide.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\PipelingDivide.aspx.cs:行号 207 + 在 FineUIPro.Web.HJGL.PreDesign.PipelingDivide.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\PreDesign\PipelingDivide.aspx.cs:行号 143 + 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) + 在 (Tree , TreeCommandEventArgs ) + 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/24/2022 22:26:31 +出错文件:http://localhost:8008/HJGL/PreDesign/PipelingDivide.aspx +IP地址:::1 +操作人员:JT + +出错时间:10/24/2022 22:26:31 + + +错误信息开始=====> +错误类型:IndexOutOfRangeException +错误信息:无法找到列 UnitWorkCode。 +错误堆栈: + 在 System.Data.DataTable.ParseSortString(String sortString) + 在 System.Data.DataView.CheckSort(String sort) + 在 System.Data.DataView.set_Sort(String value) + 在 FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:行号 458 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 355 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 238 + 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) + 在 (Tree , TreeCommandEventArgs ) + 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/25/2022 18:40:26 +出错文件:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx +IP地址:::1 +操作人员:JT + +出错时间:10/25/2022 18:40:26 + + +错误信息开始=====> +错误类型:IndexOutOfRangeException +错误信息:无法找到列 UnitWorkCode。 +错误堆栈: + 在 System.Data.DataTable.ParseSortString(String sortString) + 在 System.Data.DataView.CheckSort(String sort) + 在 System.Data.DataView.set_Sort(String value) + 在 FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:行号 458 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 355 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 238 + 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) + 在 (Tree , TreeCommandEventArgs ) + 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/25/2022 18:40:28 +出错文件:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx +IP地址:::1 +操作人员:JT + +出错时间:10/25/2022 18:40:28 + + +错误信息开始=====> +错误类型:IndexOutOfRangeException +错误信息:无法找到列 UnitWorkCode。 +错误堆栈: + 在 System.Data.DataTable.ParseSortString(String sortString) + 在 System.Data.DataView.CheckSort(String sort) + 在 System.Data.DataView.set_Sort(String value) + 在 FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:行号 458 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 355 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 238 + 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) + 在 (Tree , TreeCommandEventArgs ) + 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/25/2022 18:40:29 +出错文件:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx +IP地址:::1 +操作人员:JT + +出错时间:10/25/2022 18:40:29 + + +错误信息开始=====> +错误类型:IndexOutOfRangeException +错误信息:无法找到列 UnitWorkCode。 +错误堆栈: + 在 System.Data.DataTable.ParseSortString(String sortString) + 在 System.Data.DataView.CheckSort(String sort) + 在 System.Data.DataView.set_Sort(String value) + 在 FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:行号 458 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 355 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 238 + 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) + 在 (Tree , TreeCommandEventArgs ) + 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/25/2022 18:40:30 +出错文件:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx +IP地址:::1 +操作人员:JT + +出错时间:10/25/2022 18:40:30 + + +错误信息开始=====> +错误类型:IndexOutOfRangeException +错误信息:无法找到列 UnitWorkCode。 +错误堆栈: + 在 System.Data.DataTable.ParseSortString(String sortString) + 在 System.Data.DataView.CheckSort(String sort) + 在 System.Data.DataView.set_Sort(String value) + 在 FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:行号 458 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 355 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 238 + 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) + 在 (Tree , TreeCommandEventArgs ) + 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/25/2022 18:40:32 +出错文件:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx +IP地址:::1 +操作人员:JT + +出错时间:10/25/2022 18:40:32 + + +错误信息开始=====> +错误类型:IndexOutOfRangeException +错误信息:无法找到列 UnitWorkCode。 +错误堆栈: + 在 System.Data.DataTable.ParseSortString(String sortString) + 在 System.Data.DataView.CheckSort(String sort) + 在 System.Data.DataView.set_Sort(String value) + 在 FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:行号 458 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 355 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 238 + 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) + 在 (Tree , TreeCommandEventArgs ) + 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/25/2022 18:41:58 +出错文件:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx +IP地址:::1 +操作人员:JT + +出错时间:10/25/2022 18:41:58 + + +错误信息开始=====> +错误类型:KeyNotFoundException +错误信息:给定关键字不在字典中。 +错误堆栈: + 在 System.Collections.Generic.Dictionary`2.get_Item(TKey key) + 在 BLL.Funs.get_DB() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\Common\Funs.cs:行号 140 + 在 FineUIPro.Web.PageBase.get_CurrUser() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:行号 39 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.Page_Load(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 83 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/25/2022 18:42:00 +出错文件:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx +IP地址:::1 + +出错时间:10/25/2022 18:42:01 + + +错误信息开始=====> +错误类型:IndexOutOfRangeException +错误信息:无法找到列 UnitWorkCode。 +错误堆栈: + 在 System.Data.DataTable.ParseSortString(String sortString) + 在 System.Data.DataView.CheckSort(String sort) + 在 System.Data.DataView.set_Sort(String value) + 在 FineUIPro.Web.PageBase.GetPagedDataTable[T](Grid Grid1, IEnumerable`1 varlist) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\common\PageBase.cs:行号 458 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 355 + 在 FineUIPro.Web.HJGL.InfoQuery.JointQuery.tvControlItem_NodeCommand(Object sender, TreeCommandEventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\InfoQuery\JointQuery.aspx.cs:行号 238 + 在 FineUIPro.Tree.OnNodeCommand(TreeCommandEventArgs e) + 在 (Tree , TreeCommandEventArgs ) + 在 FineUIPro.Tree.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:10/25/2022 18:42:05 +出错文件:http://localhost:8008/HJGL/InfoQuery/JointQuery.aspx +IP地址:127.0.0.1 +操作人员:JT + +出错时间:10/25/2022 18:42:05 + diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 999ba33d..f7277fd9 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -56,6 +56,28 @@ namespace FineUIPro.Web.HJGL.InfoQuery ViewState["JointNoPre"] = value; } } + public string Completed_weldedjunction + { + get + { + return (string)ViewState["Completed_weldedjunction"]; + } + set + { + ViewState["Completed_weldedjunction"] = value; + } + } + public string Incomplete_weldjunction + { + get + { + return (string)ViewState["Incomplete_weldjunction"]; + } + set + { + ViewState["Incomplete_weldjunction"] = value; + } + } protected void Page_Load(object sender, EventArgs e) { ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); @@ -221,6 +243,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery parameter3D.TagNum = ""; parameter3D.ButtonType = "0,2"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + parameter3D.Completed_weldedjunction = Completed_weldedjunction; + parameter3D.Incomplete_weldjunction = Incomplete_weldjunction; + if (this.tvControlItem.SelectedNode.CommandName == "单位工程") { parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); @@ -278,43 +303,90 @@ namespace FineUIPro.Web.HJGL.InfoQuery private void BindGrid() { - string strSql = @"SELECT * FROM dbo.View_HJGL_JointInfoQuery - WHERE ProjectId= @ProjectId"; - List listStr = new List(); - listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + //string strSql = @"SELECT * FROM dbo.View_HJGL_JointInfoQuery + // WHERE ProjectId= @ProjectId"; + //List listStr = new List(); + //listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + //if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + //{ + // strSql += " AND UnitWorkId =@UnitWorkId"; + // listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); + + //} + //else if (this.tvControlItem.SelectedNode.CommandName == "管线") + //{ + // strSql += " AND PipelineId = @PipelineId"; + // listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); + //} + //if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim())) + //{ + // strSql += " AND WeldJointCode LIKE @WeldJointCode"; + // listStr.Add(new SqlParameter("@WeldJointCode", this.txtWeldJointCode.Text.Trim())); + //} + //SqlParameter[] parameter = listStr.ToArray(); + //DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + //var q = tb.AsEnumerable().Where(x => x["WeldingDate"].ToString() != ""); + //var q2 = tb.AsEnumerable().Where(x => x["JointAttribute"].ToString() == "预制口"); + //var sumcount = tb.Rows.Count; + //this.Grid1.RecordCount = tb.Rows.Count; + Model.View_HJGL_WeldJoint model =new Model.View_HJGL_WeldJoint(); + model.ProjectId = this.CurrUser.LoginProjectId; if (this.tvControlItem.SelectedNode.CommandName == "单位工程") { - strSql += " AND UnitWorkId =@UnitWorkId"; - listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); + model.UnitWorkId = this.tvControlItem.SelectedNodeID; } else if (this.tvControlItem.SelectedNode.CommandName == "管线") { - strSql += " AND PipelineId = @PipelineId"; - listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); + model.PipelineId= this.tvControlItem.SelectedNodeID; } - if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim())) - { - strSql += " AND WeldJointCode LIKE @WeldJointCode"; - listStr.Add(new SqlParameter("@WeldJointCode", this.txtWeldJointCode.Text.Trim())); - } - - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - var q = tb.AsEnumerable().Where(x => x["WeldingDate"].ToString() != ""); - var q2 = tb.AsEnumerable().Where(x => x["JointAttribute"].ToString() == "预制口"); - var sumcount= tb.Rows.Count; - this.Grid1.RecordCount = tb.Rows.Count; + model.WeldJointCode = this.txtWeldJointCode.Text; + var list= BLL.WeldJointService.GetViewWeldJointsBymodel(model); + get3DParmeter_weldjoint(list);//获取三维所需焊口参数 + var q = list.Where(x => !string.IsNullOrEmpty(x.WeldingDate)); + var q2 = list.Where(x =>x.JointAttribute == "预制口"); + var sumcount= list.Count; + this.Grid1.RecordCount = list.Count; this.JointComplete = q.Count(); this.JointNoComplete = sumcount - JointComplete; this.JointPre = q2.Count(); this.JointNoPre = sumcount - JointPre; - var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; + //var table = this.GetPagedDataTable(Grid1, list); + Grid1.DataSource = list; Grid1.DataBind(); } + private void get3DParmeter_weldjoint(List model) + { + if (model.Any()) + { + var q = model.Where(x => !string.IsNullOrEmpty(x.WeldingDate));//获取已完成焊口 + if (q.Any()) + { + List Completed_weldedjunctionList = new List(); + + foreach (var item in q) + { + Completed_weldedjunctionList.Add("/" + item.WeldJointCode); + } + Completed_weldedjunction = string.Join(",", Completed_weldedjunctionList); + } + + var q1 = model.Where(x => string.IsNullOrEmpty(x.WeldingDate));//获取未完成管线 + if (q1.Any()) + { + List Incomplete_weldjunctionList = new List(); + foreach (var item in q1) + { + Incomplete_weldjunctionList.Add("/" + item.PipelineCode); + } + Incomplete_weldjunction = string.Join(",", Incomplete_weldjunctionList); + } + + } + + } #region protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) @@ -449,6 +521,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery parameter3D.ColorModel = colorModel; parameter3D.TagNum = pipecode; parameter3D.ButtonType = "0,2"; + parameter3D.Completed_weldedjunction = Completed_weldedjunction; + parameter3D.Incomplete_weldjunction=Incomplete_weldjunction; if (this.tvControlItem.SelectedNode.CommandName == "单位工程") { parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx index 7220bc2e..abbd78df 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx @@ -95,10 +95,16 @@ DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="220px" Locked="true"> - - + --%> + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs index 51ceaca2..716ea6bf 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using Model; using System; using System.Collections.Generic; using System.Data; @@ -9,6 +10,28 @@ namespace FineUIPro.Web.HJGL.InfoQuery { public partial class PipelineQuery : PageBase { + public string Completed_pipeline + { + get + { + return (string)ViewState["Completed_pipeline"]; + } + set + { + ViewState["Completed_pipeline"] = value; + } + } + public string Incomplete_pipeline + { + get + { + return (string)ViewState["Incomplete_pipeline"]; + } + set + { + ViewState["Incomplete_pipeline"] = value; + } + } protected void Page_Load(object sender, EventArgs e) { ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); @@ -118,6 +141,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery parameter3D.TagNum = ""; parameter3D.ButtonType = "0,2"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + parameter3D.Completed_pipeline = Completed_pipeline; + parameter3D.Incomplete_pipeline = Incomplete_pipeline; ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C"+ parameter3D.ModelName; ctlAuditFlow.data = parameter3D; @@ -132,46 +157,89 @@ namespace FineUIPro.Web.HJGL.InfoQuery /// private void BindGrid() { - string strSql = @"SELECT ProjectId,UnitWorkId,PipelineId,PipelineCode,UnitName,MediumCode,MediumName,PipingClassCode,UnitWorkCode,SingleName, - TestPressure,SingleNumber,DetectionRateCode,DetectionType,Remark,TestMediumCode,TotalDin,FinishSize, - JointCount,PressurePipingClassCode,PipeLenth,DesignPress,DesignTemperature,LeakPressure,VacuumPressure, - LeakMediumName,PCMediumName,MaterialCode,FinishedDate, - (CASE WHEN IsFinished=1 THEN '已完成' ELSE '未完成' END) AS IsFinished - FROM dbo.View_HJGL_Pipeline - WHERE ProjectId= @ProjectId"; - List listStr = new List(); - listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + // string strSql = @"SELECT ProjectId,UnitWorkId,PipelineId,PipelineCode,UnitName,MediumCode,MediumName,PipingClassCode,UnitWorkCode,SingleName, + // TestPressure,SingleNumber,DetectionRateCode,DetectionType,Remark,TestMediumCode,TotalDin,FinishSize, + // JointCount,PressurePipingClassCode,PipeLenth,DesignPress,DesignTemperature,LeakPressure,VacuumPressure, + // LeakMediumName,PCMediumName,MaterialCode,FinishedDate, + //(CASE WHEN IsFinished=1 THEN '已完成' ELSE '未完成' END) AS IsFinished + // FROM dbo.View_HJGL_Pipeline + // WHERE ProjectId= @ProjectId"; + // List listStr = new List(); + // listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - strSql += " AND UnitWorkId =@UnitWorkId"; - listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); - if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim())) - { - strSql += " AND PipelineCode LIKE @PipelineCode"; - listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipelineCode.Text.Trim() + "%")); - } + // strSql += " AND UnitWorkId =@UnitWorkId"; + // listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); + // if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim())) + // { + // strSql += " AND PipelineCode LIKE @PipelineCode"; + // listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipelineCode.Text.Trim() + "%")); + // } + // if (drpIsFinish.SelectedValue == "1") + // { + // strSql += " AND pipe.IsFinished = 1"; + // } + // if (drpIsFinish.SelectedValue == "0") + // { + // strSql += " AND (pipe.IsFinished IS NULL OR pipe.IsFinished = 0)"; + // } + + // SqlParameter[] parameter = listStr.ToArray(); + // DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + 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(); + view_HJGL_Pipeline.IsFinished = null; if (drpIsFinish.SelectedValue == "1") { - strSql += " AND pipe.IsFinished = 1"; - } + view_HJGL_Pipeline.IsFinished = true; + } if (drpIsFinish.SelectedValue == "0") { - strSql += " AND (pipe.IsFinished IS NULL OR pipe.IsFinished = 0)"; + view_HJGL_Pipeline.IsFinished = false; } - - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - + var list = BLL.PipelineService.GetView_HJGL_Pipelines(view_HJGL_Pipeline); + get3DParmeter_pipeline(list); // 2.获取当前分页数据 //var table = this.GetPagedDataTable(Grid1, tb1); - Grid1.RecordCount = tb.Rows.Count; - tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid1, tb); + Grid1.RecordCount = list.Count; + //tb = GetFilteredTable(Grid1.FilteredData, tb); + var table = this.GetPagedDataTable(Grid1, list); Grid1.DataSource = table; Grid1.DataBind(); } #endregion + private void get3DParmeter_pipeline(List view_HJGL_Pipelines ) + { + if (view_HJGL_Pipelines.Any()) + { + var q = view_HJGL_Pipelines.Where(x => x.IsFinished == true);//获取已完成管线 + if (q.Any()) + { + List Completed_pipelineList = new List(); + foreach (var item in q) + { + Completed_pipelineList.Add("/" + item.PipelineCode); + } + Completed_pipeline = string.Join(",", Completed_pipelineList); + } + + var q1 = view_HJGL_Pipelines.Where(x => x.IsFinished != true);//获取未完成管线 + if (q1.Any()) + { + List Incomplete_pipelineList = new List(); + foreach (var item in q1) + { + Incomplete_pipelineList.Add("/" + item.PipelineCode); + } + Incomplete_pipeline = string.Join(",", Incomplete_pipelineList); + } + + } + + } #region 分页排序 #region 页索引改变事件 /// @@ -325,7 +393,19 @@ namespace FineUIPro.Web.HJGL.InfoQuery return ""; } } - + protected string ConvertIsFinished(object IsFinished) + { + string IsFinishedValue = "未完成"; + if (IsFinished != null) + { + if (IsFinished.ToString()=="True") + { + IsFinishedValue = "已完成"; + } + + } + return IsFinishedValue; + } protected void btnGetChart_Click(object sender, EventArgs e) { decimal PipelineComplete = 0; @@ -372,6 +452,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery parameter3D.TagNum = pipecode; parameter3D.ButtonType = "0,2"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + parameter3D.Completed_pipeline = Completed_pipeline; + parameter3D.Incomplete_pipeline = Incomplete_pipeline; + ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs index 3079b36e..8f8ba657 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs @@ -203,6 +203,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery /// protected global::FineUIPro.Grid Grid1; + /// + /// txtIsFinished 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label txtIsFinished; + /// /// Label1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx index 76361367..c34657d8 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx @@ -109,10 +109,16 @@ Title="管线号" DataToolTipField="PipelineCode" SortField="PipelineCode" Locked="true"> - - + --%> + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs index 3899b77b..4beceae3 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs @@ -33,6 +33,17 @@ namespace FineUIPro.Web.HJGL.PreDesign ViewState["PipelineNOComplete"] = value; } } + public string Line_No + { + get + { + return (string)ViewState["Line_No"]; + } + set + { + ViewState["Line_No"] = value; + } + } protected void Page_Load(object sender, EventArgs e) { ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); @@ -148,7 +159,7 @@ namespace FineUIPro.Web.HJGL.PreDesign parameter3D.TagNum = ""; parameter3D.ButtonType = "0,1"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); - + parameter3D.Line_No = Line_No; ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); @@ -162,47 +173,33 @@ namespace FineUIPro.Web.HJGL.PreDesign /// private void BindGrid() { - string strSql = @"SELECT ProjectId,UnitWorkId,PipelineId,PipelineCode, - (CASE WHEN PipeArea='1' THEN '工厂预制' WHEN PipeArea='2' THEN '现场施工' - ELSE '' END) AS PipeArea - FROM dbo.View_HJGL_Pipeline - WHERE ProjectId= @ProjectId"; - List listStr = new List(); - listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - - strSql += " AND UnitWorkId =@UnitWorkId"; - listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); - if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim())) + + 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(); + 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 q = list.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP ); + var q2 = list.Where(x => x.PipeArea == PipelineService.PipeArea_FIELD ); + if (q.Any()) { - strSql += " AND PipelineCode LIKE @PipelineCode"; - listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipelineCode.Text.Trim() + "%")); + List listpipecode = new List(); + foreach (var item in q) + { + listpipecode.Add("/" + item.PipelineCode); + } + Line_No = string.Join(",", listpipecode); } - if (!string.IsNullOrEmpty(this.txtSingleName.Text.Trim())) - { - strSql += " AND SingleName LIKE @SingleName"; - listStr.Add(new SqlParameter("@SingleName", "%" + this.txtSingleName.Text.Trim() + "%")); - } - if (!string.IsNullOrEmpty(this.txtDesignPress.Text.Trim())) - { - strSql += " AND DesignPress LIKE @DesignPress"; - listStr.Add(new SqlParameter("@DesignPress", "%" + this.txtDesignPress.Text.Trim() + "%")); - } - if (!string.IsNullOrEmpty(this.txtMaterialCode.Text.Trim())) - { - strSql += " AND MaterialCode LIKE @MaterialCode"; - listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text.Trim() + "%")); - } - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - var q = tb.AsEnumerable().Where(x => x["PipeArea"].ToString() == "工厂预制"); - var q2 = tb.AsEnumerable().Where(x => x["PipeArea"].ToString() == "现场施工"); + PipelineComplete = q.Count(); PipelineNOComplete = q2.Count(); // 2.获取当前分页数据 - //var table = this.GetPagedDataTable(Grid1, tb1); - Grid1.RecordCount = tb.Rows.Count; - tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid1, tb); + Grid1.RecordCount = list.Count(); + //list = GetFilteredTable(Grid1.FilteredData, list); + var table = this.GetPagedDataTable(Grid1, list); Grid1.DataSource = table; Grid1.DataBind(); } @@ -284,6 +281,8 @@ namespace FineUIPro.Web.HJGL.PreDesign parameter3D.TagNum = pipecode; parameter3D.ButtonType = "0,1"; parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + parameter3D.Line_No = Line_No; + ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName; ctlAuditFlow.data = parameter3D; ctlAuditFlow.BindData(); @@ -363,29 +362,24 @@ namespace FineUIPro.Web.HJGL.PreDesign } #endregion - protected string ConvertDetectionType(object detectionType) + protected string ConvertPipeArea(object PipeArea) { - string detectionName = string.Empty; - if (detectionType != null) + string PipeAreaValue = string.Empty; + if (PipeArea != null) { - string[] types = detectionType.ToString().Split('|'); - foreach (string t in types) + var q = PipelineService.GetPipeArea().Where(x => x.Value == PipeArea.ToString()); + if (q!=null&&q.Count()>0) { - var type = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(t); - if (type != null) - { - detectionName += type.DetectionTypeCode + ","; - } + PipeAreaValue = q.First().Text; + } } - if (detectionName != string.Empty) - { - return detectionName.Substring(0, detectionName.Length - 1); - } + else { return ""; } + return PipeAreaValue; } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs index 20fc2da7..0a835b60 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs @@ -230,6 +230,15 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.Grid Grid1; + /// + /// txt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label txt; + /// /// ToolbarSeparator1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx index 45c53283..e7acb6de 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx @@ -5,6 +5,11 @@ 查询焊口 + diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx index bebe23b3..dd2200be 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx @@ -112,8 +112,20 @@ - - + + + + + + + + + + + <%-- + --%> diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs index 1857a85d..32fed94f 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs @@ -281,23 +281,23 @@ namespace FineUIPro.Web.common.ProjectSet if (Model_JointNOCompleteColor != null) { - if (!string.IsNullOrEmpty(this.txtJointNOCompleteColor.Text.Trim())) + if (!string.IsNullOrEmpty(this.drpJointNOCompleteColor.SelectedValue.Trim())) { - Model_JointNOCompleteColor.SetValue = this.txtJointNOCompleteColor.Text.Trim(); + Model_JointNOCompleteColor.SetValue = this.drpJointNOCompleteColor.SelectedValue.Trim(); BLL.Project_SysSetService.UpdateSet(Model_JointNOCompleteColor); } } else { - if (!string.IsNullOrEmpty(this.txtJointNOCompleteColor.Text.Trim())) + if (!string.IsNullOrEmpty(this.drpJointNOCompleteColor.SelectedValue.Trim())) { Model.Project_Sys_Set newModel = new Model.Project_Sys_Set() { SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)), ProjectId = this.CurrUser.LoginProjectId, SetName = "焊口未完成", - SetValue = this.txtJointNOCompleteColor.Text.Trim(), + SetValue = this.drpJointNOCompleteColor.SelectedValue.Trim(), }; BLL.Project_SysSetService.AddSet(newModel); @@ -307,23 +307,23 @@ namespace FineUIPro.Web.common.ProjectSet if (Model_JointCompleteColor != null) { - if (!string.IsNullOrEmpty(this.txtJointCompleteColor.Text.Trim())) + if (!string.IsNullOrEmpty(this.drpJointCompleteColor.SelectedValue.Trim())) { - Model_JointCompleteColor.SetValue = this.txtJointCompleteColor.Text.Trim(); + Model_JointCompleteColor.SetValue = this.drpJointCompleteColor.SelectedValue.Trim(); BLL.Project_SysSetService.UpdateSet(Model_JointCompleteColor); } } else { - if (!string.IsNullOrEmpty(this.txtJointCompleteColor.Text.Trim())) + if (!string.IsNullOrEmpty(this.drpJointCompleteColor.SelectedValue.Trim())) { Model.Project_Sys_Set newModel = new Model.Project_Sys_Set() { SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)), ProjectId = this.CurrUser.LoginProjectId, SetName = "焊口已完成", - SetValue = this.txtJointCompleteColor.Text.Trim(), + SetValue = this.drpJointCompleteColor.SelectedValue.Trim(), }; BLL.Project_SysSetService.AddSet(newModel); @@ -566,12 +566,12 @@ namespace FineUIPro.Web.common.ProjectSet Model.Project_Sys_Set Model_JointNOCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口未完成", this.CurrUser.LoginProjectId); if (Model_JointNOCompleteColor != null) { - this.txtJointNOCompleteColor.Text = Model_JointNOCompleteColor.SetValue; + this.drpJointNOCompleteColor.SelectedValue = Model_JointNOCompleteColor.SetValue; } Model.Project_Sys_Set Model_JointCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口已完成", this.CurrUser.LoginProjectId); if (Model_JointCompleteColor != null) { - this.txtJointCompleteColor.Text = Model_JointCompleteColor.SetValue; + this.drpJointCompleteColor.SelectedValue = Model_JointCompleteColor.SetValue; } ///质量页面呈现 diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs index 3dc2b2ea..5d28efa1 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs @@ -258,22 +258,22 @@ namespace FineUIPro.Web.common.ProjectSet protected global::FineUIPro.NumberBox txtPipelineComplete; /// - /// txtJointNOCompleteColor 控件。 + /// drpJointNOCompleteColor 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtJointNOCompleteColor; + protected global::FineUIPro.DropDownList drpJointNOCompleteColor; /// - /// txtJointCompleteColor 控件。 + /// drpJointCompleteColor 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtJointCompleteColor; + protected global::FineUIPro.DropDownList drpJointCompleteColor; /// /// GroupPanel1 控件。 diff --git a/SGGL/Model/HJGL/3DParameter.cs b/SGGL/Model/HJGL/3DParameter.cs index 8542e302..5936f999 100644 --- a/SGGL/Model/HJGL/3DParameter.cs +++ b/SGGL/Model/HJGL/3DParameter.cs @@ -17,6 +17,26 @@ namespace Model /// public string ModelName { get; set; } /// + /// 管线号 + /// + public string Line_No { get; set; } + /// + /// 已完成管线 + /// + public string Completed_pipeline { get; set; } + /// + /// 未完成管线 + /// + public string Incomplete_pipeline { get; set; } + /// + /// 已完成焊口 + /// + public string Completed_weldedjunction { get; set; } + /// + /// 未完成焊口 + /// + public string Incomplete_weldjunction { get; set; } + /// /// 颜色模型 /// public ColorModel ColorModel { get; set; }