diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 1963de0..e47cfd0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 608c5b5..ab799f4 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 0a1b425..6ce8a24 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1239,6 +1239,7 @@ + @@ -5448,6 +5449,13 @@ BItemEndCheck.aspx + + selectJointCode.aspx + ASPXCodeBehind + + + selectJointCode.aspx + TestPackageManageAudit.aspx ASPXCodeBehind diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx index 1e8a4fb..7c7e8a3 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx @@ -146,8 +146,8 @@ runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId" AllowSorting="true" SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" - AllowPaging="true" IsDatabasePaging="true" PageSize="100" OnRowDataBound="Grid1_RowDataBound" - OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"> + AllowPaging="true" IsDatabasePaging="true" PageSize="100" + OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" > @@ -159,20 +159,13 @@ - + - - - - - + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs new file mode 100644 index 0000000..df89af8 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs @@ -0,0 +1,77 @@ +using BLL; +using Model; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.WeldingProcess.TestPackageManage +{ + public partial class selectJointCode : PageBase + { + private string rowId=string.Empty; + private string jointcode=string.Empty; + protected void Page_Load(object sender, EventArgs e) + { + + this.rowId = Request.Params["rowId"]; + this.jointcode = Request.Params["jointcode"]; + if (string.IsNullOrEmpty(this.rowId)) + { + ShowNotify("请先选择某条管线信息!", MessageBoxIcon.Warning); + return; + } + if (!IsPostBack) + { + btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.BindGridDataSource(); + this.InitGridDataChecked(); + } + } + void InitGridDataChecked() + { + List list = new List(); + if (!string.IsNullOrEmpty(this.jointcode)) + { + string[] arr=this.jointcode.Split(','); + for (int i = 0;i GetDataJointGrid2(string PipelineID) + { + string[] arr = null; + var tempData = Funs.DB.PTP_PipelineList.Where(t => t.PipelineId == PipelineID && t.IsAll == false) + .Select(t => t.WeldJonintCode).FirstOrDefault(); + + if (tempData != null) + { + arr = tempData.Split(','); + } + var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID) + .OrderBy(t => t.WeldJointCode).AsQueryable(); + if (arr != null) + { + query = query.Where(t => !arr.Contains(t.WeldJointCode)); + } + return query.ToList(); + + } + + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.designer.cs new file mode 100644 index 0000000..518e49f --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.designer.cs @@ -0,0 +1,62 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为,如果 +// 重新生成代码,则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WeldingProcess.TestPackageManage +{ + + + public partial class selectJointCode + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// btnSaveClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSaveClose; + } +}