diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx
index cfc53ca..7345599 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx
@@ -74,16 +74,16 @@
-
listStr = new List();
listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs
index 2e465e8..07f1454 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs
@@ -2,8 +2,8 @@
// <自动生成>
// 此代码由工具生成。
//
-// 对此文件的更改可能会导致不正确的行为，并且如果
-// 重新生成代码，这些更改将会丢失。
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
//
//------------------------------------------------------------------------------
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx
index 124dc80..bb2f611 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx
@@ -89,7 +89,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -105,7 +105,7 @@
-
+
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx
index f09fd5c..e4dd755 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx
@@ -46,20 +46,20 @@
-
+
-
-
+
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx.designer.cs b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx.designer.cs
index e7b0729..517f777 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx.designer.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx.designer.cs
@@ -2,8 +2,8 @@
// <自动生成>
// 此代码由工具生成。
//
-// 对此文件的更改可能会导致不正确的行为，并且如果
-// 重新生成代码，这些更改将会丢失。
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
//
//------------------------------------------------------------------------------
@@ -130,13 +130,13 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
protected global::FineUIPro.DatePicker txtTestDate;
///
- /// txtSTE_Code 控件。
+ /// ddlSTE 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.TextBox txtSTE_Code;
+ protected global::FineUIPro.DropDownList ddlSTE;
///
/// drpEquipment 控件。
@@ -209,14 +209,5 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnDelete;
-
- ///
- /// ddlSTE 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList ddlSTE;
}
}
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx.cs
index 794be3e..9d01039 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx.cs
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
isNoSameMat = true;
}
- if (isoidLog != joint.ISO_ID) //新管线的记录
+ if (isoidLog != joint.ISO_ID) //新管线的记录
{
Model.HJGL_CH_HardTestReport oldHardTestReport = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportByID(hardTestReportId);
if (oldHardTestReport != null) //更新之前硬度检验报告的热处理状态和检验数量
@@ -172,7 +172,11 @@ namespace FineUIPro.Web.HJGL.HotHardManage
hardTestReport.HotHardCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId", "dbo.HJGL_CH_HardTestReport", "HotHardCode", joint.ProjectId, BLL.Base_ProjectService.GetProjectCode(joint.ProjectId) + "-" + iso.ISO_IsoNo + "-");
hardTestReport.ProjectId = joint.ProjectId;
hardTestReport.ISO_ID = iso.ISO_ID;
- hardTestReport.TestDate = DateTime.Now;
+ var date = (from x in Funs.DB.HJGL_CH_HotProessTrustItem
+ where x.JOT_ID == joint.JOT_ID
+ orderby x.TrustDate descending
+ select x.TrustDate).FirstOrDefault();
+ hardTestReport.TestDate = date;
hardTestReport.TrustUnitId = iso.BSU_ID;
hardTestReport.TestStandard = "GB/T17394.1-2014";
hardTestReport.STE_ID = iso.STE_ID;
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
index 5753b8b..d3b79c8 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
@@ -1371,6 +1371,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_NDTMethod = n;
t.Flag = flag;
t.CH_TrustType = "1";
+ t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustDate = DateTime.Now;
t.ProjectId = batch.ProjectId;
t.InstallationId = batch.InstallationId;
@@ -1493,6 +1494,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_TrustID = SQLHelper.GetNewID(typeof(Model.HJGL_CH_Trust));
t.CH_TrustCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetTrustCodeByProjectId", "dbo.HJGL_CH_Trust", "CH_TrustCode", batch.ProjectId, ndtInfo.NDT_Code + "-");
t.CH_NDTMethod = ndtItem.Value;
+ t.CH_TrustUnit = iso.BSU_ID;
t.Flag = flag;
t.CH_TrustType = "1";
t.CH_TrustDate = DateTime.Now;
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs
index 3a12a0e..4ad1d9e 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs
@@ -366,6 +366,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_TrustCode = trustCode;
t.CH_NDTMethod = NDT_ID;
t.CH_TrustType = "2";
+ t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustDate = DateTime.Now.Date;
t.ProjectId = batch.ProjectId;
t.InstallationId = batch.InstallationId;
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx
index 9894d48..f71d02a 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx
@@ -41,6 +41,9 @@
+
+
@@ -234,6 +237,14 @@
SortField="CheckAddress" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
+
+
+
+
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs
index 6f62c62..2df1aad 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs
@@ -42,6 +42,12 @@ namespace FineUIPro.Web.HJGL.WeldingReport
this.drpNdtType.DataBind();
Funs.FineUIPleaseSelect(this.drpNdtType);
+ this.drpUnit.DataTextField = "UnitName";
+ this.drpUnit.DataValueField = "UnitId";
+ this.drpUnit.DataSource = BLL.Base_UnitService.GetAllUnitList();
+ this.drpUnit.DataBind();
+ Funs.FineUIPleaseSelect(this.drpUnit);
+
this.txtEndDate.Text = DateTime.Now.ToShortDateString();
//BindGrid();
Funs.FineUIPleaseSelect(this.drpState);
@@ -171,6 +177,14 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
listStr.Add(new SqlParameter("@ndtType", null));
}
+ if (this.drpUnit.SelectedValue != BLL.Const._Null)
+ {
+ listStr.Add(new SqlParameter("@unitId", this.drpUnit.SelectedValue));
+ }
+ else
+ {
+ listStr.Add(new SqlParameter("@unitId", null));
+ }
if (!this.ckbFeedbackDate.Checked && !this.ckbTrustDate.Checked)
{
listStr.Add(new SqlParameter("@trustStartDate", null));
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs
index cd0869e..974e186 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs
@@ -102,6 +102,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
///
protected global::FineUIPro.DropDownList drpState;
+ ///
+ /// drpUnit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpUnit;
+
///
/// ckbTrustDate 控件。
///
diff --git a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs
index d62d73e..52cf2e8 100644
--- a/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs
@@ -19,7 +19,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{
if (!IsPostBack)
{
- ListItem[] list = new ListItem[42];
+ ListItem[] list = new ListItem[44];
list[0] = new ListItem("施工号", "1");
list[1] = new ListItem("试压包编号", "2");
list[2] = new ListItem("管线号", "3");
@@ -62,7 +62,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
list[39] = new ListItem("硬度反馈时间", "40");
list[40] = new ListItem("硬度不合格", "41");
list[41] = new ListItem("检测地点", "42");
-
+ list[42] = new ListItem("委托单位", "43");
+ list[43] = new ListItem("反馈人", "44");
this.cblColumn.DataSource = list;
this.cblColumn.DataBind();
diff --git a/HJGL_ZH/FineUIPro.Web/Web.config b/HJGL_ZH/FineUIPro.Web/Web.config
index 04fa778..b03f975 100644
--- a/HJGL_ZH/FineUIPro.Web/Web.config
+++ b/HJGL_ZH/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
-
+
diff --git a/HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs b/HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs
index 9ff4386..cdae9dd 100644
--- a/HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs
+++ b/HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs
@@ -464,6 +464,7 @@ namespace FineUIPro.Web
t.CH_NDTMethod = n;
t.Flag = flag;
t.CH_TrustType = "1";
+ t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustDate = DateTime.Now;
t.ProjectId = batch.ProjectId;
t.InstallationId = batch.InstallationId;
@@ -565,6 +566,7 @@ namespace FineUIPro.Web
t.CH_TrustCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetTrustCodeByProjectId", "dbo.HJGL_CH_Trust", "CH_TrustCode", batch.ProjectId, ndtInfo.NDT_Code + "-");
t.CH_NDTMethod = n;
t.Flag = flag;
+ t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustType = "1";
t.CH_TrustDate = DateTime.Now;
t.ProjectId = batch.ProjectId;
diff --git a/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx b/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx
index c24e792..3def922 100644
--- a/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx
+++ b/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx
@@ -21,9 +21,12 @@
-
-
+
+
+
+
diff --git a/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.cs b/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.cs
index 48c5bb5..eebc07a 100644
--- a/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.cs
@@ -30,6 +30,10 @@ namespace FineUIPro.Web.common
{
project = project.Where(e => e.ProjectCode.Contains(txtProjectCode.Text.Trim())).ToList();
}
+ if (!string.IsNullOrEmpty(txtProjectName.Text))
+ {
+ project = project.Where(e => e.ProjectName.Contains(txtProjectName.Text.Trim())).ToList();
+ }
GridProject.RecordCount = project.Count;
var table = GetPagedDataTable(GridProject, project);
this.GridProject.DataSource = table;
diff --git a/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs b/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs
index b59a724..2963476 100644
--- a/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs
+++ b/HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs
@@ -84,6 +84,15 @@ namespace FineUIPro.Web.common {
///
protected global::FineUIPro.TextBox txtProjectCode;
+ ///
+ /// txtProjectName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtProjectName;
+
///
/// btnSelect 控件。
///
diff --git a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx
index 41b4ab2..073a271 100644
--- a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx
+++ b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx
@@ -32,11 +32,12 @@
+ >
+ >
+
diff --git a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
index 07b4f2d..33ff180 100644
--- a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
@@ -165,6 +165,11 @@ namespace FineUIPro.Web.common.ProjectSet
this.BindGrid();
}
+ protected void btnSearch_Click(object sender, EventArgs e)
+ {
+ this.BindGrid();
+ }
+
//#region TreeView点击事件
/////
///// TreeView点击事件
diff --git a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs
index 6b668c7..21b4edd 100644
--- a/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs
+++ b/HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs
@@ -2,8 +2,8 @@
// <自动生成>
// 此代码由工具生成。
//
-// 对此文件的更改可能会导致不正确的行为，并且如果
-// 重新生成代码，这些更改将会丢失。
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
//
//------------------------------------------------------------------------------
@@ -93,6 +93,15 @@ namespace FineUIPro.Web.common.ProjectSet {
///
protected global::FineUIPro.ToolbarFill ToolbarFill1;
+ ///
+ /// btnSearch 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSearch;
+
///
/// btnEdit 控件。
///
diff --git a/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx b/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx
index 9941607..c41aa79 100644
--- a/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx
+++ b/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx
@@ -27,7 +27,10 @@
-
+
+
diff --git a/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.cs b/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.cs
index fbc6cb6..51370a6 100644
--- a/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.cs
+++ b/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.cs
@@ -160,6 +160,10 @@ namespace FineUIPro.Web.common
{
project = project.Where(e => e.ProjectCode.Contains(txtProjectCode.Text.Trim())).ToList();
}
+ if (!string.IsNullOrEmpty(txtProjectName.Text))
+ {
+ project = project.Where(e => e.ProjectName.Contains(txtProjectName.Text.Trim())).ToList();
+ }
GridProject.RecordCount = project.Count;
var table = GetPagedDataTable(GridProject, project);
this.GridProject.DataSource = table;
diff --git a/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.designer.cs b/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.designer.cs
index 01d3bbb..9e3be9e 100644
--- a/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.designer.cs
+++ b/HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.designer.cs
@@ -84,6 +84,15 @@ namespace FineUIPro.Web.common {
///
protected global::FineUIPro.TextBox txtProjectCode;
+ ///
+ /// txtProjectName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtProjectName;
+
///
/// btnSelect 控件。
///