lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

质量管理；移交管理

This commit is contained in:
夏菊 2024-11-18 19:40:33 +08:00
parent 5fb846030f
commit 9ce0a75143
25 changed files with 213 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
View File

@ -59,7 +59,7 @@
</f:Toolbar> </f:Toolbar>
</Toolbars> </Toolbars>
<Columns> <Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"> <f:TemplateField ColumnID="tfPageIndex" Width="80px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate> <ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label> <asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate> </ItemTemplate>

2
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
View File

@ -542,7 +542,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oldViewInfo.TestCycle = pds.Rows[i][7].ToString().Trim(); oldViewInfo.TestCycle = pds.Rows[i][7].ToString().Trim();
oldViewInfo.IsOnSite = pds.Rows[i][8].ToString().Trim() == "是" ? true : false; oldViewInfo.IsVerification = pds.Rows[i][8].ToString().Trim() == "是" ? true : false;
if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim())) if (!string.IsNullOrEmpty(pds.Rows[i][9].ToString().Trim()))
{ {

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/机具报验导入模板.xls
View File

Binary file not shown.

3
SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
View File

@ -24,7 +24,8 @@
<f:TextBox runat="server" ID="txtCivil_Structure" Label="Tag.No" LabelWidth="180px" LabelAlign="Right"></f:TextBox> <f:TextBox runat="server" ID="txtCivil_Structure" Label="Tag.No" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox> <%--<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
<f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
<f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right"> <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
<f:ListItem Value="" Text="All" Selected="true" /> <f:ListItem Value="" Text="All" Selected="true" />

15
SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.cs
View File

@ -63,12 +63,17 @@ namespace FineUIPro.Web.Transfer
// strSql += " AND Test_Package_START <= @InspectionDateZ"; // strSql += " AND Test_Package_START <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); // listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//} //}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim())) //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
{ //{
strSql += " AND SystemName like @SystemName"; // strSql += " AND SystemName like @SystemName";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%")); // listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
} //}
if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
{
strSql += " AND Test_Package like @SysSubNo";
listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(ddStatus.SelectedValue)) if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{ {
strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' "; strSql += " And FINAL_Status='" + ddStatus.SelectedValue + "' ";

4
SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx.designer.cs generated
View File

@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtCivil_Structure; protected global::FineUIPro.TextBox txtCivil_Structure;
/// <summary> /// <summary>
/// txtSystem 控件。 /// txtSysSubNo 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtSystem; protected global::FineUIPro.TextBox txtSysSubNo;
/// <summary> /// <summary>
/// ddStatus 控件。 /// ddStatus 控件。

43
SGGL/FineUIPro.Web/Transfer/Electrical.aspx
View File

@ -12,19 +12,20 @@
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" /> <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true" runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort" ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true"> EnableRowDoubleClickEvent="true" EnableTextSelection="true">
<toolbars> <Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<items> <Items>
<f:TextBox runat="server" ID="txtELECTRICAL" Label="Tag. No" LabelWidth="110px" LabelAlign="Right"></f:TextBox> <f:TextBox runat="server" ID="txtELECTRICAL" Label="Tag. No" LabelWidth="110px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox> <%--<f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
<f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
<f:DropDownList runat="server" ID="ddStatus" Label="Status"> <f:DropDownList runat="server" ID="ddStatus" Label="Status">
<f:ListItem Value="" Text="All" Selected="true" /> <f:ListItem Value="" Text="All" Selected="true" />
@ -55,15 +56,15 @@
</f:Button> </f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false"> <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button> </f:Button>
</items> </Items>
</f:Toolbar> </f:Toolbar>
</toolbars> </Toolbars>
<columns> <Columns>
<f:GroupField HeaderText="ELECTRICAL" TextAlign="Center"> <f:GroupField HeaderText="ELECTRICAL" TextAlign="Center">
<columns> <Columns>
<f:BoundField MinWidth="220px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" /> <f:BoundField MinWidth="220px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center" <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
@ -71,15 +72,15 @@
</f:RenderField> </f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center"> <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">
<columns> <Columns>
<f:BoundField Width="90px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" /> <f:BoundField Width="90px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" />
<f:BoundField Width="100px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center" /> <f:BoundField Width="100px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center" />
<f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" /> <f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" />
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center"> <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
<columns> <Columns>
<f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/>&Inspection Reocrd" TextAlign="Center" <f:RenderField ColumnID="Installation" DataField="Installation" FieldType="String" HeaderText="Installation<br/>&Inspection Reocrd" TextAlign="Center"
HeaderTextAlign="Center" Width="150px"> HeaderTextAlign="Center" Width="150px">
</f:RenderField> </f:RenderField>
@ -95,16 +96,16 @@
<f:RenderField ColumnID="LoopTest" DataField="LoopTest" FieldType="String" HeaderText="Loop Test" TextAlign="Center" <f:RenderField ColumnID="LoopTest" DataField="LoopTest" FieldType="String" HeaderText="Loop Test" TextAlign="Center"
HeaderTextAlign="Center" Width="110px"> HeaderTextAlign="Center" Width="110px">
</f:RenderField> </f:RenderField>
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:BoundField Width="120px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" /> <f:BoundField Width="120px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
</columns> </Columns>
<listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</listeners> </Listeners>
<pageitems> <PageItems>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数："> <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText> </f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged"> <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@ -114,9 +115,9 @@
<f:ListItem Text="25" Value="25" /> <f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" /> <f:ListItem Text="所有行" Value="100000" />
</f:DropDownList> </f:DropDownList>
</pageitems> </PageItems>
</f:Grid> </f:Grid>
</items> </Items>
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="Electrical" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="Electrical" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
@ -128,7 +129,7 @@
Width="700px" Height="560px"> Width="700px" Height="560px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<items> <Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click"> <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton> </f:MenuButton>
@ -137,7 +138,7 @@
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
OnClick="btnMenuDel_Click" Hidden="true"> OnClick="btnMenuDel_Click" Hidden="true">
</f:MenuButton> </f:MenuButton>
</items> </Items>
</f:Menu> </f:Menu>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">

13
SGGL/FineUIPro.Web/Transfer/Electrical.aspx.cs
View File

@ -54,12 +54,17 @@ namespace FineUIPro.Web.Transfer
strSql += " AND ELECTRICAL like @ELECTRICAL"; strSql += " AND ELECTRICAL like @ELECTRICAL";
listStr.Add(new SqlParameter("@ELECTRICAL", "%" + this.txtELECTRICAL.Text.Trim() + "%")); listStr.Add(new SqlParameter("@ELECTRICAL", "%" + this.txtELECTRICAL.Text.Trim() + "%"));
} }
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim())) //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
//{
// strSql += " AND SystemName like @SystemName";
// listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
//}
if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
{ {
strSql += " AND SystemName like @SystemName"; strSql += " AND Test_Package like @SysSubNo";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%")); listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
} }
if (!string.IsNullOrEmpty(ddStatus.SelectedValue)) if (!string.IsNullOrEmpty(ddStatus.SelectedValue))

4
SGGL/FineUIPro.Web/Transfer/Electrical.aspx.designer.cs generated
View File

@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtELECTRICAL; protected global::FineUIPro.TextBox txtELECTRICAL;
/// <summary> /// <summary>
/// txtSystem 控件。 /// txtSysSubNo 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtSystem; protected global::FineUIPro.TextBox txtSysSubNo;
/// <summary> /// <summary>
/// ddStatus 控件。 /// ddStatus 控件。

43
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
View File

@ -12,19 +12,20 @@
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" /> <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true" runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort" ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true"> EnableRowDoubleClickEvent="true" EnableTextSelection="true">
<toolbars> <Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<items> <Items>
<f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="Tag No" LabelWidth="120px" LabelAlign="Right"></f:TextBox> <f:TextBox runat="server" ID="txtINSTRUMENTATION" Label="Tag No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox> <%--<f:TextBox runat="server" ID="txtSystem" Label="System" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
<f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
<f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right"> <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
<f:ListItem Value="" Text="All" Selected="true" /> <f:ListItem Value="" Text="All" Selected="true" />
@ -55,15 +56,15 @@
</f:Button> </f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false"> <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button> </f:Button>
</items> </Items>
</f:Toolbar> </f:Toolbar>
</toolbars> </Toolbars>
<columns> <Columns>
<f:GroupField HeaderText="INSTRUMENTATION" TextAlign="Center" MinWidth="200px"> <f:GroupField HeaderText="INSTRUMENTATION" TextAlign="Center" MinWidth="200px">
<columns> <Columns>
<f:BoundField Width="160px" TextAlign="Center" ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" /> <f:BoundField Width="160px" TextAlign="Center" ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" />
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center" <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
@ -71,15 +72,15 @@
</f:RenderField> </f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center"> <f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center">
<columns> <Columns>
<f:BoundField Width="90px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" /> <f:BoundField Width="90px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center" />
<f:BoundField Width="100px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center" /> <f:BoundField Width="100px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center" />
<f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" /> <f:BoundField MinWidth="180px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center" />
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center"> <f:GroupField HeaderText="Test Package Schedule" TextAlign="Center">
<columns> <Columns>
<%--<f:RenderField ColumnID="Calibration" DataField="Calibration" FieldType="String" HeaderText="Calibration " TextAlign="Center" <%--<f:RenderField ColumnID="Calibration" DataField="Calibration" FieldType="String" HeaderText="Calibration " TextAlign="Center"
HeaderTextAlign="Center" MinWidth="140px"> HeaderTextAlign="Center" MinWidth="140px">
</f:RenderField>--%> </f:RenderField>--%>
@ -103,16 +104,16 @@
<f:RenderField ColumnID="Looptest" DataField="Looptest" FieldType="String" HeaderText="Loop test" TextAlign="Center" <f:RenderField ColumnID="Looptest" DataField="Looptest" FieldType="String" HeaderText="Loop test" TextAlign="Center"
HeaderTextAlign="Center" Width="90px"> HeaderTextAlign="Center" Width="90px">
</f:RenderField> </f:RenderField>
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:BoundField Width="110px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" /> <f:BoundField Width="110px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center" />
</columns> </Columns>
<listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</listeners> </Listeners>
<pageitems> <PageItems>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数："> <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText> </f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged"> <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@ -122,9 +123,9 @@
<f:ListItem Text="25" Value="25" /> <f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" /> <f:ListItem Text="所有行" Value="100000" />
</f:DropDownList> </f:DropDownList>
</pageitems> </PageItems>
</f:Grid> </f:Grid>
</items> </Items>
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="Instrumentation" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="Instrumentation" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
@ -135,7 +136,7 @@
Width="700px" Height="560px"> Width="700px" Height="560px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<items> <Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click"> <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton> </f:MenuButton>
<%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true"> <%--<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click" Hidden="true">
@ -143,7 +144,7 @@
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
OnClick="btnMenuDel_Click" Hidden="true"> OnClick="btnMenuDel_Click" Hidden="true">
</f:MenuButton> </f:MenuButton>
</items> </Items>
</f:Menu> </f:Menu>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">

15
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.cs
View File

@ -70,12 +70,17 @@ namespace FineUIPro.Web.Transfer
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); // listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//} //}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim())) //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
{ //{
strSql += " AND SystemName like @SystemName"; // strSql += " AND SystemName like @SystemName";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%")); // listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
} //}
if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
{
strSql += " AND Test_Package like @SysSubNo";
listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
}
strSql += " order by INSTRUMENTATION "; strSql += " order by INSTRUMENTATION ";
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();

4
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx.designer.cs generated
View File

@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtINSTRUMENTATION; protected global::FineUIPro.TextBox txtINSTRUMENTATION;
/// <summary> /// <summary>
/// txtSystem 控件。 /// txtSysSubNo 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtSystem; protected global::FineUIPro.TextBox txtSysSubNo;
/// <summary> /// <summary>
/// ddStatus 控件。 /// ddStatus 控件。

6
SGGL/FineUIPro.Web/Transfer/LHCSystemList.aspx
View File

@ -65,18 +65,18 @@
<f:RenderField ColumnID="Commissioningsystemcode" DataField="Commissioningsystemcode" <f:RenderField ColumnID="Commissioningsystemcode" DataField="Commissioningsystemcode"
FieldType="String" HeaderText="Commissioning<br/> system code" TextAlign="Center" FieldType="String" HeaderText="Commissioning<br/> system code" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="140px"> HeaderTextAlign="Center" MinWidth="160px">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="CommissioningCodeDescription" DataField="CommissioningCodeDescription" <f:RenderField ColumnID="CommissioningCodeDescription" DataField="CommissioningCodeDescription"
FieldType="String" HeaderText="Commissioning Code<br/> Description" TextAlign="Center" FieldType="String" HeaderText="Commissioning Code<br/> Description" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="160px"> HeaderTextAlign="Center" MinWidth="300px">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="Describe" DataField="Describe" <f:RenderField ColumnID="Describe" DataField="Describe"
FieldType="String" HeaderText="试车代号描述" TextAlign="Center" Hidden="true" FieldType="String" HeaderText="试车代号描述" TextAlign="Center" Hidden="true"
HeaderTextAlign="Center" MinWidth="120px"> HeaderTextAlign="Center" MinWidth="200px">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="SubCommissioningsystem" DataField="SubCommissioningsystem" <f:RenderField ColumnID="SubCommissioningsystem" DataField="SubCommissioningsystem"

2
SGGL/FineUIPro.Web/Transfer/Piping.aspx
View File

@ -25,7 +25,7 @@
<f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="Test Package No" LabelWidth="150px" LabelAlign="Right"></f:TextBox> <f:TextBox runat="server" ID="txtPIPINGLINENUMBER" Label="Test Package No" LabelWidth="150px" LabelAlign="Right"></f:TextBox>
<%--<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM NO" LabelWidth="120px" LabelAlign="Right"></f:TextBox>--%> <%--<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM NO" LabelWidth="120px" LabelAlign="Right"></f:TextBox>--%>
<f:TextBox runat="server" ID="txtTurnoverSystemCode" Label="Turnover System Code" LabelWidth="140px" LabelAlign="Right"></f:TextBox> <f:TextBox runat="server" ID="txtTurnoverSystemCode" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
<f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right"> <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
<f:ListItem Value="" Text="All" Selected="true" /> <f:ListItem Value="" Text="All" Selected="true" />

82
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
View File

@ -12,17 +12,17 @@
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" /> <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<items> <Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true" <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true" runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort" ClicksToEdit="2" DataIDField="Id" AllowSorting="true" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true"> EnableRowDoubleClickEvent="true" EnableTextSelection="true">
<toolbars> <Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<items> <Items>
<f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox> <f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
<f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox> <f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="180px" LabelAlign="Right"></f:TextBox>
<f:DropDownList ID="ddlCat" runat="server" Label="Cat." AutoPostBack="true" Width="80px" LabelWidth="40px"> <f:DropDownList ID="ddlCat" runat="server" Label="Cat." AutoPostBack="true" Width="80px" LabelWidth="40px">
<f:ListItem Value="" Text=""></f:ListItem> <f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="A" Text="A"></f:ListItem> <f:ListItem Value="A" Text="A"></f:ListItem>
@ -32,18 +32,6 @@
</f:DropDownList> </f:DropDownList>
<f:TextBox runat="server" ID="txtRaised_By" Label="Raised By" LabelWidth="90px" LabelAlign="Right" Width="150px"></f:TextBox> <f:TextBox runat="server" ID="txtRaised_By" Label="Raised By" LabelWidth="90px" LabelAlign="Right" Width="150px"></f:TextBox>
<f:TextBox runat="server" ID="txtDisc" Label="Disc" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox> <f:TextBox runat="server" ID="txtDisc" Label="Disc" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
<f:DropDownList ID="ddlEng" runat="server" Label="Eng" AutoPostBack="true" Width="80px" LabelWidth="40px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="Y" Text="Y"></f:ListItem>
<f:ListItem Value="N" Text="N"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlMatI" runat="server" Label="Mat'l" AutoPostBack="true" Width="80px" LabelWidth="40px">
<f:ListItem Value="" Text=""></f:ListItem>
<%--<f:ListItem Value="Y" Text="Y"></f:ListItem>--%>
<f:ListItem Value="Y1" Text="Y1"></f:ListItem>
<f:ListItem Value="Y2" Text="Y2"></f:ListItem>
<f:ListItem Value="N" Text="N"></f:ListItem>
</f:DropDownList>
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询"> <f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button> </f:Button>
@ -54,12 +42,10 @@
</f:Button> </f:Button>
<f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="清空数据" OnClick="btnClear_Click" ConfirmText="确定清空所有数据？" Hidden="true"> <f:Button ID="btnClear" Icon="Delete" EnablePostBack="true" runat="server" ToolTip="清空数据" OnClick="btnClear_Click" ConfirmText="确定清空所有数据？" Hidden="true">
</f:Button> </f:Button>
<f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true"> </Items>
</f:Button>
</items>
</f:Toolbar> </f:Toolbar>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<items> <Items>
<f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="180px" LabelWidth="100px"> <f:DropDownList ID="ddlPunchType" runat="server" Label="Punch Type" AutoPostBack="true" Width="180px" LabelWidth="100px">
<f:ListItem Value="" Text=""></f:ListItem> <f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="PWD" Text="PWD"></f:ListItem> <f:ListItem Value="PWD" Text="PWD"></f:ListItem>
@ -74,11 +60,25 @@
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem> <f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
<f:ListItem Value="In Progress" Text="In Progress"></f:ListItem> <f:ListItem Value="In Progress" Text="In Progress"></f:ListItem>
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlEng" runat="server" Label="Eng" AutoPostBack="true" Width="80px" LabelWidth="40px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="Y" Text="Y"></f:ListItem>
<f:ListItem Value="N" Text="N"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlMatI" runat="server" Label="Mat'l" AutoPostBack="true" Width="100px" LabelWidth="40px">
<f:ListItem Value="" Text=""></f:ListItem>
<%--<f:ListItem Value="Y" Text="Y"></f:ListItem>--%>
<f:ListItem Value="Y1" Text="Y1"></f:ListItem>
<f:ListItem Value="Y2" Text="Y2"></f:ListItem>
<f:ListItem Value="N" Text="N"></f:ListItem>
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill> <f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
</f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
EnableAjax="false" DisableControlBeforePostBack="false"> EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button> </f:Button>
</items> </Items>
</f:Toolbar> </f:Toolbar>
<%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left"> <%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items> <Items>
@ -105,8 +105,8 @@
</f:DatePicker> </f:DatePicker>
</Items> </Items>
</f:Toolbar>--%> </f:Toolbar>--%>
</toolbars> </Toolbars>
<columns> <Columns>
<%--<f:GroupField HeaderText="PUNCH LIST FORM" TextAlign="Center"> <%--<f:GroupField HeaderText="PUNCH LIST FORM" TextAlign="Center">
<Columns> <Columns>
@ -158,9 +158,9 @@
<f:TemplateField ColumnID="ImagePhotoes" Width="120px" HeaderText="Photoes" HeaderTextAlign="Center" <f:TemplateField ColumnID="ImagePhotoes" Width="120px" HeaderText="Photoes" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
<itemtemplate> <ItemTemplate>
<asp:Label ID="lbPhotoesImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")+"_A") %>'></asp:Label> <asp:Label ID="lbPhotoesImageUrl" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")+"_A") %>'></asp:Label>
</itemtemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Photoes" DataField="Photoes" HeaderText="Photoes" />--%> <%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Photoes" DataField="Photoes" HeaderText="Photoes" />--%>
@ -190,9 +190,9 @@
<f:TemplateField ColumnID="ImageCorrected_Photos" Width="150px" HeaderText="Corrected Photos" HeaderTextAlign="Center" <f:TemplateField ColumnID="ImageCorrected_Photos" Width="150px" HeaderText="Corrected Photos" HeaderTextAlign="Center"
TextAlign="Left"> TextAlign="Left">
<itemtemplate> <ItemTemplate>
<asp:Label ID="labCorrected_Photos" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")+"_B") %>'></asp:Label> <asp:Label ID="labCorrected_Photos" runat="server" Text='<%# ConvertImageUrlByImage(Eval("Id")+"_B") %>'></asp:Label>
</itemtemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Corrected_Photos" DataField="Corrected_Photos" HeaderText="Corrected Photos" />--%> <%--<f:BoundField Width="150px" TextAlign="Center" ColumnID="Corrected_Photos" DataField="Corrected_Photos" HeaderText="Corrected Photos" />--%>
@ -200,37 +200,37 @@
<f:RenderField Width="150px" TextAlign="Center" ColumnID="Actual_Date" DataField="Actual_Date" HeaderText="实际完成时间<br>Actual Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" /> <f:RenderField Width="150px" TextAlign="Center" ColumnID="Actual_Date" DataField="Actual_Date" HeaderText="实际完成时间<br>Actual Date" FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
<f:GroupField HeaderText="Cleared(PIC）监理核查" TextAlign="Center" MinWidth="200px"> <f:GroupField HeaderText="Cleared(PIC）监理核查" TextAlign="Center" MinWidth="200px">
<columns> <Columns>
<f:RenderField Width="100px" ColumnID="Cleared_By" DataField="Cleared_By" HeaderText="By" TextAlign="Center" /> <f:RenderField Width="100px" ColumnID="Cleared_By" DataField="Cleared_By" HeaderText="By" TextAlign="Center" />
<f:RenderField Width="100px" ColumnID="Cleared_Date" DataField="Cleared_Date" HeaderText="Date" TextAlign="Center" <f:RenderField Width="100px" ColumnID="Cleared_Date" DataField="Cleared_Date" HeaderText="Date" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" /> FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:GroupField HeaderText="Confirmed(WUH)确认（五环）" TextAlign="Center" MinWidth="200px"> <f:GroupField HeaderText="Confirmed(WUH)确认（五环）" TextAlign="Center" MinWidth="200px">
<columns> <Columns>
<f:RenderField Width="100px" ColumnID="Confirmed_By" DataField="Confirmed_By" HeaderText="By" TextAlign="Center" /> <f:RenderField Width="100px" ColumnID="Confirmed_By" DataField="Confirmed_By" HeaderText="By" TextAlign="Center" />
<f:RenderField Width="100px" ColumnID="Confirmed_Date" DataField="Confirmed_Date" HeaderText="Date" TextAlign="Center" <f:RenderField Width="100px" ColumnID="Confirmed_Date" DataField="Confirmed_Date" HeaderText="Date" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" /> FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:GroupField HeaderText="Verified(BASF)验收" TextAlign="Center" MinWidth="200px"> <f:GroupField HeaderText="Verified(BASF)验收" TextAlign="Center" MinWidth="200px">
<columns> <Columns>
<f:RenderField Width="100px" ColumnID="Verified_By" DataField="Verified_By" HeaderText="By" TextAlign="Center" /> <f:RenderField Width="100px" ColumnID="Verified_By" DataField="Verified_By" HeaderText="By" TextAlign="Center" />
<f:RenderField Width="100px" ColumnID="Verified_Date" DataField="Verified_Date" HeaderText="Date" TextAlign="Center" <f:RenderField Width="100px" ColumnID="Verified_Date" DataField="Verified_Date" HeaderText="Date" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" /> FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="状态<br>Status" /> <f:BoundField Width="80px" TextAlign="Center" ColumnID="Status" DataField="Status" HeaderText="状态<br>Status" />
<f:BoundField Width="80px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="备注<br>Remark" /> <f:BoundField Width="80px" TextAlign="Center" ColumnID="Remark" DataField="Remark" HeaderText="备注<br>Remark" />
</columns> </Columns>
<listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</listeners> </Listeners>
<pageitems> <PageItems>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数："> <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText> </f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged"> <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@ -240,9 +240,9 @@
<f:ListItem Text="25" Value="25" /> <f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" /> <f:ListItem Text="所有行" Value="100000" />
</f:DropDownList> </f:DropDownList>
</pageitems> </PageItems>
</f:Grid> </f:Grid>
</items> </Items>
</f:Panel> </f:Panel>
<f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px" Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
@ -257,7 +257,7 @@
Height="600px"> Height="600px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<items> <Items>
<f:MenuButton ID="btnMenuAttachA" runat="server" Icon="FolderUp" Text="Photoes附件" OnClick="btnMenuAttachA_Click" Hidden="true"> <f:MenuButton ID="btnMenuAttachA" runat="server" Icon="FolderUp" Text="Photoes附件" OnClick="btnMenuAttachA_Click" Hidden="true">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuAttachB" runat="server" Icon="FolderUp" Text="Corrected_Photos附件" OnClick="btnMenuAttachB_Click" Hidden="true"> <f:MenuButton ID="btnMenuAttachB" runat="server" Icon="FolderUp" Text="Corrected_Photos附件" OnClick="btnMenuAttachB_Click" Hidden="true">
@ -267,7 +267,7 @@
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
OnClick="btnMenuDel_Click" Hidden="true"> OnClick="btnMenuDel_Click" Hidden="true">
</f:MenuButton> </f:MenuButton>
</items> </Items>
</f:Menu> </f:Menu>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">

54
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs generated
View File

@ -104,24 +104,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtDisc; protected global::FineUIPro.TextBox txtDisc;
/// <summary>
/// ddlEng 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlEng;
/// <summary>
/// ddlMatI 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlMatI;
/// <summary> /// <summary>
/// btnSearch 控件。 /// btnSearch 控件。
/// </summary> /// </summary>
@ -149,15 +131,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks> /// </remarks>
protected global::FineUIPro.Button btnClear; protected global::FineUIPro.Button btnClear;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary> /// <summary>
/// Toolbar2 控件。 /// Toolbar2 控件。
/// </summary> /// </summary>
@ -203,6 +176,33 @@ namespace FineUIPro.Web.Transfer
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList ddlStatus; protected global::FineUIPro.DropDownList ddlStatus;
/// <summary>
/// ddlEng 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlEng;
/// <summary>
/// ddlMatI 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlMatI;
/// <summary>
/// btnImport 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary> /// <summary>
/// btnOut 控件。 /// btnOut 控件。
/// </summary> /// </summary>

3
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
View File

@ -24,7 +24,8 @@
<items> <items>
<f:TextBox runat="server" ID="txtRotatingEquipment" Label="Tag. No" LabelWidth="120px" LabelAlign="Right"></f:TextBox> <f:TextBox runat="server" ID="txtRotatingEquipment" Label="Tag. No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox> <%--<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
<f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
<f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right"> <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
<f:ListItem Value="" Text="All" Selected="true" /> <f:ListItem Value="" Text="All" Selected="true" />

11
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.cs
View File

@ -57,10 +57,15 @@ namespace FineUIPro.Web.Transfer
// strSql += " AND TestPackageSTART <= @InspectionDateZ"; // strSql += " AND TestPackageSTART <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); // listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//} //}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim())) //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
//{
// strSql += " AND SYSTEM like @SYSTEM";
// listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
//}
if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
{ {
strSql += " AND SYSTEM like @SYSTEM"; strSql += " AND TestPackage like @SysSubNo";
listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%")); listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
} }
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

4
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx.designer.cs generated
View File

@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtRotatingEquipment; protected global::FineUIPro.TextBox txtRotatingEquipment;
/// <summary> /// <summary>
/// txtSystem 控件。 /// txtSysSubNo 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtSystem; protected global::FineUIPro.TextBox txtSysSubNo;
/// <summary> /// <summary>
/// ddStatus 控件。 /// ddStatus 控件。

47
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
View File

@ -12,19 +12,20 @@
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" /> <f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel1" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" <f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch"> ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<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="Id" AllowCellEditing="true" EnableColumnLines="true" runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="StaticEquipment" ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="StaticEquipment"
SortDirection="ASC" OnSort="Grid1_Sort" 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"> EnableTextSelection="true">
<toolbars> <Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left"> <f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<items> <Items>
<f:TextBox runat="server" ID="txtStaticEquipment" Label="Tag No" LabelWidth="100px" LabelAlign="Right"></f:TextBox> <f:TextBox runat="server" ID="txtStaticEquipment" Label="Tag No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox> <%--<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
<f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
<%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px" <%-- <f:DatePicker runat="server" Label="Test_Package_START" ID="txtStarTime" LabelAlign="Right" LabelWidth="150px"
Width="280px"> Width="280px">
@ -52,10 +53,10 @@
</f:Button> </f:Button>
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false"> <f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp" EnableAjax="false" DisableControlBeforePostBack="false">
</f:Button> </f:Button>
</items> </Items>
</f:Toolbar> </f:Toolbar>
</toolbars> </Toolbars>
<columns> <Columns>
<%-- <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center" <%-- <f:TemplateField ColumnID="tfPageIndex" MinWidth="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False"> EnableLock="true" Locked="False">
<ItemTemplate> <ItemTemplate>
@ -63,11 +64,11 @@
</ItemTemplate> </ItemTemplate>
</f:TemplateField>--%> </f:TemplateField>--%>
<f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center"> <f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
<columns> <Columns>
<f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Tag No" TextAlign="Center" <f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Tag No" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="220px"> HeaderTextAlign="Center" MinWidth="220px">
</f:RenderField> </f:RenderField>
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center" <f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
@ -75,7 +76,7 @@
</f:RenderField> </f:RenderField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center"> <f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
<columns> <Columns>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center" <f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="90px"> HeaderTextAlign="Center" MinWidth="90px">
</f:RenderField> </f:RenderField>
@ -85,10 +86,10 @@
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center" <f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="140px"> HeaderTextAlign="Center" MinWidth="140px">
</f:RenderField> </f:RenderField>
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center"> <f:GroupField ID="g3" HeaderText="Test Package Schedule" HeaderTextAlign="Center">
<columns> <Columns>
<f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Internal inspection " TextAlign="Center" <f:RenderField ColumnID="Internalinspection" DataField="Internalinspection" FieldType="String" HeaderText="Internal inspection " TextAlign="Center"
HeaderTextAlign="Center" MinWidth="140px"> HeaderTextAlign="Center" MinWidth="140px">
</f:RenderField> </f:RenderField>
@ -100,20 +101,20 @@
<f:RenderField ColumnID="BOXupRecord" DataField="BOXupRecord" FieldType="String" HeaderText="BOX-up Record" TextAlign="Center" <f:RenderField ColumnID="BOXupRecord" DataField="BOXupRecord" FieldType="String" HeaderText="BOX-up Record" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="130px"> HeaderTextAlign="Center" MinWidth="130px">
</f:RenderField> </f:RenderField>
</columns> </Columns>
</f:GroupField> </f:GroupField>
<f:GroupField ID="g5" HeaderText="" HeaderTextAlign="Center"> <f:GroupField ID="g5" HeaderText="" HeaderTextAlign="Center">
<columns> <Columns>
<f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="FINAL Status" ExpandUnusedSpace="true" TextAlign="Center" <f:RenderField ColumnID="MechanicalFINALStatus" DataField="MechanicalFINALStatus" FieldType="String" HeaderText="FINAL Status" ExpandUnusedSpace="true" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px"> HeaderTextAlign="Center" MinWidth="120px">
</f:RenderField> </f:RenderField>
</columns> </Columns>
</f:GroupField> </f:GroupField>
</columns> </Columns>
<listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</listeners> </Listeners>
<pageitems> <PageItems>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数："> <f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText> </f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged"> <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
@ -123,9 +124,9 @@
<f:ListItem Text="25" Value="25" /> <f:ListItem Text="25" Value="25" />
<f:ListItem Text="所有行" Value="100000" /> <f:ListItem Text="所有行" Value="100000" />
</f:DropDownList> </f:DropDownList>
</pageitems> </PageItems>
</f:Grid> </f:Grid>
</items> </Items>
</f:Panel> </f:Panel>
<f:Window ID="Window1" Title="设备材料报验" Hidden="true" EnableIFrame="true" EnableMaximize="true" <f:Window ID="Window1" Title="设备材料报验" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close" Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
@ -140,14 +141,14 @@
IsModal="true" Width="700px" Height="500px"> IsModal="true" Width="700px" Height="500px">
</f:Window> </f:Window>
<f:Menu ID="Menu1" runat="server"> <f:Menu ID="Menu1" runat="server">
<items> <Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click"> <f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton> </f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？" <f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"
OnClick="btnMenuDel_Click" Hidden="true"> OnClick="btnMenuDel_Click" Hidden="true">
</f:MenuButton> </f:MenuButton>
</items> </Items>
</f:Menu> </f:Menu>
</form> </form>
<script type="text/javascript"> <script type="text/javascript">

11
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.cs
View File

@ -51,10 +51,15 @@ namespace FineUIPro.Web.Transfer
// strSql += " AND TestPackageSTART <= @InspectionDateZ"; // strSql += " AND TestPackageSTART <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); // listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//} //}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim())) //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
//{
// strSql += " AND SYSTEM like @SYSTEM";
// listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%"));
//}
if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
{ {
strSql += " AND SYSTEM like @SYSTEM"; strSql += " AND TestPackage like @SysSubNo";
listStr.Add(new SqlParameter("@SYSTEM", "%" + this.txtSystem.Text.Trim() + "%")); listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
} }
if (!string.IsNullOrEmpty(ddStatus.SelectedValue)) if (!string.IsNullOrEmpty(ddStatus.SelectedValue))

4
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx.designer.cs generated
View File

@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtStaticEquipment; protected global::FineUIPro.TextBox txtStaticEquipment;
/// <summary> /// <summary>
/// txtSystem 控件。 /// txtSysSubNo 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtSystem; protected global::FineUIPro.TextBox txtSysSubNo;
/// <summary> /// <summary>
/// ddStatus 控件。 /// ddStatus 控件。

3
SGGL/FineUIPro.Web/Transfer/Telecom.aspx
View File

@ -24,7 +24,8 @@
<f:TextBox runat="server" ID="txtTelecom" Label="Tag.No" LabelWidth="120px" LabelAlign="Right"></f:TextBox> <f:TextBox runat="server" ID="txtTelecom" Label="Tag.No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox> <%--<f:TextBox runat="server" ID="txtSystem" Label="System No" LabelWidth="100px" LabelAlign="Right"></f:TextBox>--%>
<f:TextBox runat="server" ID="txtSysSubNo" Label="Turnover System Code" LabelWidth="200px" LabelAlign="Right"></f:TextBox>
<f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right"> <f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
<f:ListItem Value="" Text="All" Selected="true" /> <f:ListItem Value="" Text="All" Selected="true" />

11
SGGL/FineUIPro.Web/Transfer/Telecom.aspx.cs
View File

@ -64,10 +64,15 @@ namespace FineUIPro.Web.Transfer
// strSql += " AND Test_Package_START <= @InspectionDateZ"; // strSql += " AND Test_Package_START <= @InspectionDateZ";
// listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim()))); // listStr.Add(new SqlParameter("@InspectionDateZ", Funs.GetNewDateTime(txtEndTime.Text.Trim())));
//} //}
if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim())) //if (!string.IsNullOrEmpty(this.txtSystem.Text.Trim()))
//{
// strSql += " AND SystemName like @SystemName";
// listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%"));
//}
if (!string.IsNullOrEmpty(this.txtSysSubNo.Text.Trim()))
{ {
strSql += " AND SystemName like @SystemName"; strSql += " AND Test_Package like @SysSubNo";
listStr.Add(new SqlParameter("@SystemName", "%" + this.txtSystem.Text.Trim() + "%")); listStr.Add(new SqlParameter("@SysSubNo", "%" + this.txtSysSubNo.Text.Trim() + "%"));
} }
if (!string.IsNullOrEmpty(ddStatus.SelectedValue)) if (!string.IsNullOrEmpty(ddStatus.SelectedValue))
{ {

4
SGGL/FineUIPro.Web/Transfer/Telecom.aspx.designer.cs generated
View File

@ -69,13 +69,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtTelecom; protected global::FineUIPro.TextBox txtTelecom;
/// <summary> /// <summary>
/// txtSystem 控件。 /// txtSysSubNo 控件。
/// </summary> /// </summary>
/// <remarks> /// <remarks>
/// 自动生成的字段。 /// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks> /// </remarks>
protected global::FineUIPro.TextBox txtSystem; protected global::FineUIPro.TextBox txtSysSubNo;
/// <summary> /// <summary>
/// ddStatus 控件。 /// ddStatus 控件。