shecs
/
ZHJA_HJGL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

This commit is contained in:
佘春生 2025-01-08 09:23:30 +08:00
parent f06ff52912 b1b1bd37cd
commit 1ea4ebfef6
24 changed files with 122 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx
View File

@ -74,16 +74,16 @@
</Items> </Items>
<Items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道无损检测数量统计表" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="管道无损检测数量统计表" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="PipeCode" AllowCellEditing="true" runat="server" BoxFlex="1" DataKeyNames="IsoNo" AllowCellEditing="true"
AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipeCode" AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="IsoNo"
AllowSorting="true" SortField="PipeCode,IsoNo,NDTR_Name" SortDirection="ASC" OnSort="Grid1_Sort" AllowSorting="true" SortField="IsoNo" SortDirection="ASC" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="True" AutoScroll="true" Width="100%"> EnableTextSelection="True" AutoScroll="true" Width="100%">
<Columns> <Columns>
<f:RenderField HeaderText="管道编号" ColumnID="PipeCode" DataField="PipeCode" SortField="PipeCode" <f:RenderField HeaderText="管道编号" ColumnID="PipeCode" DataField="PipeCode" SortField="PipeCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="包含的单线号" ColumnID="IsoNo" DataField="IsoNo" SortField="IsoNo" <f:RenderField HeaderText="管线号" ColumnID="IsoNo" DataField="IsoNo" SortField="IsoNo"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="检测比例" ColumnID="NDTR_Name" DataField="NDTR_Name" FieldType="String" <f:RenderField HeaderText="检测比例" ColumnID="NDTR_Name" DataField="NDTR_Name" FieldType="String"

2
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.cs
View File

@ -135,7 +135,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
{ {
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID)) if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID) && !string.IsNullOrEmpty(this.tvControlItem.SelectedNode.ParentNode.NodeID))
{ {
string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId ";//AND InstallationId = @InstallationId"; string strSql = @"SELECT * FROM HJGL_View_TrustNumSummary WHERE ProjectId = @ProjectId order by IsoNo";//AND InstallationId = @InstallationId";
List<SqlParameter> listStr = new List<SqlParameter>(); List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID)); listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNode.ParentNode.NodeID));

4
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/CheckQuantityStatistics.aspx.designer.cs generated
View File

@ -2,8 +2,8 @@
// <自动生成> // <自动生成>
// 此代码由工具生成。 // 此代码由工具生成。
// //
// 对此文件的更改可能会导致不正确的行为，并且如果 // 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，这些更改将会丢失。 // 重新生成代码，则所做更改将丢失。
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

6
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx
View File

@ -89,7 +89,7 @@
<Items> <Items>
<f:Label ID="txtHotHardCode" Label="试验编号" runat="server" LabelWidth="80px" LabelAlign="Right"> <f:Label ID="txtHotHardCode" Label="试验编号" runat="server" LabelWidth="80px" LabelAlign="Right">
</f:Label> </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> </f:Label>
</Items> </Items>
</f:FormRow> </f:FormRow>
@ -97,7 +97,7 @@
<Items> <Items>
<f:Label ID="txtSTE_Code" Label="材质" runat="server" LabelWidth="80px" LabelAlign="Right"> <f:Label ID="txtSTE_Code" Label="材质" runat="server" LabelWidth="80px" LabelAlign="Right">
</f:Label> </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> </f:Label>
</Items> </Items>
</f:FormRow> </f:FormRow>
@ -105,7 +105,7 @@
<Items> <Items>
<f:Label ID="txtInstrumentType" Label="仪器型号" runat="server" LabelWidth="80px" LabelAlign="Right"> <f:Label ID="txtInstrumentType" Label="仪器型号" runat="server" LabelWidth="80px" LabelAlign="Right">
</f:Label> </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> </f:Label>
</Items> </Items>
</f:FormRow> </f:FormRow>

8
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx
View File

@ -46,20 +46,20 @@
<f:DropDownList ID="drpUnit" Label="委托单位" runat="server" ShowRedStar="true" Required="true" <f:DropDownList ID="drpUnit" Label="委托单位" runat="server" ShowRedStar="true" Required="true"
FocusOnPageLoad="true" EnableEdit="true" LabelWidth="105px" LabelAlign="Right"> FocusOnPageLoad="true" EnableEdit="true" LabelWidth="105px" LabelAlign="Right">
</f:DropDownList> </f:DropDownList>
<f:DatePicker ID="txtTestDate" Label="试验日期" runat="server" ShowRedStar="true" Required="true" <f:DatePicker ID="txtTestDate" Label="热处理委托时间" runat="server" ShowRedStar="true" Required="true"
LabelWidth="80px" DateFormatString="yyyy-MM-dd" LabelAlign="Right"> LabelWidth="115px" DateFormatString="yyyy-MM-dd" LabelAlign="Right">
</f:DatePicker> </f:DatePicker>
</Items> </Items>
</f:FormRow> </f:FormRow>
<f:FormRow> <f:FormRow>
<Items> <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"> EnableEdit="true" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlSTE_SelectedIndexChanged">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpEquipment" Label="设备/仪器编号" runat="server" EnableEdit="true" <f:DropDownList ID="drpEquipment" Label="设备/仪器编号" runat="server" EnableEdit="true"
LabelWidth="105px" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpEquipment_SelectedIndexChanged"> LabelWidth="105px" LabelAlign="Right" AutoPostBack="true" OnSelectedIndexChanged="drpEquipment_SelectedIndexChanged">
</f:DropDownList> </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> </f:TextBox>
</Items> </Items>
</f:FormRow> </f:FormRow>

17
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardManageItemEdit.aspx.designer.cs generated
View File

@ -2,8 +2,8 @@
// <自动生成> // <自动生成>
// 此代码由工具生成。 // 此代码由工具生成。
// //
// 对此文件的更改可能会导致不正确的行为，并且如果 // 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，这些更改将会丢失。 // 重新生成代码，则所做更改将丢失。
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -130,13 +130,13 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
protected global::FineUIPro.DatePicker txtTestDate; protected global::FineUIPro.DatePicker txtTestDate;
/// <summary> /// <summary>
/// txtSTE_Code 控件。 /// ddlSTE 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtSTE_Code; protected global::FineUIPro.DropDownList ddlSTE;
/// <summary> /// <summary>
/// drpEquipment 控件。 /// drpEquipment 控件。
@ -209,14 +209,5 @@ namespace FineUIPro.Web.HJGL.HotHardManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnDelete; protected global::FineUIPro.Button btnDelete;
/// <summary>
/// ddlSTE 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlSTE;
} }
} }

8
HJGL_ZH/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx.cs
View File

@ -152,7 +152,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
isNoSameMat = true; isNoSameMat = true;
} }
if (isoidLog != joint.ISO_ID) //新管线的记录 if (isoidLog != joint.ISO_ID) //新管线的记录
{ {
Model.HJGL_CH_HardTestReport oldHardTestReport = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportByID(hardTestReportId); Model.HJGL_CH_HardTestReport oldHardTestReport = BLL.HJGL_CH_HardTestReportService.GetCH_HardTestReportByID(hardTestReportId);
if (oldHardTestReport != null) //更新之前硬度检验报告的热处理状态和检验数量 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.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.ProjectId = joint.ProjectId;
hardTestReport.ISO_ID = iso.ISO_ID; 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.TrustUnitId = iso.BSU_ID;
hardTestReport.TestStandard = "GB/T17394.1-2014"; hardTestReport.TestStandard = "GB/T17394.1-2014";
hardTestReport.STE_ID = iso.STE_ID; hardTestReport.STE_ID = iso.STE_ID;

2
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
View File

@ -1371,6 +1371,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_NDTMethod = n; t.CH_NDTMethod = n;
t.Flag = flag; t.Flag = flag;
t.CH_TrustType = "1"; t.CH_TrustType = "1";
t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustDate = DateTime.Now; t.CH_TrustDate = DateTime.Now;
t.ProjectId = batch.ProjectId; t.ProjectId = batch.ProjectId;
t.InstallationId = batch.InstallationId; 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_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_TrustCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetTrustCodeByProjectId", "dbo.HJGL_CH_Trust", "CH_TrustCode", batch.ProjectId, ndtInfo.NDT_Code + "-");
t.CH_NDTMethod = ndtItem.Value; t.CH_NDTMethod = ndtItem.Value;
t.CH_TrustUnit = iso.BSU_ID;
t.Flag = flag; t.Flag = flag;
t.CH_TrustType = "1"; t.CH_TrustType = "1";
t.CH_TrustDate = DateTime.Now; t.CH_TrustDate = DateTime.Now;

1
HJGL_ZH/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs
View File

@ -366,6 +366,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
t.CH_TrustCode = trustCode; t.CH_TrustCode = trustCode;
t.CH_NDTMethod = NDT_ID; t.CH_NDTMethod = NDT_ID;
t.CH_TrustType = "2"; t.CH_TrustType = "2";
t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustDate = DateTime.Now.Date; t.CH_TrustDate = DateTime.Now.Date;
t.ProjectId = batch.ProjectId; t.ProjectId = batch.ProjectId;
t.InstallationId = batch.InstallationId; t.InstallationId = batch.InstallationId;

11
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx
View File

@ -41,6 +41,9 @@
<f:DropDownList ID="drpState" runat="server" Label="检测状态" EmptyText="选择查询条件" <f:DropDownList ID="drpState" runat="server" Label="检测状态" EmptyText="选择查询条件"
Width="180px" LabelWidth="80px" LabelAlign="Right"> Width="180px" LabelWidth="80px" LabelAlign="Right">
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpUnit" runat="server" Label="委托单位" EmptyText="选择查询条件" EnableEdit="true"
Width="280px" LabelWidth="80px" LabelAlign="Right">
</f:DropDownList>
</Items> </Items>
</f:FormRow> </f:FormRow>
</Rows> </Rows>
@ -234,6 +237,14 @@
SortField="CheckAddress" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" SortField="CheckAddress" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="120px"> Width="120px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="委托单位" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
</f:RenderField>
<f:RenderField HeaderText="反馈人" ColumnID="FeedbackMan" DataField="FeedbackMan"
SortField="FeedbackMan" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="120px">
</f:RenderField>
</Columns> </Columns>
<PageItems> <PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server"> <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">

14
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.cs
View File

@ -42,6 +42,12 @@ namespace FineUIPro.Web.HJGL.WeldingReport
this.drpNdtType.DataBind(); this.drpNdtType.DataBind();
Funs.FineUIPleaseSelect(this.drpNdtType); 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(); this.txtEndDate.Text = DateTime.Now.ToShortDateString();
//BindGrid(); //BindGrid();
Funs.FineUIPleaseSelect(this.drpState); Funs.FineUIPleaseSelect(this.drpState);
@ -171,6 +177,14 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{ {
listStr.Add(new SqlParameter("@ndtType", null)); 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) if (!this.ckbFeedbackDate.Checked && !this.ckbTrustDate.Checked)
{ {
listStr.Add(new SqlParameter("@trustStartDate", null)); listStr.Add(new SqlParameter("@trustStartDate", null));

9
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultSelect.aspx.designer.cs generated
View File

@ -102,6 +102,15 @@ namespace FineUIPro.Web.HJGL.WeldingReport {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList drpState; protected global::FineUIPro.DropDownList drpState;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary> /// <summary>
/// ckbTrustDate 控件。 /// ckbTrustDate 控件。
/// </summary> /// </summary>

5
HJGL_ZH/FineUIPro.Web/HJGL/WeldingReport/FeedbackResultShowColumn.aspx.cs
View File

@ -19,7 +19,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport
{ {
if (!IsPostBack) if (!IsPostBack)
{ {
ListItem[] list = new ListItem[42]; ListItem[] list = new ListItem[44];
list[0] = new ListItem("施工号", "1"); list[0] = new ListItem("施工号", "1");
list[1] = new ListItem("试压包编号", "2"); list[1] = new ListItem("试压包编号", "2");
list[2] = new ListItem("管线号", "3"); list[2] = new ListItem("管线号", "3");
@ -62,7 +62,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport
list[39] = new ListItem("硬度反馈时间", "40"); list[39] = new ListItem("硬度反馈时间", "40");
list[40] = new ListItem("硬度不合格", "41"); list[40] = new ListItem("硬度不合格", "41");
list[41] = new ListItem("检测地点", "42"); list[41] = new ListItem("检测地点", "42");
list[42] = new ListItem("委托单位", "43");
list[43] = new ListItem("反馈人", "44");
this.cblColumn.DataSource = list; this.cblColumn.DataSource = list;
this.cblColumn.DataBind(); this.cblColumn.DataBind();

2
HJGL_ZH/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/> <FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings> <appSettings>
<!--连接字符串--> <!--连接字符串-->
<add key="ConnectionString" value="Server=.\sql2019;Database=HJGLDB_NEW;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/> <add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_NEW;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称--> <!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/> <add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/> <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

2
HJGL_ZH/FineUIPro.Web/WebService1.asmx.cs
View File

@ -464,6 +464,7 @@ namespace FineUIPro.Web
t.CH_NDTMethod = n; t.CH_NDTMethod = n;
t.Flag = flag; t.Flag = flag;
t.CH_TrustType = "1"; t.CH_TrustType = "1";
t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustDate = DateTime.Now; t.CH_TrustDate = DateTime.Now;
t.ProjectId = batch.ProjectId; t.ProjectId = batch.ProjectId;
t.InstallationId = batch.InstallationId; 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_TrustCode = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetTrustCodeByProjectId", "dbo.HJGL_CH_Trust", "CH_TrustCode", batch.ProjectId, ndtInfo.NDT_Code + "-");
t.CH_NDTMethod = n; t.CH_NDTMethod = n;
t.Flag = flag; t.Flag = flag;
t.CH_TrustUnit = iso.BSU_ID;
t.CH_TrustType = "1"; t.CH_TrustType = "1";
t.CH_TrustDate = DateTime.Now; t.CH_TrustDate = DateTime.Now;
t.ProjectId = batch.ProjectId; t.ProjectId = batch.ProjectId;

9
HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx
View File

@ -21,9 +21,12 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items> <Items>
<f:TextBox ID="txtProjectCode" runat="server" Label="项目号" EmptyText="输入项目号查询" <f:TextBox ID="txtProjectCode" runat="server" Label="施工号" EmptyText="输入施工号查询"
Width="250px" LabelWidth="70px"> Width="250px" LabelWidth="70px">
</f:TextBox> </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 runat="server" ID="btnSelect" Icon="Find" OnClick="btnSelect_Click" ToolTip="根据所选项目查询">
</f:Button> </f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">

4
HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.cs
View File

@ -30,6 +30,10 @@ namespace FineUIPro.Web.common
{ {
project = project.Where(e => e.ProjectCode.Contains(txtProjectCode.Text.Trim())).ToList(); 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; GridProject.RecordCount = project.Count;
var table = GetPagedDataTable(GridProject, project); var table = GetPagedDataTable(GridProject, project);
this.GridProject.DataSource = table; this.GridProject.DataSource = table;

9
HJGL_ZH/FineUIPro.Web/common/MainGdazServer.aspx.designer.cs generated
View File

@ -84,6 +84,15 @@ namespace FineUIPro.Web.common {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtProjectCode; protected global::FineUIPro.TextBox txtProjectCode;
/// <summary>
/// txtProjectName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary> /// <summary>
/// btnSelect 控件。 /// btnSelect 控件。
/// </summary> /// </summary>

5
HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx
View File

@ -32,11 +32,12 @@
<f:Toolbar ID="Toolbar3" Position="Top" ToolbarAlign="Right" runat="server"> <f:Toolbar ID="Toolbar3" Position="Top" ToolbarAlign="Right" runat="server">
<Items> <Items>
<f:TextBox ID="txtWeldCode" runat="server" Label="焊工号" EmptyText="请输入焊工号" <f:TextBox ID="txtWeldCode" runat="server" Label="焊工号" EmptyText="请输入焊工号"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox> ></f:TextBox>
<f:TextBox ID="txtWeldName" runat="server" Label="姓名" EmptyText="请输入焊工姓名" <f:TextBox ID="txtWeldName" runat="server" Label="姓名" EmptyText="请输入焊工姓名"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox> ></f:TextBox>
<f:ToolbarFill ID="ToolbarFill1" runat="server"> <f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill> </f:ToolbarFill>
<f:Button runat="server" ID="btnSearch" Text="查询" Icon="SystemSearch" OnClick="btnSearch_Click"></f:Button>
<f:Button ID="btnEdit" Text="确定" Icon="Add" runat="server" OnClick="btnEdit_Click"> <f:Button ID="btnEdit" Text="确定" Icon="Add" runat="server" OnClick="btnEdit_Click">
</f:Button> </f:Button>
</Items> </Items>

5
HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
View File

@ -165,6 +165,11 @@ namespace FineUIPro.Web.common.ProjectSet
this.BindGrid(); this.BindGrid();
} }
protected void btnSearch_Click(object sender, EventArgs e)
{
this.BindGrid();
}
//#region TreeView点击事件 //#region TreeView点击事件
///// <summary> ///// <summary>
///// TreeView点击事件 ///// TreeView点击事件

13
HJGL_ZH/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs generated
View File

@ -2,8 +2,8 @@
// <自动生成> // <自动生成>
// 此代码由工具生成。 // 此代码由工具生成。
// //
// 对此文件的更改可能会导致不正确的行为，并且如果 // 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，这些更改将会丢失。 // 重新生成代码，则所做更改将丢失。
// </自动生成> // </自动生成>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -93,6 +93,15 @@ namespace FineUIPro.Web.common.ProjectSet {
/// </remarks> /// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1; protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSearch 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSearch;
/// <summary> /// <summary>
/// btnEdit 控件。 /// btnEdit 控件。
/// </summary> /// </summary>

5
HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx
View File

@ -27,7 +27,10 @@
<Toolbars> <Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Right">
<Items> <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"> Width="250px" LabelWidth="70px">
</f:TextBox> </f:TextBox>
<f:Button runat="server" ID="btnSelect" Icon="Find" OnClick="btnSelect_Click" ToolTip="根据所选项目查询"> <f:Button runat="server" ID="btnSelect" Icon="Find" OnClick="btnSelect_Click" ToolTip="根据所选项目查询">

4
HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.cs
View File

@ -160,6 +160,10 @@ namespace FineUIPro.Web.common
{ {
project = project.Where(e => e.ProjectCode.Contains(txtProjectCode.Text.Trim())).ToList(); 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; GridProject.RecordCount = project.Count;
var table = GetPagedDataTable(GridProject, project); var table = GetPagedDataTable(GridProject, project);
this.GridProject.DataSource = table; this.GridProject.DataSource = table;

9
HJGL_ZH/FineUIPro.Web/common/mainGdaz.aspx.designer.cs generated
View File

@ -84,6 +84,15 @@ namespace FineUIPro.Web.common {
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtProjectCode; protected global::FineUIPro.TextBox txtProjectCode;
/// <summary>
/// txtProjectName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectName;
/// <summary> /// <summary>
/// btnSelect 控件。 /// btnSelect 控件。
/// </summary> /// </summary>