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 @@
                                 <Items>
                                     <f:Label ID="txtHotHardCode" Label="试验编号" runat="server" LabelWidth="80px" LabelAlign="Right">
                                     </f:Label>
-                                    <f:Label ID="txtCH_TrustUnit" Label="委托单位" runat="server" LabelWidth="105px" LabelAlign="Right">
+                                    <f:Label ID="txtCH_TrustUnit" Label="委托单位" runat="server" LabelWidth="110px" LabelAlign="Right">
                                     </f:Label> 
                                 </Items>
                             </f:FormRow>
@@ -97,7 +97,7 @@
                                 <Items>
                                     <f:Label ID="txtSTE_Code" Label="材质" runat="server" LabelWidth="80px" LabelAlign="Right">
                                     </f:Label>
-                                    <f:Label ID="txtTestDate" Label="试验日期" runat="server" LabelWidth="105px" LabelAlign="Right">
+                                    <f:Label ID="txtTestDate" Label="热处理委托时间" runat="server" LabelWidth="110px" LabelAlign="Right">
                                     </f:Label>
                                 </Items>
                             </f:FormRow>
@@ -105,7 +105,7 @@
                                 <Items> 
                                      <f:Label ID="txtInstrumentType" Label="仪器型号" runat="server" LabelWidth="80px" LabelAlign="Right">
                                     </f:Label>  
-                                    <f:Label ID="txtEquipmentName" Label="设备/仪器编号" runat="server" LabelWidth="105px" LabelAlign="Right">
+                                    <f:Label ID="txtEquipmentName" Label="设备/仪器编号" runat="server" LabelWidth="110px" LabelAlign="Right">
                                     </f:Label>
                                 </Items>
                             </f:FormRow>    
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 @@
                                     <f:DropDownList ID="drpUnit" Label="委托单位" runat="server" ShowRedStar="true" Required="true"
                                         FocusOnPageLoad="true" EnableEdit="true" LabelWidth="105px" LabelAlign="Right">
                                     </f:DropDownList>
-                                    <f:DatePicker ID="txtTestDate" Label="试验日期" runat="server" ShowRedStar="true" Required="true"
-                                        LabelWidth="80px" DateFormatString="yyyy-MM-dd" LabelAlign="Right">
+                                    <f:DatePicker ID="txtTestDate" Label="热处理委托时间" runat="server" ShowRedStar="true" Required="true"
+                                        LabelWidth="115px" DateFormatString="yyyy-MM-dd" LabelAlign="Right">
                                     </f:DatePicker>
                                 </Items>
                             </f:FormRow>
                             <f:FormRow>
                                 <Items>
-                                    <f:DropDownList ID="ddlSTE" Label="材质" runat="server" ShowRedStar="true" Required="true"
+                                    <f:DropDownList ID="ddlSTE" Label="材质" runat="server" ShowRedStar="true" Required="true" LabelAlign="Right"
                                         EnableEdit="true" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlSTE_SelectedIndexChanged">
                                     </f:DropDownList>
                                     <f:DropDownList ID="drpEquipment" Label="设备/仪器编号" runat="server" EnableEdit="true"
                                         LabelWidth="105px" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpEquipment_SelectedIndexChanged">
                                     </f:DropDownList>
-                                    <f:TextBox ID="txtInstrumentType" Label="仪器型号" runat="server" LabelWidth="80px" LabelAlign="Right">
+                                    <f:TextBox ID="txtInstrumentType" Label="仪器型号" runat="server" LabelWidth="115px" LabelAlign="Right">
                                     </f:TextBox>
                                 </Items>
                             </f:FormRow>
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;
         
         /// <summary>
-        /// txtSTE_Code 控件。
+        /// ddlSTE 控件。
         /// </summary>
         /// <remarks>
         /// 自动生成的字段。
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
-        protected global::FineUIPro.TextBox txtSTE_Code;
+        protected global::FineUIPro.DropDownList ddlSTE;
         
         /// <summary>
         /// drpEquipment 控件。
@@ -209,14 +209,5 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnDelete;
-
-        /// <summary>
-        /// ddlSTE 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        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/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 @@
                          <Toolbars>
                              <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                                  <Items>
-                                     <f:TextBox ID="txtProjectCode" runat="server" Label="项目号" EmptyText="输入项目号查询" 
-                                         Width="250px" LabelWidth="70px">
-                                     </f:TextBox>
+                                     <f:TextBox ID="txtProjectCode" runat="server" Label="施工号" EmptyText="输入施工号查询"
+                                            Width="250px" LabelWidth="70px">
+                                        </f:TextBox>
+                                        <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" EmptyText="输入项目名称查询"
+                                            Width="250px" LabelWidth="70px">
+                                        </f:TextBox>
                                       <f:Button runat="server" ID="btnSelect"  Icon="Find" OnClick="btnSelect_Click" ToolTip="根据所选项目查询">
                                      </f:Button>
                                      <f:ToolbarFill ID="ToolbarFill1" runat="server">
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 {
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
         
+        /// <summary>
+        /// txtProjectName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectName;
+        
         /// <summary>
         /// btnSelect 控件。
         /// </summary>
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 @@
                             <Toolbars>
                                 <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
                                     <Items>
-                                        <f:TextBox ID="txtProjectCode" runat="server" Label="项目号" EmptyText="输入项目号查询"
+                                        <f:TextBox ID="txtProjectCode" runat="server" Label="施工号" EmptyText="输入施工号查询"
+                                            Width="250px" LabelWidth="70px">
+                                        </f:TextBox>
+                                        <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" EmptyText="输入项目名称查询"
                                             Width="250px" LabelWidth="70px">
                                         </f:TextBox>
                                         <f:Button runat="server" ID="btnSelect" Icon="Find" OnClick="btnSelect_Click" ToolTip="根据所选项目查询">
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 {
         /// </remarks>
         protected global::FineUIPro.TextBox txtProjectCode;
         
+        /// <summary>
+        /// txtProjectName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtProjectName;
+        
         /// <summary>
         /// btnSelect 控件。
         /// </summary>