diff --git a/HJGLPackFile.zip b/HJGLPackFile.zip
new file mode 100644
index 0000000..469679e
Binary files /dev/null and b/HJGLPackFile.zip differ
diff --git a/HJGLPackFile/PackFile/JGZL/TeamWeldingInspection.aspx b/HJGLPackFile/PackFile/JGZL/TeamWeldingInspection.aspx
new file mode 100644
index 0000000..dcdbd56
--- /dev/null
+++ b/HJGLPackFile/PackFile/JGZL/TeamWeldingInspection.aspx
@@ -0,0 +1,233 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="TeamWeldingInspection.aspx.cs" Inherits="FineUIPro.Web.JGZL.TeamWeldingInspection" %>
+
+
+
+
+
+
+ 支管连接焊接接头、角焊接头组对焊接检查记录
+
+
+
+ <%----%>
+
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx
index 251c29d..15e6993 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx
@@ -1,5 +1,5 @@
-
+
using System;
using System.Collections;
using System.Collections.Generic;
@@ -42,7 +42,7 @@ namespace FastReport
}
-
+
diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx
index b62b730..5800084 100644
--- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx
+++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道系统压力试验条件确认记录.frx
@@ -1,5 +1,5 @@
-
+
@@ -18,20 +18,20 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -55,77 +55,93 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx
index bec998a..dcdbd56 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx
+++ b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx
@@ -37,7 +37,7 @@
-
+
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs
index ab74934..23a17ce 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs
@@ -105,8 +105,19 @@ namespace FineUIPro.Web.JGZL
txtUsingUnitTeam.Text = teamWeldingInspection.UsingUnitTeam;
txtInstallationArea.Text = teamWeldingInspection.InstallationArea;
}
+ //管线下拉选择
+ var isoLists = (from x in Funs.DB.JGZL_TeamWeldingInspectionItem
+ where x.TeamWeldingInspectionId == this.TeamWeldingInspectionId
+ select x.PipelineNo).Distinct().ToList();
+ this.drpIsoNoS.Items.Clear();
+ this.drpIsoNoS.DataTextField = "PipelineNo";
+ this.drpIsoNoS.DataValueField = "PipelineNo";
+ this.drpIsoNoS.DataSource = isoLists;
+ this.drpIsoNoS.DataBind();
+ Funs.FineUIPleaseSelect(this.drpIsoNoS);
+ this.drpIsoNoS.SelectedIndex = 0;
+
DataInfo();
- //this.BindGrid();
}
}
@@ -210,9 +221,9 @@ namespace FineUIPro.Web.JGZL
itemLists.Add(newItem);
}
}
- if (!string.IsNullOrEmpty(this.txtIsoNoS.Text))
+ if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue) && this.drpIsoNoS.SelectedValue != BLL.Const._Null)
{
- itemLists = itemLists.Where(e => e.PipelineNo.Contains(this.txtIsoNoS.Text)).ToList(); ;
+ itemLists = itemLists.Where(e => e.PipelineNo.Contains(this.drpIsoNoS.SelectedValue)).ToList(); ;
}
}
this.Grid1.DataSource = itemLists;
@@ -403,11 +414,11 @@ namespace FineUIPro.Web.JGZL
List listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", projectId));
- //if (!string.IsNullOrEmpty(this.txtCheckDate.Text))
- //{
- // strSql += " and i.CheckDate=@checkDate";
- // listStr.Add(new SqlParameter("@checkDate", Funs.GetNewDateTime(this.txtCheckDate.Text.Trim())));
- //}
+ if (!string.IsNullOrEmpty(this.drpIsoNoS.SelectedValue) && this.drpIsoNoS.SelectedValue != BLL.Const._Null)
+ {
+ strSql += " and i.PipelineNo=@pipelineNo";
+ listStr.Add(new SqlParameter("@pipelineNo", this.drpIsoNoS.SelectedValue));
+ }
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
if (tb.Rows.Count == itemLists.Count)
@@ -768,6 +779,19 @@ namespace FineUIPro.Web.JGZL
BLL.TeamWeldingInspectionService.AddTeamWeldingInspection(newTeamWeldingInspection);
}
saveItem();
+
+ //管线下拉选择
+ var isoLists = (from x in Funs.DB.JGZL_TeamWeldingInspectionItem
+ where x.TeamWeldingInspectionId == this.TeamWeldingInspectionId
+ select x.PipelineNo).Distinct().ToList();
+ this.drpIsoNoS.Items.Clear();
+ this.drpIsoNoS.DataTextField = "PipelineNo";
+ this.drpIsoNoS.DataValueField = "PipelineNo";
+ this.drpIsoNoS.DataSource = isoLists;
+ this.drpIsoNoS.DataBind();
+ Funs.FineUIPleaseSelect(this.drpIsoNoS);
+ this.drpIsoNoS.SelectedIndex = 0;
+
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.designer.cs
index 33dc03b..358b684 100644
--- a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.designer.cs
+++ b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.designer.cs
@@ -96,13 +96,13 @@ namespace FineUIPro.Web.JGZL
protected global::FineUIPro.Toolbar Toolbar2;
///
- /// txtIsoNoS 控件。
+ /// drpIsoNoS 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.TextBox txtIsoNoS;
+ protected global::FineUIPro.DropDownList drpIsoNoS;
///
/// ToolbarFill1 控件。