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

焊接修改

Browse Source
This commit is contained in:
李鹏飞
2024-10-17 21:46:32 +08:00
parent 022aebc00d
commit fec4225aff
62 changed files with 4200 additions and 1016 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx
+15 -6
View File
@@ -13,14 +13,23 @@
EnableCollapse="true" Width="290px" Title="试压前尾项A检查" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker ID="txtSearchDate" runat="server" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
DateFormatString="yyyy-MM" Label="按月份" LabelWidth="70px">
</f:DatePicker>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker ID="txtSearchDate" runat="server" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
DateFormatString="yyyy-MM" Label="按月份" LabelWidth="70px">
</f:DatePicker>
</Items>
</f:Toolbar>
</Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="A项尾工录入节点树" OnNodeCommand="tvControlItem_NodeCommand"
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true" AutoLeafIdentification="true"
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx.cs
+6 -2
View File
@@ -185,11 +185,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01");
DateTime endTime = startTime.AddMonths(1);
string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0];
var dReports = from x in testPackageUnitList
var dReports = (from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x;
select x).ToList();
if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim()))
{
dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList();
}
foreach (var item in dReports)
{
TreeNode newNode = new TreeNode();
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/AItemEndCheck.aspx.designer.cs
Generated
+43 -23
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
public partial class AItemEndCheck {
namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
public partial class AItemEndCheck
{
/// <summary>
/// Head1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// form1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtSearchDate 控件。
/// </summary>
@@ -74,7 +76,25 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -83,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -92,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -101,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar5 控件。
/// </summary>
@@ -110,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -119,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnDelete 控件。
/// </summary>
@@ -128,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// txtCheckMan 控件。
/// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckMan;
/// <summary>
/// txtCheckDate 控件。
/// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCheckDate;
/// <summary>
/// txtDealMan 控件。
/// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDealMan;
/// <summary>
/// txtDealDate 控件。
/// </summary>
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx
+16 -6
View File
@@ -14,14 +14,24 @@
EnableCollapse="true" Width="290px" Title="试压后尾项B检查" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker ID="txtSearchDate" runat="server" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
DateFormatString="yyyy-MM" Label="按月份" LabelWidth="70px">
</f:DatePicker>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker ID="txtSearchDate" runat="server" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
DateFormatString="yyyy-MM" Label="按月份" LabelWidth="70px">
</f:DatePicker>
</Items>
</f:Toolbar>
</Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="试压后尾项B检查节点树" OnNodeCommand="tvControlItem_NodeCommand"
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true" AutoLeafIdentification="true"
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx.cs
+9 -5
View File
@@ -185,11 +185,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01");
DateTime endTime = startTime.AddMonths(1);
string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0];
var dReports = from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x;
var dReports = (from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x).ToList();
if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim()))
{
dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList();
}
foreach (var item in dReports)
{
TreeNode newNode = new TreeNode();
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/BItemEndCheck.aspx.designer.cs
Generated
+43 -23
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
public partial class BItemEndCheck {
namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
public partial class BItemEndCheck
{
/// <summary>
/// Head1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// form1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtSearchDate 控件。
/// </summary>
@@ -74,7 +76,25 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -83,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -92,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -101,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar5 控件。
/// </summary>
@@ -110,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// btnNew 控件。
/// </summary>
@@ -119,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnDelete 控件。
/// </summary>
@@ -128,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDelete;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// txtCheckMan 控件。
/// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckMan;
/// <summary>
/// txtCheckDate 控件。
/// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtCheckDate;
/// <summary>
/// txtDealMan 控件。
/// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDealMan;
/// <summary>
/// txtDealDate 控件。
/// </summary>
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx
+203 -93
View File
@@ -18,7 +18,7 @@
}
.Purple span {
background-color: Purple;
background-color: plum;
}
.f-grid-row.Cyan {
@@ -34,7 +34,7 @@
}
.f-grid-row.Purple {
background-color: Purple;
background-color: plum;
}
/*定义父容器*/
@@ -61,7 +61,7 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="230px" Title="试压包" ShowBorder="true" Layout="VBox"
EnableCollapse="true" Width="280px" Title="试压包" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
@@ -71,6 +71,15 @@
</f:DatePicker>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="试压包节点树" OnNodeCommand="tvControlItem_NodeCommand"
@@ -87,33 +96,33 @@
<Items>
<f:HiddenField runat="server" ID="hdPTP_ID"></f:HiddenField>
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:DropDownBox ID="drpSelect" Width="500" DataControlID="drpPrintTypeList" EnableMultiSelect="true" Values="" runat="server" Label="打印报表" LabelAlign="Right">
<f:DropDownBox ID="drpSelect" Width="500" DataControlID="drpPrintTypeList" EnableMultiSelect="true" Values="" runat="server" Label="打印报表" LabelAlign="Right">
<PopPanel>
<f:SimpleForm ID="SimpleForm2" BodyPadding="10px" runat="server" AutoScroll="true"
ShowBorder="true" ShowHeader="false" Hidden="true">
<f:SimpleForm ID="SimpleForm2" BodyPadding="10px" runat="server" AutoScroll="true"
ShowBorder="true" ShowHeader="false" Hidden="true">
<Items>
<f:CheckBoxList ID="drpPrintTypeList" ColumnNumber="1" runat="server"></f:CheckBoxList>
<f:CheckBoxList ID="drpPrintTypeList" ColumnNumber="1" runat="server"></f:CheckBoxList>
</Items>
<toolbars>
<f:Toolbar runat="server" Position="Top">
<items>
<f:Button runat="server" ID="btnSelectAll" EnablePostBack="false" Text="全选">
<listeners>
<f:Listener Event="click" Handler="onSelectAllClick" />
</listeners>
</f:Button>
<f:Button runat="server" ID="btnClearAll" EnablePostBack="false" Text="清空">
<listeners>
<f:Listener Event="click" Handler="onClearAllClick" />
</listeners>
</f:Button>
</items>
</f:Toolbar>
</toolbars>
</f:SimpleForm>
<Toolbars>
<f:Toolbar runat="server" Position="Top">
<Items>
<f:Button runat="server" ID="btnSelectAll" EnablePostBack="false" Text="全选">
<Listeners>
<f:Listener Event="click" Handler="onSelectAllClick" />
</Listeners>
</f:Button>
<f:Button runat="server" ID="btnClearAll" EnablePostBack="false" Text="清空">
<Listeners>
<f:Listener Event="click" Handler="onClearAllClick" />
</Listeners>
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:SimpleForm>
</PopPanel>
</f:DropDownBox>
@@ -224,76 +233,177 @@
</f:Form>
</Items>
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="试压包明细" EnableCollapse="true" Collapsed="false"
runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId" AllowSorting="true"
SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Bottom" runat="server">
<f:TabStrip ID="TabStrip1" IsFluid="true" Height="420px" ShowBorder="true" TabPosition="Top"
EnableTabCloseMenu="false" ActiveTabIndex="0" runat="server">
<Tabs>
<f:Tab Title="全部" BodyPadding="10px" Layout="Fit" runat="server">
<Items>
<f:Label CssClass="Cyan" runat="server" ID="lbCyan" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab1" Label="未焊完" LabelWidth="70px" Width="120px" LabelAlign="Right"></f:Label>
<f:Label CssClass="Yellow" runat="server" ID="Label1" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab2" Label="已焊完，未达检测比例" LabelWidth="170px" Width="220px" LabelAlign="Right"></f:Label>
<f:Label CssClass="Green" runat="server" ID="Label2" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab3" Label="已焊完，已达检测比例，但有不合格" LabelWidth="260px" Width="310px" LabelAlign="Right"></f:Label>
<f:Label CssClass="Purple" runat="server" ID="Label4" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab4" Label="已通过" LabelWidth="70px" Width="120px" LabelAlign="Right"></f:Label>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="true" Title="试压包明细" EnableCollapse="true" Collapsed="false"
runat="server" BoxFlex="1" DataKeyNames="PipelineId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineId" AllowSorting="true" ForceFit="true"
SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Bottom" runat="server">
<Items>
<f:Label CssClass="Cyan" runat="server" ID="lbCyan" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab1" Label="未焊完" LabelWidth="70px" Width="120px" LabelAlign="Right"></f:Label>
<f:Label CssClass="Yellow" runat="server" ID="Label1" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab2" Label="已焊完，未达检测比例" LabelWidth="170px" Width="220px" LabelAlign="Right"></f:Label>
<f:Label CssClass="Green" runat="server" ID="Label2" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab3" Label="已焊完，已达检测比例，但有不合格" LabelWidth="260px" Width="310px" LabelAlign="Right"></f:Label>
<f:Label CssClass="Purple" runat="server" ID="Label4" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab4" Label="已通过" LabelWidth="70px" Width="120px" LabelAlign="Right"></f:Label>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="工作区" ColumnID="WorkAreaCode" DataField="WorkAreaCode" SortField="WorkAreaCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:WindowField ColumnID="PipelineCode" HeaderText="管线编号" DataTextField="PipelineCode" SortField="PipelineCode"
WindowID="Window3" DataIFrameUrlFields="PipelineId" DataIFrameUrlFormatString="../WeldingManage/PipelineManageEdit.aspx?PipelineId={0}&type=view"
Title="管线对应焊口详细信息" DataToolTipField="PipelineCode" HeaderTextAlign="Center" TextAlign="Left" Width="220px">
</f:WindowField>
<f:RenderField HeaderText="总焊口" ColumnID="WeldJointCount" DataField="WeldJointCount" SortField="WeldJointCount"
FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="完成总焊口" ColumnID="WeldJointCountT" DataField="WeldJointCountT" SortField="WeldJointCountT"
FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="合格数" ColumnID="CountS" DataField="CountS" SortField="CountS"
FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="不合格数" ColumnID="CountU" DataField="CountU" SortField="CountU"
FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="应检测比例" ColumnID="NDTR_Rate" DataField="NDTR_Rate" SortField="NDTR_Rate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="实际检测比例" ColumnID="Ratio" DataField="Ratio" SortField="Ratio"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="应检测比例值" ColumnID="NDTR_Rate" DataField="NDTR_Rate"
FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="实际检测比例值" ColumnID="RatioC" DataField="RatioC"
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="90px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="工作区" ColumnID="WorkAreaCode" DataField="WorkAreaCode" SortField="WorkAreaCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:WindowField ColumnID="PipelineCode" HeaderText="管线编号" DataTextField="PipelineCode" SortField="PipelineCode"
WindowID="Window3" DataIFrameUrlFields="PipelineId" DataIFrameUrlFormatString="../WeldingManage/PipelineManageEdit.aspx?PipelineId={0}&type=view"
Title="管线对应焊口详细信息" DataToolTipField="PipelineCode" HeaderTextAlign="Center" TextAlign="Left" Width="220px">
</f:WindowField>
<f:RenderField HeaderText="总焊口" ColumnID="WeldJointCount" DataField="WeldJointCount" SortField="WeldJointCount"
FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="完成总焊口" ColumnID="WeldJointCountT" DataField="WeldJointCountT" SortField="WeldJointCountT"
FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="合格数" ColumnID="CountS" DataField="CountS" SortField="CountS"
FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="不合格数" ColumnID="CountU" DataField="CountU" SortField="CountU"
FieldType="Int" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="应检测比例" ColumnID="NDTR_Rate" DataField="NDTR_Rate" SortField="NDTR_Rate"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="实际检测比例" ColumnID="Ratio" DataField="Ratio" SortField="Ratio"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:RenderField HeaderText="应检测比例值" ColumnID="NDTR_Rate" DataField="NDTR_Rate"
FieldType="String" Hidden="true">
</f:RenderField>
<f:RenderField HeaderText="实际检测比例值" ColumnID="RatioC" DataField="RatioC"
FieldType="String" Hidden="true">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="90px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
</PageItems>
</f:Grid>
</f:Tab>
<f:Tab Title="RT" BodyPadding="10px"
runat="server">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="true" Title="试压包明细" EnableCollapse="true" Collapsed="false"
runat="server" BoxFlex="1" DataKeyNames="PipelineCode,WelderCode" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" AllowSorting="true"
SortField="PipelineCode,WelderCode" SortDirection="ASC" EnableTextSelection="True" ForceFit="true" Height="420px"
AllowPaging="true" IsDatabasePaging="true" PageSize="100" >
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="管道编号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材质" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="规格" ColumnID="Specification" DataField="Specification" SortField="Specification"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="总数" ColumnID="jointCount" DataField="jointCount" SortField="jointCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="固定口数" ColumnID="FjointCount" DataField="FjointCount" SortField="FjointCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="焊工代号" ColumnID="WelderCode" DataField="WelderCode" SortField="WelderCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="施焊数量" ColumnID="WelderNum" DataField="WelderNum" SortField="WelderNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="总数" ColumnID="NdeNum" DataField="NdeNum" SortField="NdeNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="固定口数" ColumnID="FNdeNum" DataField="FNdeNum" SortField="FNdeNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="实际检测比例" ColumnID="Ratio" DataField="Ratio" SortField="Ratio"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:BoundField DataField="NdeReportNo" DataToolTipField="NdeReportNo" HeaderText="检测报告编号" />
</Columns>
</f:Grid>
</Items>
</f:Tab>
<f:Tab Title="PT" BodyPadding="10px" runat="server">
<Items>
<f:Grid ID="Grid3" ShowBorder="true" ShowHeader="true" Title="试压包明细" EnableCollapse="true" Collapsed="false"
runat="server" BoxFlex="1" DataKeyNames="PipelineCode,WelderCode" AllowCellEditing="true" ForceFit="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" AllowSorting="true" Height="420px"
SortField="PipelineCode,WelderCode" SortDirection="ASC" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="100">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center" />
<f:RenderField HeaderText="管道编号" ColumnID="PipelineCode" DataField="PipelineCode" SortField="PipelineCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="材质" ColumnID="MaterialCode" DataField="MaterialCode" SortField="MaterialCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="规格" ColumnID="Specification" DataField="Specification" SortField="Specification"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="总数" ColumnID="jointCount" DataField="jointCount" SortField="jointCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="固定口数" ColumnID="FjointCount" DataField="FjointCount" SortField="FjointCount"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="焊工代号" ColumnID="WelderCode" DataField="WelderCode" SortField="WelderCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="施焊数量" ColumnID="WelderNum" DataField="WelderNum" SortField="WelderNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="70px">
</f:RenderField>
<f:RenderField HeaderText="总数" ColumnID="NdeNum" DataField="NdeNum" SortField="NdeNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="固定口数" ColumnID="FNdeNum" DataField="FNdeNum" SortField="FNdeNum"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="实际检测比例" ColumnID="Ratio" DataField="Ratio" SortField="Ratio"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="100px">
</f:RenderField>
<f:BoundField DataField="NdeReportNo" DataToolTipField="NdeReportNo" HeaderText="检测报告编号" />
</Columns>
</f:Grid>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
</f:Panel>
</Items>
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs
+988 -321
View File
File diff suppressed because it is too large Load Diff
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.designer.cs
Generated
+45
View File
@@ -77,6 +77,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -473,6 +491,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.DatePicker txtAuditDate;
/// <summary>
/// TabStrip1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -590,6 +617,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Grid3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid3;
/// <summary>
/// Window1 控件。
/// </summary>
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx
+16 -7
View File
@@ -40,17 +40,26 @@
<f:Panel ID="Panel1" runat="server" ShowBorder="false" ShowHeader="false" Layout="Region">
<Items>
<f:Panel runat="server" ID="panelLeftRegion" RegionPosition="Left" RegionSplit="true"
EnableCollapse="true" Width="230px" Title="试压包" ShowBorder="true" Layout="VBox"
EnableCollapse="true" Width="280px" Title="试压包" ShowBorder="true" Layout="VBox"
ShowHeader="true" AutoScroll="true" BodyPadding="5px" IconFont="ArrowCircleLeft">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker ID="txtSearchDate" runat="server" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
DateFormatString="yyyy-MM" Label="按月份" LabelWidth="70px">
</f:DatePicker>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Right">
<Items>
<f:DatePicker ID="txtSearchDate" runat="server" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="Tree_TextChanged"
DateFormatString="yyyy-MM" Label="按月份" LabelWidth="70px">
</f:DatePicker>
</Items>
</f:Toolbar>
</Toolbars>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="试压包节点树" OnNodeCommand="tvControlItem_NodeCommand"
runat="server" ShowBorder="false" EnableCollapse="true" EnableSingleClickExpand="true" AutoLeafIdentification="true"
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx.cs
+9 -5
View File
@@ -169,11 +169,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01");
DateTime endTime = startTime.AddMonths(1);
string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0];
var dReports = from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x;
var dReports = (from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x).ToList();
if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim()))
{
dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList();
}
foreach (var item in dReports)
{
TreeNode newNode = new TreeNode();
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageComplete.aspx.designer.cs
Generated
+89 -69
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
public partial class TestPackageManageComplete {
namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
public partial class TestPackageManageComplete
{
/// <summary>
/// Head1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
/// <summary>
/// form1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelLeftRegion 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelLeftRegion;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtSearchDate 控件。
/// </summary>
@@ -74,7 +76,25 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>
@@ -83,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tree tvControlItem;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -92,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -101,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// hdPTP_ID 控件。
/// </summary>
@@ -110,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdPTP_ID;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -119,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnAudit 控件。
/// </summary>
@@ -128,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAudit;
/// <summary>
/// btnCancelAudit 控件。
/// </summary>
@@ -137,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCancelAudit;
/// <summary>
/// btnPrint 控件。
/// </summary>
@@ -146,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnPrint;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -155,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtTestPackageNo 控件。
/// </summary>
@@ -164,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTestPackageNo;
/// <summary>
/// drpInstallation 控件。
/// </summary>
@@ -173,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpInstallation;
/// <summary>
/// txtTestPackageName 控件。
/// </summary>
@@ -182,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTestPackageName;
/// <summary>
/// drpTestType 控件。
/// </summary>
@@ -191,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpTestType;
/// <summary>
/// txtTestService 控件。
/// </summary>
@@ -200,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTestService;
/// <summary>
/// txtTestHeat 控件。
/// </summary>
@@ -209,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTestHeat;
/// <summary>
/// txtTestAmbientTemp 控件。
/// </summary>
@@ -218,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTestAmbientTemp;
/// <summary>
/// txtTestMediumTemp 控件。
/// </summary>
@@ -227,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTestMediumTemp;
/// <summary>
/// txtVacuumTestService 控件。
/// </summary>
@@ -236,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtVacuumTestService;
/// <summary>
/// txtVacuumTestPressure 控件。
/// </summary>
@@ -245,7 +265,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtVacuumTestPressure;
/// <summary>
/// txtTightnessTestTime 控件。
/// </summary>
@@ -254,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTightnessTestTime;
/// <summary>
/// txtTightnessTestTemp 控件。
/// </summary>
@@ -263,7 +283,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTightnessTestTemp;
/// <summary>
/// txtTightnessTest 控件。
/// </summary>
@@ -272,7 +292,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTightnessTest;
/// <summary>
/// txtTestPressure 控件。
/// </summary>
@@ -281,7 +301,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTestPressure;
/// <summary>
/// txtTestPressureTemp 控件。
/// </summary>
@@ -290,7 +310,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTestPressureTemp;
/// <summary>
/// txtTestPressureTime 控件。
/// </summary>
@@ -299,7 +319,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTestPressureTime;
/// <summary>
/// txtOperationMedium 控件。
/// </summary>
@@ -308,7 +328,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtOperationMedium;
/// <summary>
/// txtPurgingMedium 控件。
/// </summary>
@@ -317,7 +337,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtPurgingMedium;
/// <summary>
/// txtCleaningMedium 控件。
/// </summary>
@@ -326,7 +346,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtCleaningMedium;
/// <summary>
/// txtLeakageTestService 控件。
/// </summary>
@@ -335,7 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtLeakageTestService;
/// <summary>
/// txtLeakageTestPressure 控件。
/// </summary>
@@ -344,7 +364,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtLeakageTestPressure;
/// <summary>
/// txtAllowSeepage 控件。
/// </summary>
@@ -353,7 +373,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtAllowSeepage;
/// <summary>
/// txtFactSeepage 控件。
/// </summary>
@@ -362,7 +382,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtFactSeepage;
/// <summary>
/// drpModifier 控件。
/// </summary>
@@ -371,7 +391,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpModifier;
/// <summary>
/// txtModifyDate 控件。
/// </summary>
@@ -380,7 +400,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtModifyDate;
/// <summary>
/// drpTabler 控件。
/// </summary>
@@ -389,7 +409,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label drpTabler;
/// <summary>
/// txtTableDate 控件。
/// </summary>
@@ -398,7 +418,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtTableDate;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -407,7 +427,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtRemark;
/// <summary>
/// txtAuditMan 控件。
/// </summary>
@@ -416,7 +436,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtAuditMan;
/// <summary>
/// txtAuditDate 控件。
/// </summary>
@@ -425,7 +445,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtAuditDate;
/// <summary>
/// drpFinisher 控件。
/// </summary>
@@ -434,7 +454,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpFinisher;
/// <summary>
/// txtFinishDate 控件。
/// </summary>
@@ -443,7 +463,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtFinishDate;
/// <summary>
/// txtFinishDef 控件。
/// </summary>
@@ -452,7 +472,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtFinishDef;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -461,7 +481,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@@ -470,7 +490,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// lbCyan 控件。
/// </summary>
@@ -479,7 +499,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbCyan;
/// <summary>
/// lab1 控件。
/// </summary>
@@ -488,7 +508,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lab1;
/// <summary>
/// Label1 控件。
/// </summary>
@@ -497,7 +517,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// lab2 控件。
/// </summary>
@@ -506,7 +526,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lab2;
/// <summary>
/// Label2 控件。
/// </summary>
@@ -515,7 +535,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// lab3 控件。
/// </summary>
@@ -524,7 +544,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lab3;
/// <summary>
/// Label4 控件。
/// </summary>
@@ -533,7 +553,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label4;
/// <summary>
/// lab4 控件。
/// </summary>
@@ -542,7 +562,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lab4;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@@ -551,7 +571,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@@ -560,7 +580,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@@ -569,7 +589,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -578,7 +598,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@@ -587,7 +607,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx
+12 -1
View File
@@ -20,6 +20,15 @@
</f:DatePicker>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar5" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtSearchCode" runat="server"
AutoPostBack="true" Label="<%$ Resources:Lan,PressureTestPackageNumber %>" LabelWidth="80px"
OnTextChanged="Tree_TextChanged" Width="265px" LabelAlign="Left">
</f:TextBox>
</Items>
</f:Toolbar>
</Toolbars>
<Items>
<f:Tree ID="tvControlItem" ShowHeader="false" Title="试压包节点树" OnNodeCommand="tvControlItem_NodeCommand"
@@ -162,7 +171,7 @@
runat="server" BoxFlex="1" DataKeyNames="PT_PipeId" AllowCellEditing="true"
EnableColumnLines="true" ClicksToEdit="2" DataIDField="PT_PipeId" AllowSorting="true"
SortField="WorkAreaCode,PipelineCode" SortDirection="ASC" OnSort="Grid1_Sort" EnableTextSelection="True"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange">
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" OnRowCommand="Grid1_RowCommand">
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
<f:RenderField HeaderText="工作区" ColumnID="WorkAreaCode" DataField="WorkAreaCode" SortField="WorkAreaCode"
@@ -183,6 +192,8 @@
<f:RenderField HeaderText="介质" ColumnID="MediumName" DataField="MediumName" SortField="MediumName"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px">
</f:RenderField>
<f:LinkButtonField Width="60px" TextAlign="Center" ConfirmTarget="Top"
CommandName="delete" Icon="Delete" />
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs
+43 -2
View File
@@ -182,11 +182,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
DateTime startTime = Convert.ToDateTime(this.txtSearchDate.Text.Trim() + "-01");
DateTime endTime = startTime.AddMonths(1);
string installationId = Funs.GetStrListByStr(node.ParentNode.NodeID, '|')[0];
var dReports = from x in testPackageUnitList
var dReports =( from x in testPackageUnitList
where x.InstallationId == installationId
&& x.TableDate >= startTime && x.TableDate < endTime
orderby x.TestPackageNo descending
select x;
select x).ToList();
if (!string.IsNullOrEmpty(this.txtSearchCode.Text.Trim()))
{
dReports = dReports.Where(x => x.TestPackageNo.Contains(this.txtSearchCode.Text.Trim())).ToList();
}
foreach (var item in dReports)
{
TreeNode newNode = new TreeNode();
@@ -1084,5 +1088,42 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
return dict;
}
protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
{
if (e.CommandName == "delete")
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnDelete))
{
var testPackageManage = BLL.TestPackageManageEditService.GetTestPackageByID(this.PTP_ID);
if (testPackageManage != null)
{
if (testPackageManage.AduditDate.HasValue)
{
Alert.ShowInTop("此试压单已审核！", MessageBoxIcon.Warning);
return;
}
if (TestPackageManageEditService.getPipelineListByPTP_ID(PTP_ID).Count == 1)
{
Alert.ShowInTop("此试压单下仅有一条管线，请直接删除试压包！", MessageBoxIcon.Warning);
return;
}
string id = e.RowID;
TestPackageManageEditService.DeletePipelineListByPT_PipeId( id);
this.BindGrid();
}
else
{
ShowNotify("请选择要删除的试压包记录！", MessageBoxIcon.Warning);
}
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
}
}
}
}
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.designer.cs
Generated
+18
View File
@@ -77,6 +77,24 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.DatePicker txtSearchDate;
/// <summary>
/// Toolbar5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar5;
/// <summary>
/// txtSearchCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSearchCode;
/// <summary>
/// tvControlItem 控件。
/// </summary>
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx
+4 -2
View File
@@ -19,6 +19,8 @@
<f:ToolbarFill ID="ToolbarFill1" runat="server"></f:ToolbarFill>
<f:Button ID="btnSave" Text="保存" ToolTip="保存试压包信息" ValidateForms="SimpleForm1" Icon="SystemSave" runat="server" OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnSubmit" Text="提交" ToolTip="提交试压包信息" ValidateForms="SimpleForm1" Icon="SystemSave" runat="server" OnClick="btnSubmit_Click1" >
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
@@ -124,7 +126,7 @@
<f:FormRow>
<Items>
<f:DropDownList ID="drpWorkArea" Label="区域" runat="server" LabelWidth="80px" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="Find_OnSelectedIndexChanged">
AutoPostBack="true" OnSelectedIndexChanged="Find_OnSelectedIndexChanged" >
</f:DropDownList>
<f:DropDownList ID="drpMedium" Label="介质" runat="server" LabelWidth="80px" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="Find_OnSelectedIndexChanged">
@@ -146,7 +148,7 @@
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"
AllowPaging="true" IsDatabasePaging="true" PageSize="10000"
OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" >
<Columns>
<f:CheckBoxField ColumnID="ckbIsSelected" Width="50px" RenderAsStaticField="false" HeaderText="选择"
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs
+174 -145
View File
@@ -389,9 +389,9 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
protected void drpInstallation_OnSelectedIndexChanged(object sender, EventArgs e)
{
BLL.Project_WorkAreaService.InitWorkAreaDropDownList(drpWorkArea, true, this.CurrUser.LoginProjectId, drpInstallation.SelectedValue, drpUnit.SelectedValue, null, Resources.Lan.PleaseSelect);
this.CollectGridJointInfo();
/*this.CollectGridJointInfo();
this.BindGrid();
this.ShowGridItem();
this.ShowGridItem();*/
}
/// <summary>
@@ -400,7 +400,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Find_OnSelectedIndexChanged(object sender, EventArgs e)
{
{
this.CollectGridJointInfo();
this.BindGrid();
this.ShowGridItem();
@@ -463,143 +463,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnSave))
{
if (BLL.TestPackageManageEditService.IsExistTestPackageCode(this.txtTestPackageNo.Text, this.PTP_ID, this.CurrUser.LoginProjectId))
{
ShowNotify("试压包编号已存在，请重新录入！", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrEmpty(this.txtTestPackageNo.Text) || this.drpUnit.SelectedValue == BLL.Const._Null || this.drpTabler.SelectedValue == BLL.Const._Null
|| this.drpInstallation.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.txtTableDate.Text))
{
ShowNotify("必填项不能为空！", MessageBoxIcon.Warning);
return;
}
this.CollectGridJointInfo();
if (this.listSelects.Count() == 0)
{
ShowNotify("请选择管线号！", MessageBoxIcon.Warning);
return;
}
var updatetrust = BLL.TestPackageManageEditService.GetTestPackageByID(this.PTP_ID);
if (updatetrust != null && updatetrust.AduditDate.HasValue)
{
ShowNotify("此施压包已审核不能修改！", MessageBoxIcon.Warning);
return;
}
Model.PTP_TestPackage testPackage = new Model.PTP_TestPackage();
testPackage.ProjectId = this.CurrUser.LoginProjectId;
if (this.drpInstallation.SelectedValue != BLL.Const._Null)
{
testPackage.InstallationId = this.drpInstallation.SelectedValue;
}
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
testPackage.UnitId = this.drpUnit.SelectedValue;
}
testPackage.TestPackageNo = this.txtTestPackageNo.Text.Trim();
testPackage.TestPackageName = this.txtTestPackageName.Text.Trim();
testPackage.TestHeat = this.txtTestHeat.Text.Trim();
testPackage.TestService = this.txtTestService.Text.Trim();
if (this.drpTestType.SelectedValue != BLL.Const._Null)
{
testPackage.TestType = this.drpTestType.SelectedValue;
}
if (this.drpTabler.SelectedValue != BLL.Const._Null)
{
testPackage.Tabler = this.drpTabler.SelectedValue;
}
testPackage.TableDate = Funs.GetNewDateTime(this.txtTableDate.Text);
if (this.drpModifier.SelectedValue != BLL.Const._Null)
{
testPackage.Modifier = this.drpModifier.SelectedValue;
}
testPackage.ModifyDate = Funs.GetNewDateTime(this.txtModifyDate.Text);
testPackage.Remark = this.txtRemark.Text.Trim();
//testPackage.TestPackageCode = this.txtTestPackageCode.Text.Trim();
testPackage.TestAmbientTemp = this.txtTestAmbientTemp.Text.Trim();
testPackage.TestMediumTemp = this.txtTestMediumTemp.Text.Trim();
testPackage.TestPressure = this.txtTestPressure.Text.Trim();
testPackage.TestPressureTemp = this.txtTestPressureTemp.Text.Trim();
testPackage.TestPressureTime = this.txtTestPressureTime.Text.Trim();
testPackage.TightnessTest = this.txtTightnessTest.Text.Trim();
testPackage.TightnessTestTemp = this.txtTightnessTestTemp.Text.Trim();
testPackage.TightnessTestTime = this.txtTightnessTestTime.Text.Trim();
testPackage.LeakageTestService = this.txtLeakageTestService.Text.Trim();
testPackage.LeakageTestPressure = this.txtLeakageTestPressure.Text.Trim();
testPackage.VacuumTestService = this.txtVacuumTestService.Text.Trim();
testPackage.VacuumTestPressure = this.txtVacuumTestPressure.Text.Trim();
testPackage.OperationMedium = this.txtOperationMedium.Text.Trim();
testPackage.PurgingMedium = this.txtPurgingMedium.Text.Trim();
testPackage.CleaningMedium = this.txtCleaningMedium.Text.Trim();
testPackage.AllowSeepage = this.txtAllowSeepage.Text.Trim();
testPackage.FactSeepage = this.txtFactSeepage.Text.Trim();
if (!string.IsNullOrEmpty(this.PTP_ID))
{
testPackage.PTP_ID = this.PTP_ID;
BLL.TestPackageManageEditService.UpdateTestPackage(testPackage);
//BLL.TestPackageManageEditService.DeleteTestPackage(PTP_ID);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnModify, this.PTP_ID);
}
else
{
testPackage.PTP_ID = SQLHelper.GetNewID(typeof(Model.PTP_TestPackage));
this.PTP_ID = testPackage.PTP_ID;
BLL.TestPackageManageEditService.AddTestPackage(testPackage);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnAdd, this.PTP_ID);
}
JArray teamGroupData = Grid1.GetMergedData();
if (listSelects.Count > 0)
{
BLL.TestPackageManageEditService.DeletePipelineListByPTP_ID(testPackage.PTP_ID);
}
foreach (JObject teamGroupRow in teamGroupData)
{
string PipelineId = teamGroupRow["id"].ToString();
string status = teamGroupRow.Value<string>("status");
if (listSelects.Contains(PipelineId))
{
JObject values = teamGroupRow.Value<JObject>("values");
string WeldJonintCodes = values.Value<string>("WeldJointCode");
string workAreaId = values.Value<string>("WorkAreaId");
if (string.IsNullOrEmpty(WeldJonintCodes))
WeldJonintCodes = "全部";
//处理剩下来的口
List<string> listJointCode = new List<string>();
var tempData = Funs.DB.PTP_PipelineList.Where(t=>t.PipelineId== PipelineId && t.IsAll==false).Select(t => t.WeldJonintCode).ToList();
foreach (var item in tempData)
{
if (!string.IsNullOrEmpty(item))
{
string[] arr=item.Split(',');
for (int i = 0; i < arr.Length; i++)
{
listJointCode.Add(arr[i]);
}
}
}
if(WeldJonintCodes=="全部" && listJointCode.Count > 0)
{
var nextJointCode = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineId && !listJointCode.Contains(t.WeldJointCode))
.Select(t => t.WeldJointCode).ToList().ToArray();
WeldJonintCodes = String.Join(",", nextJointCode.ToArray());
}
Model.PTP_PipelineList newitem = new Model.PTP_PipelineList();
newitem.PTP_ID = this.PTP_ID;
newitem.PipelineId = PipelineId;
newitem.IsAll = WeldJonintCodes=="全部" ? true : false;
newitem.WeldJonintCode = WeldJonintCodes;
newitem.WorkAreaId = workAreaId;
BLL.TestPackageManageEditService.AddPipelineList(newitem);
}
}
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID)
+ ActiveWindow.GetHidePostBackReference());
this.BindGrid();
Save();
ShowNotify("保存成功！", MessageBoxIcon.Success);
}
else
{
@@ -607,8 +472,172 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
return;
}
}
protected void btnSubmit_Click1(object sender, EventArgs e)
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnSave))
{
// Save();
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID)
+ ActiveWindow.GetHidePostBackReference());
}
else
{
ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
}
protected void Save()
{
if (BLL.TestPackageManageEditService.IsExistTestPackageCode(this.txtTestPackageNo.Text, this.PTP_ID, this.CurrUser.LoginProjectId))
{
ShowNotify("试压包编号已存在，请重新录入！", MessageBoxIcon.Warning);
return;
}
if (string.IsNullOrEmpty(this.txtTestPackageNo.Text) || this.drpUnit.SelectedValue == BLL.Const._Null || this.drpTabler.SelectedValue == BLL.Const._Null
|| this.drpInstallation.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.txtTableDate.Text))
{
ShowNotify("必填项不能为空！", MessageBoxIcon.Warning);
return;
}
this.CollectGridJointInfo();
if (this.listSelects.Count() == 0)
{
ShowNotify("请选择管线号！", MessageBoxIcon.Warning);
return;
}
var updatetrust = BLL.TestPackageManageEditService.GetTestPackageByID(this.PTP_ID);
if (updatetrust != null && updatetrust.AduditDate.HasValue)
{
ShowNotify("此施压包已审核不能修改！", MessageBoxIcon.Warning);
return;
}
Model.PTP_TestPackage testPackage = new Model.PTP_TestPackage();
testPackage.ProjectId = this.CurrUser.LoginProjectId;
if (this.drpInstallation.SelectedValue != BLL.Const._Null)
{
testPackage.InstallationId = this.drpInstallation.SelectedValue;
}
if (this.drpUnit.SelectedValue != BLL.Const._Null)
{
testPackage.UnitId = this.drpUnit.SelectedValue;
}
testPackage.TestPackageNo = this.txtTestPackageNo.Text.Trim();
testPackage.TestPackageName = this.txtTestPackageName.Text.Trim();
testPackage.TestHeat = this.txtTestHeat.Text.Trim();
testPackage.TestService = this.txtTestService.Text.Trim();
if (this.drpTestType.SelectedValue != BLL.Const._Null)
{
testPackage.TestType = this.drpTestType.SelectedValue;
}
if (this.drpTabler.SelectedValue != BLL.Const._Null)
{
testPackage.Tabler = this.drpTabler.SelectedValue;
}
testPackage.TableDate = Funs.GetNewDateTime(this.txtTableDate.Text);
if (this.drpModifier.SelectedValue != BLL.Const._Null)
{
testPackage.Modifier = this.drpModifier.SelectedValue;
}
testPackage.ModifyDate = Funs.GetNewDateTime(this.txtModifyDate.Text);
testPackage.Remark = this.txtRemark.Text.Trim();
//testPackage.TestPackageCode = this.txtTestPackageCode.Text.Trim();
testPackage.TestAmbientTemp = this.txtTestAmbientTemp.Text.Trim();
testPackage.TestMediumTemp = this.txtTestMediumTemp.Text.Trim();
testPackage.TestPressure = this.txtTestPressure.Text.Trim();
testPackage.TestPressureTemp = this.txtTestPressureTemp.Text.Trim();
testPackage.TestPressureTime = this.txtTestPressureTime.Text.Trim();
testPackage.TightnessTest = this.txtTightnessTest.Text.Trim();
testPackage.TightnessTestTemp = this.txtTightnessTestTemp.Text.Trim();
testPackage.TightnessTestTime = this.txtTightnessTestTime.Text.Trim();
testPackage.LeakageTestService = this.txtLeakageTestService.Text.Trim();
testPackage.LeakageTestPressure = this.txtLeakageTestPressure.Text.Trim();
testPackage.VacuumTestService = this.txtVacuumTestService.Text.Trim();
testPackage.VacuumTestPressure = this.txtVacuumTestPressure.Text.Trim();
testPackage.OperationMedium = this.txtOperationMedium.Text.Trim();
testPackage.PurgingMedium = this.txtPurgingMedium.Text.Trim();
testPackage.CleaningMedium = this.txtCleaningMedium.Text.Trim();
testPackage.AllowSeepage = this.txtAllowSeepage.Text.Trim();
testPackage.FactSeepage = this.txtFactSeepage.Text.Trim();
if (!string.IsNullOrEmpty(this.PTP_ID))
{
testPackage.PTP_ID = this.PTP_ID;
BLL.TestPackageManageEditService.UpdateTestPackage(testPackage);
//BLL.TestPackageManageEditService.DeleteTestPackage(PTP_ID);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnModify, this.PTP_ID);
}
else
{
testPackage.PTP_ID = SQLHelper.GetNewID(typeof(Model.PTP_TestPackage));
this.PTP_ID = testPackage.PTP_ID;
BLL.TestPackageManageEditService.AddTestPackage(testPackage);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnAdd, this.PTP_ID);
}
JArray teamGroupData = Grid1.GetMergedData();
if (listSelects.Count > 0)
{
//if (this.drpWorkArea.SelectedValue != Const._Null && drpWorkArea.SelectedValue != null)
//{
// BLL.TestPackageManageEditService.DeletePipelineListByPTP_IDAndWorkAreaId(testPackage.PTP_ID, drpWorkArea.SelectedValue);
//}
//else
//{
// BLL.TestPackageManageEditService.DeletePipelineListByPTP_ID(testPackage.PTP_ID);
//}
}
foreach (JObject teamGroupRow in teamGroupData)
{
string PipelineId = teamGroupRow["id"].ToString();
string status = teamGroupRow.Value<string>("status");
if (listSelects.Contains(PipelineId))
{
JObject values = teamGroupRow.Value<JObject>("values");
string WeldJonintCodes = values.Value<string>("WeldJointCode");
string workAreaId = values.Value<string>("WorkAreaId");
if (string.IsNullOrEmpty(WeldJonintCodes))
WeldJonintCodes = "全部";
//处理剩下来的口
List<string> listJointCode = new List<string>();
var tempData = Funs.DB.PTP_PipelineList.Where(t => t.PipelineId == PipelineId && t.IsAll == false).Select(t => t.WeldJonintCode).ToList();
foreach (var item in tempData)
{
if (!string.IsNullOrEmpty(item))
{
string[] arr = item.Split(',');
for (int i = 0; i < arr.Length; i++)
{
listJointCode.Add(arr[i]);
}
}
}
if (WeldJonintCodes == "全部" && listJointCode.Count > 0)
{
var nextJointCode = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineId && !listJointCode.Contains(t.WeldJointCode))
.Select(t => t.WeldJointCode).ToList().ToArray();
WeldJonintCodes = String.Join(",", nextJointCode.ToArray());
}
Model.PTP_PipelineList newitem = new Model.PTP_PipelineList();
newitem.PTP_ID = this.PTP_ID;
newitem.PipelineId = PipelineId;
newitem.IsAll = WeldJonintCodes == "全部" ? true : false;
newitem.WeldJonintCode = WeldJonintCodes;
newitem.WorkAreaId = workAreaId;
if (!TestPackageManageEditService.IsPipelineListExists(newitem.PTP_ID, newitem.PipelineId))
{
BLL.TestPackageManageEditService.AddPipelineList(newitem);
}
}
}
}
#endregion
#region 收集Grid页面信息
/// <summary>
@@ -621,10 +650,10 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
{
string rowID = Grid1.DataKeys[i][0].ToString();
CheckBoxField checkField = (CheckBoxField)Grid1.FindColumn("ckbIsSelected");
if (listSelects.Contains(rowID))
{
listSelects.Remove(rowID);
}
//if (listSelects.Contains(rowID))
//{
// listSelects.Remove(rowID);
//}
if (checkField.GetCheckedState(i))
{
listSelects.Add(rowID);
HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs
Generated
+9
View File
@@ -86,6 +86,15 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnSubmit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSubmit;
/// <summary>
/// SimpleForm1 控件。
/// </summary>