lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2022-10-25 焊接修改

This commit is contained in:
李鹏飞 2022-10-25 22:30:17 +08:00
parent 75fb02a45c
commit 5fc76eec1a
15 changed files with 632 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
SGGL/BLL/HJGL/WeldingManage/PipelineService.cs
View File

@ -1,4 +1,5 @@
using MiniExcelLibs; using MiniExcelLibs;
using Model;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
@ -40,6 +41,33 @@ namespace BLL
{ {
return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineCode == pipelineCode); return Funs.DB.HJGL_Pipeline.FirstOrDefault(e => e.PipelineCode == pipelineCode);
} }
public static List<View_HJGL_Pipeline> 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;
}
/// <summary> /// <summary>
/// 根据unitworkId获取所有管线 /// 根据unitworkId获取所有管线
/// </summary> /// </summary>

13
SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs
View File

@ -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(); var q = (from x in Funs.DB.View_HJGL_WeldJoint where x.PipelineId == pipelineId orderby x.WeldJointCode select x).ToList();
return q; return q;
} }
public static List<Model.View_HJGL_WeldJoint> 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;
}
/// <summary> /// <summary>
/// 根据壁厚计算焊口达因 /// 根据壁厚计算焊口达因
/// </summary> /// </summary>

254
SGGL/FineUIPro.Web/ErrLog.txt
View File

@ -58,3 +58,257 @@ IP地址:::1
出错时间:10/18/2022 15:41:53 出错时间: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

118
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
View File

@ -56,6 +56,28 @@ namespace FineUIPro.Web.HJGL.InfoQuery
ViewState["JointNoPre"] = value; 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) protected void Page_Load(object sender, EventArgs e)
{ {
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
@ -221,6 +243,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.TagNum = ""; parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2"; parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction = Incomplete_weldjunction;
if (this.tvControlItem.SelectedNode.CommandName == "单位工程") if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{ {
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
@ -278,43 +303,90 @@ namespace FineUIPro.Web.HJGL.InfoQuery
private void BindGrid() private void BindGrid()
{ {
string strSql = @"SELECT * FROM dbo.View_HJGL_JointInfoQuery //string strSql = @"SELECT * FROM dbo.View_HJGL_JointInfoQuery
WHERE ProjectId= @ProjectId"; // WHERE ProjectId= @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>(); //List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); //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 == "单位工程") if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{ {
strSql += " AND UnitWorkId =@UnitWorkId"; model.UnitWorkId = this.tvControlItem.SelectedNodeID;
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
} }
else if (this.tvControlItem.SelectedNode.CommandName == "管线") else if (this.tvControlItem.SelectedNode.CommandName == "管线")
{ {
strSql += " AND PipelineId = @PipelineId"; model.PipelineId= this.tvControlItem.SelectedNodeID;
listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID));
} }
if (!string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim())) model.WeldJointCode = this.txtWeldJointCode.Text;
{ var list= BLL.WeldJointService.GetViewWeldJointsBymodel(model);
strSql += " AND WeldJointCode LIKE @WeldJointCode"; get3DParmeter_weldjoint(list);//获取三维所需焊口参数
listStr.Add(new SqlParameter("@WeldJointCode", this.txtWeldJointCode.Text.Trim())); var q = list.Where(x => !string.IsNullOrEmpty(x.WeldingDate));
} var q2 = list.Where(x =>x.JointAttribute == "预制口");
var sumcount= list.Count;
SqlParameter[] parameter = listStr.ToArray(); this.Grid1.RecordCount = list.Count;
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;
this.JointComplete = q.Count(); this.JointComplete = q.Count();
this.JointNoComplete = sumcount - JointComplete; this.JointNoComplete = sumcount - JointComplete;
this.JointPre = q2.Count(); this.JointPre = q2.Count();
this.JointNoPre = sumcount - JointPre; this.JointNoPre = sumcount - JointPre;
var table = this.GetPagedDataTable(Grid1, tb); //var table = this.GetPagedDataTable(Grid1, list);
Grid1.DataSource = table; Grid1.DataSource = list;
Grid1.DataBind(); Grid1.DataBind();
} }
private void get3DParmeter_weldjoint(List<View_HJGL_WeldJoint> model)
{
if (model.Any())
{
var q = model.Where(x => !string.IsNullOrEmpty(x.WeldingDate));//获取已完成焊口
if (q.Any())
{
List<string> Completed_weldedjunctionList = new List<string>();
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<string> Incomplete_weldjunctionList = new List<string>();
foreach (var item in q1)
{
Incomplete_weldjunctionList.Add("/" + item.PipelineCode);
}
Incomplete_weldjunction = string.Join(",", Incomplete_weldjunctionList);
}
}
}
#region #region
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
@ -449,6 +521,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.ColorModel = colorModel; parameter3D.ColorModel = colorModel;
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,2"; parameter3D.ButtonType = "0,2";
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
parameter3D.Incomplete_weldjunction=Incomplete_weldjunction;
if (this.tvControlItem.SelectedNode.CommandName == "单位工程") if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
{ {
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);

10
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
View File

@ -95,10 +95,16 @@
DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center" DataField="PipelineCode" SortField="PipelineCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="220px" Locked="true"> TextAlign="Left" Width="220px" Locked="true">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="是否完成" ColumnID="IsFinished" <%--<f:RenderField HeaderText="是否完成" ColumnID="IsFinished"
DataField="IsFinished" SortField="IsFinished" FieldType="String" HeaderTextAlign="Center" DataField="IsFinished" SortField="IsFinished" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px" Locked="true"> TextAlign="Left" Width="90px" Locked="true">
</f:RenderField> </f:RenderField>--%>
<f:TemplateField Width="90px" HeaderText="是否完成" HeaderTextAlign="Center"
TextAlign="Center" SortField="IsFinished">
<ItemTemplate>
<asp:Label ID="txtIsFinished" runat="server" Text='<%# ConvertIsFinished(Eval("IsFinished")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="完成日期" ColumnID="FinishedDate" <f:RenderField HeaderText="完成日期" ColumnID="FinishedDate"
DataField="FinishedDate" SortField="FinishedDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center" DataField="FinishedDate" SortField="FinishedDate" FieldType="Date" Renderer="Date" HeaderTextAlign="Center"
TextAlign="Left" Width="100px" Locked="true"> TextAlign="Left" Width="100px" Locked="true">

137
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL; using BLL;
using Model;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
@ -9,6 +10,28 @@ namespace FineUIPro.Web.HJGL.InfoQuery
{ {
public partial class PipelineQuery : PageBase 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) protected void Page_Load(object sender, EventArgs e)
{ {
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
@ -118,6 +141,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.TagNum = ""; parameter3D.TagNum = "";
parameter3D.ButtonType = "0,2"; parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); 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.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C"+ parameter3D.ModelName;
ctlAuditFlow.data = parameter3D; ctlAuditFlow.data = parameter3D;
@ -132,46 +157,89 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// </summary> /// </summary>
private void BindGrid() private void BindGrid()
{ {
string strSql = @"SELECT ProjectId,UnitWorkId,PipelineId,PipelineCode,UnitName,MediumCode,MediumName,PipingClassCode,UnitWorkCode,SingleName, // string strSql = @"SELECT ProjectId,UnitWorkId,PipelineId,PipelineCode,UnitName,MediumCode,MediumName,PipingClassCode,UnitWorkCode,SingleName,
TestPressure,SingleNumber,DetectionRateCode,DetectionType,Remark,TestMediumCode,TotalDin,FinishSize, // TestPressure,SingleNumber,DetectionRateCode,DetectionType,Remark,TestMediumCode,TotalDin,FinishSize,
JointCount,PressurePipingClassCode,PipeLenth,DesignPress,DesignTemperature,LeakPressure,VacuumPressure, // JointCount,PressurePipingClassCode,PipeLenth,DesignPress,DesignTemperature,LeakPressure,VacuumPressure,
LeakMediumName,PCMediumName,MaterialCode,FinishedDate, // LeakMediumName,PCMediumName,MaterialCode,FinishedDate,
(CASE WHEN IsFinished=1 THEN '已完成' ELSE '未完成' END) AS IsFinished //(CASE WHEN IsFinished=1 THEN '已完成' ELSE '未完成' END) AS IsFinished
FROM dbo.View_HJGL_Pipeline // FROM dbo.View_HJGL_Pipeline
WHERE ProjectId= @ProjectId"; // WHERE ProjectId= @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>(); // List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); // listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql += " AND UnitWorkId =@UnitWorkId"; // strSql += " AND UnitWorkId =@UnitWorkId";
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); // listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim())) // if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim()))
{ // {
strSql += " AND PipelineCode LIKE @PipelineCode"; // strSql += " AND PipelineCode LIKE @PipelineCode";
listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipelineCode.Text.Trim() + "%")); // 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") if (drpIsFinish.SelectedValue == "1")
{ {
strSql += " AND pipe.IsFinished = 1"; view_HJGL_Pipeline.IsFinished = true;
} }
if (drpIsFinish.SelectedValue == "0") if (drpIsFinish.SelectedValue == "0")
{ {
strSql += " AND (pipe.IsFinished IS NULL OR pipe.IsFinished = 0)"; view_HJGL_Pipeline.IsFinished = false;
} }
var list = BLL.PipelineService.GetView_HJGL_Pipelines(view_HJGL_Pipeline);
SqlParameter[] parameter = listStr.ToArray(); get3DParmeter_pipeline(list);
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
// 2.获取当前分页数据 // 2.获取当前分页数据
//var table = this.GetPagedDataTable(Grid1, tb1); //var table = this.GetPagedDataTable(Grid1, tb1);
Grid1.RecordCount = tb.Rows.Count; Grid1.RecordCount = list.Count;
tb = GetFilteredTable(Grid1.FilteredData, tb); //tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb); var table = this.GetPagedDataTable(Grid1, list);
Grid1.DataSource = table; Grid1.DataSource = table;
Grid1.DataBind(); Grid1.DataBind();
} }
#endregion #endregion
private void get3DParmeter_pipeline(List<View_HJGL_Pipeline> view_HJGL_Pipelines )
{
if (view_HJGL_Pipelines.Any())
{
var q = view_HJGL_Pipelines.Where(x => x.IsFinished == true);//获取已完成管线
if (q.Any())
{
List<string> Completed_pipelineList = new List<string>();
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<string> Incomplete_pipelineList = new List<string>();
foreach (var item in q1)
{
Incomplete_pipelineList.Add("/" + item.PipelineCode);
}
Incomplete_pipeline = string.Join(",", Incomplete_pipelineList);
}
}
}
#region 分页排序 #region 分页排序
#region 页索引改变事件 #region 页索引改变事件
/// <summary> /// <summary>
@ -325,7 +393,19 @@ namespace FineUIPro.Web.HJGL.InfoQuery
return ""; 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) protected void btnGetChart_Click(object sender, EventArgs e)
{ {
decimal PipelineComplete = 0; decimal PipelineComplete = 0;
@ -372,6 +452,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,2"; parameter3D.ButtonType = "0,2";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); 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.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D; ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData(); ctlAuditFlow.BindData();

9
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs generated
View File

@ -203,6 +203,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery
/// </remarks> /// </remarks>
protected global::FineUIPro.Grid Grid1; protected global::FineUIPro.Grid Grid1;
/// <summary>
/// txtIsFinished 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label txtIsFinished;
/// <summary> /// <summary>
/// Label1 控件。 /// Label1 控件。
/// </summary> /// </summary>

10
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx
View File

@ -109,10 +109,16 @@
Title="管线号" DataToolTipField="PipelineCode" SortField="PipelineCode" Title="管线号" DataToolTipField="PipelineCode" SortField="PipelineCode"
Locked="true"> Locked="true">
</f:WindowField> </f:WindowField>
<f:RenderField HeaderText="管线划分" ColumnID="PipeArea" <%-- <f:RenderField HeaderText="管线划分" ColumnID="PipeArea"
DataField="PipeArea" SortField="PipeArea" FieldType="String" HeaderTextAlign="Center" DataField="PipeArea" SortField="PipeArea" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="300px"> TextAlign="Center" Width="300px">
</f:RenderField> </f:RenderField>--%>
<f:TemplateField Width="300px" HeaderText="管线划分" HeaderTextAlign="Center"
TextAlign="Center" SortField="PipeArea">
<ItemTemplate>
<asp:Label ID="txt" runat="server" Text='<%# ConvertPipeArea(Eval("PipeArea")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
</Columns> </Columns>
<PageItems> <PageItems>

96
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
View File

@ -33,6 +33,17 @@ namespace FineUIPro.Web.HJGL.PreDesign
ViewState["PipelineNOComplete"] = value; 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) protected void Page_Load(object sender, EventArgs e)
{ {
ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId);
@ -148,7 +159,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
parameter3D.TagNum = ""; parameter3D.TagNum = "";
parameter3D.ButtonType = "0,1"; parameter3D.ButtonType = "0,1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); 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.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D; ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData(); ctlAuditFlow.BindData();
@ -162,47 +173,33 @@ namespace FineUIPro.Web.HJGL.PreDesign
/// </summary> /// </summary>
private void BindGrid() private void BindGrid()
{ {
string strSql = @"SELECT ProjectId,UnitWorkId,PipelineId,PipelineCode,
(CASE WHEN PipeArea='1' THEN '工厂预制' WHEN PipeArea='2' THEN '现场施工' Model.View_HJGL_Pipeline view_HJGL_Pipeline = new Model.View_HJGL_Pipeline();
ELSE '' END) AS PipeArea view_HJGL_Pipeline.ProjectId = this.CurrUser.LoginProjectId;
FROM dbo.View_HJGL_Pipeline view_HJGL_Pipeline.UnitWorkId = this.tvControlItem.SelectedNodeID;
WHERE ProjectId= @ProjectId"; view_HJGL_Pipeline.PipelineCode = this.txtPipelineCode.Text.Trim();
List<SqlParameter> listStr = new List<SqlParameter>(); view_HJGL_Pipeline.SingleName = this.txtSingleName.Text.Trim();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); view_HJGL_Pipeline.DesignPress=this.txtDesignPress.Text.Trim();
view_HJGL_Pipeline.MaterialCode=this.txtMaterialCode.Text.Trim();
strSql += " AND UnitWorkId =@UnitWorkId"; var list = BLL.PipelineService.GetView_HJGL_Pipelines(view_HJGL_Pipeline);
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID)); var q = list.Where(x => x.PipeArea == PipelineService.PipeArea_SHOP );
if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim())) var q2 = list.Where(x => x.PipeArea == PipelineService.PipeArea_FIELD );
if (q.Any())
{ {
strSql += " AND PipelineCode LIKE @PipelineCode"; List<string> listpipecode = new List<string>();
listStr.Add(new SqlParameter("@PipelineCode", "%" + this.txtPipelineCode.Text.Trim() + "%")); 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(); PipelineComplete = q.Count();
PipelineNOComplete = q2.Count(); PipelineNOComplete = q2.Count();
// 2.获取当前分页数据 // 2.获取当前分页数据
//var table = this.GetPagedDataTable(Grid1, tb1); Grid1.RecordCount = list.Count();
Grid1.RecordCount = tb.Rows.Count; //list = GetFilteredTable(Grid1.FilteredData, list);
tb = GetFilteredTable(Grid1.FilteredData, tb); var table = this.GetPagedDataTable(Grid1, list);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table; Grid1.DataSource = table;
Grid1.DataBind(); Grid1.DataBind();
} }
@ -284,6 +281,8 @@ namespace FineUIPro.Web.HJGL.PreDesign
parameter3D.TagNum = pipecode; parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,1"; parameter3D.ButtonType = "0,1";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); 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.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D; ctlAuditFlow.data = parameter3D;
ctlAuditFlow.BindData(); ctlAuditFlow.BindData();
@ -363,29 +362,24 @@ namespace FineUIPro.Web.HJGL.PreDesign
} }
#endregion #endregion
protected string ConvertDetectionType(object detectionType) protected string ConvertPipeArea(object PipeArea)
{ {
string detectionName = string.Empty; string PipeAreaValue = string.Empty;
if (detectionType != null) if (PipeArea != null)
{ {
string[] types = detectionType.ToString().Split('|'); var q = PipelineService.GetPipeArea().Where(x => x.Value == PipeArea.ToString());
foreach (string t in types) if (q!=null&&q.Count()>0)
{ {
var type = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(t); PipeAreaValue = q.First().Text;
if (type != null)
{
detectionName += type.DetectionTypeCode + ",";
}
} }
} }
if (detectionName != string.Empty)
{
return detectionName.Substring(0, detectionName.Length - 1);
}
else else
{ {
return ""; return "";
} }
return PipeAreaValue;
} }

9
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.designer.cs generated
View File

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

5
SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx
View File

@ -5,6 +5,11 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server"> <head runat="server">
<title>查询焊口</title> <title>查询焊口</title>
<style type="text/css">
.tn-color-green .f-tree-folder {
color: green;
}
</style>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" /> <link href="../res/css/common.css" rel="stylesheet" type="text/css" />
</head> </head>
<body> <body>

16
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
View File

@ -112,8 +112,20 @@
</f:FormRow> </f:FormRow>
<f:FormRow runat="server"> <f:FormRow runat="server">
<Items> <Items>
<f:TextBox ID="txtJointNOCompleteColor" runat="server" Label="焊口未完成" LabelWidth="180px"></f:TextBox> <f:DropDownList ID="drpJointNOCompleteColor" Label="焊口未完成" runat="server"
<f:TextBox ID="txtJointCompleteColor" runat="server" Label="焊口已完成" LabelWidth="180px"></f:TextBox> ShowRedStar="true" Required="true" LabelWidth="180px">
<f:ListItem Value="#FF0000" Text="红" />
<f:ListItem Value="#FFFF00" Text="黄" />
<f:ListItem Value="#00FF00" Text="绿" />
</f:DropDownList>
<f:DropDownList ID="drpJointCompleteColor" Label="焊口已完成" runat="server"
ShowRedStar="true" Required="true" LabelWidth="180px">
<f:ListItem Value="#FF0000" Text="红" />
<f:ListItem Value="#FFFF00" Text="黄" />
<f:ListItem Value="#00FF00" Text="绿" />
</f:DropDownList>
<%--<f:TextBox ID="txtJointNOCompleteColor" runat="server" Label="焊口未完成" LabelWidth="180px"></f:TextBox>
<f:TextBox ID="txtJointCompleteColor" runat="server" Label="焊口已完成" LabelWidth="180px"></f:TextBox>--%>
</Items> </Items>
</f:FormRow> </f:FormRow>

20
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs
View File

@ -281,23 +281,23 @@ namespace FineUIPro.Web.common.ProjectSet
if (Model_JointNOCompleteColor != null) 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); BLL.Project_SysSetService.UpdateSet(Model_JointNOCompleteColor);
} }
} }
else 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() Model.Project_Sys_Set newModel = new Model.Project_Sys_Set()
{ {
SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)), SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)),
ProjectId = this.CurrUser.LoginProjectId, ProjectId = this.CurrUser.LoginProjectId,
SetName = "焊口未完成", SetName = "焊口未完成",
SetValue = this.txtJointNOCompleteColor.Text.Trim(), SetValue = this.drpJointNOCompleteColor.SelectedValue.Trim(),
}; };
BLL.Project_SysSetService.AddSet(newModel); BLL.Project_SysSetService.AddSet(newModel);
@ -307,23 +307,23 @@ namespace FineUIPro.Web.common.ProjectSet
if (Model_JointCompleteColor != null) 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); BLL.Project_SysSetService.UpdateSet(Model_JointCompleteColor);
} }
} }
else 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() Model.Project_Sys_Set newModel = new Model.Project_Sys_Set()
{ {
SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)), SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)),
ProjectId = this.CurrUser.LoginProjectId, ProjectId = this.CurrUser.LoginProjectId,
SetName = "焊口已完成", SetName = "焊口已完成",
SetValue = this.txtJointCompleteColor.Text.Trim(), SetValue = this.drpJointCompleteColor.SelectedValue.Trim(),
}; };
BLL.Project_SysSetService.AddSet(newModel); 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); Model.Project_Sys_Set Model_JointNOCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口未完成", this.CurrUser.LoginProjectId);
if (Model_JointNOCompleteColor != null) 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); Model.Project_Sys_Set Model_JointCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口已完成", this.CurrUser.LoginProjectId);
if (Model_JointCompleteColor != null) if (Model_JointCompleteColor != null)
{ {
this.txtJointCompleteColor.Text = Model_JointCompleteColor.SetValue; this.drpJointCompleteColor.SelectedValue = Model_JointCompleteColor.SetValue;
} }
///质量页面呈现 ///质量页面呈现

8
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs generated
View File

@ -258,22 +258,22 @@ namespace FineUIPro.Web.common.ProjectSet
protected global::FineUIPro.NumberBox txtPipelineComplete; protected global::FineUIPro.NumberBox txtPipelineComplete;
/// <summary> /// <summary>
/// txtJointNOCompleteColor 控件。 /// drpJointNOCompleteColor 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtJointNOCompleteColor; protected global::FineUIPro.DropDownList drpJointNOCompleteColor;
/// <summary> /// <summary>
/// txtJointCompleteColor 控件。 /// drpJointCompleteColor 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtJointCompleteColor; protected global::FineUIPro.DropDownList drpJointCompleteColor;
/// <summary> /// <summary>
/// GroupPanel1 控件。 /// GroupPanel1 控件。

20
SGGL/Model/HJGL/3DParameter.cs
View File

@ -17,6 +17,26 @@ namespace Model
/// </summary> /// </summary>
public string ModelName { get; set; } public string ModelName { get; set; }
/// <summary> /// <summary>
/// 管线号
/// </summary>
public string Line_No { get; set; }
/// <summary>
/// 已完成管线
/// </summary>
public string Completed_pipeline { get; set; }
/// <summary>
/// 未完成管线
/// </summary>
public string Incomplete_pipeline { get; set; }
/// <summary>
/// 已完成焊口
/// </summary>
public string Completed_weldedjunction { get; set; }
/// <summary>
/// 未完成焊口
/// </summary>
public string Incomplete_weldjunction { get; set; }
/// <summary>
/// 颜色模型 /// 颜色模型
/// </summary> /// </summary>
public ColorModel ColorModel { get; set; } public ColorModel ColorModel { get; set; }