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

修改移交

Browse Source
This commit is contained in:
潘鸿锋
2024-08-09 10:48:15 +08:00
parent cc639f4cab
commit 8c3bd0fe80
65 changed files with 1335 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/File/Excel/DataIn/CivilStructure导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/Electrical导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/Firefighting导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/Plumbing导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/RotatingEquipment导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/StaticEquipment导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/File/Excel/DataIn/Telecom导入模板.xls
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+1 -1
View File
@@ -19216,7 +19216,7 @@
</FlavorProperties>
</VisualStudio>
</ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress>false</Use64BitIISExpress>
<IISExpressSSLPort />
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
+104 -1
View File
@@ -50,7 +50,7 @@
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="600px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server" AutoPostBack="true" OnTabIndexChanged="TabStrip1_TabIndexChanged">
<Tabs>
<f:Tab ID="Tab1" Title="图形" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
TitleToolTip="图形">
@@ -71,6 +71,109 @@
</f:ContentPanel>
</Items>
</f:Tab>
<f:Tab ID="Tab3" Title="按专业统计" BodyPadding="5px" Layout="VBox" IconFont="ListAlt" runat="server">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" DataKeyNames="Disc" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="Disc" AllowSorting="true" OnSort="Grid1_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow">
<Columns>
<f:BoundField DataField="Disc" ColumnID="Disc" HeaderText="专业" ExpandUnusedSpace="true" MinWidth="150px" />
<f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
<Columns>
<f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
</Columns>
<PageItems>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" 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:ListItem Text="所有行" Value="100000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Tab>
<f:Tab ID="Tab4" Title="按单位统计" BodyPadding="5px" Layout="VBox" IconFont="ListAlt" runat="server">
<Items>
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" DataKeyNames="Action_By" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="Action_By" AllowSorting="true" OnSort="Grid2_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid2_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true" EnableSummary="true" SummaryPosition="Flow">
<Columns>
<f:BoundField DataField="Action_By" ColumnID="Action_By" HeaderText="单位" ExpandUnusedSpace="true" MinWidth="150px" />
<f:RenderField Width="150px" ColumnID="Cat_All_Count" DataField="Cat_All_Count" HeaderText="汇总" TextAlign="Center" FieldType="Double" />
<f:GroupField HeaderText="类别" TextAlign="Center" MinWidth="600px">
<Columns>
<f:RenderField Width="150px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="A" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="B" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="C" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="150px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="D" TextAlign="Center" FieldType="Double" />
</Columns>
</f:GroupField>
</Columns>
<PageItems>
<f:ToolbarText ID="ToolbarText2" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize2" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize2_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:ListItem Text="所有行" Value="100000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Tab>
<f:Tab ID="Tab5" Title="尾项进度跟踪表" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
TitleToolTip="图形">
<Items>
<f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="System_No" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="System_No" AllowSorting="true" OnSort="Grid3_Sort"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid3_PageIndexChange"
EnableRowDoubleClickEvent="true" EnableTextSelection="true">
<Columns>
<f:BoundField Width="180px" TextAlign="Center" ColumnID="System_No" DataField="System_No" HeaderText="System No." />
<f:RenderField Width="180px" TextAlign="Center" ColumnID="SystemNoCount" DataField="SystemNoCount" HeaderText="尾项数量" FieldType="Double" />
<f:RenderField Width="180px" TextAlign="Center" ColumnID="ActualDateCount" DataField="ActualDateCount" HeaderText="已完成数量" FieldType="Double"/>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="ClearedByCount" DataField="ClearedByCount" HeaderText="Cleared(PIC)" FieldType="Double"/>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="ConfirmedByCount" DataField="ConfirmedByCount" HeaderText="Confirmed(WUH)" FieldType="Double"/>
<f:RenderField Width="180px" TextAlign="Center" ColumnID="VerifiedByCount" DataField="VerifiedByCount" HeaderText="Verified(BASF)" FieldType="Double"/>
</Columns>
<PageItems>
<f:ToolbarText ID="ToolbarText3" runat="server" Text="每页记录数：">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize3" Width="80px" AutoPostBack="true" OnSelectedIndexChanged="ddlPageSize3_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:ListItem Text="所有行" Value="100000" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Tab>
</Tabs>
</f:TabStrip>
</Items>
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
+295 -1
View File
@@ -2,9 +2,12 @@
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Text;
using System.Web.Services.Description;
using BLL;
using Newtonsoft.Json.Linq;
using NPOI.SS.Formula.Functions;
namespace FineUIPro.Web.Transfer.Chart
@@ -23,7 +26,7 @@ namespace FineUIPro.Web.Transfer.Chart
ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.System_No, t.System_No));
indexRow++;
}
AnalyseData();
}
}
@@ -144,6 +147,8 @@ namespace FineUIPro.Web.Transfer.Chart
protected void BtnAnalyse_Click(object sender, EventArgs e)
{
this.AnalyseData();
BindGrid1();
BindGrid2();
}
/// <summary>
@@ -174,6 +179,295 @@ namespace FineUIPro.Web.Transfer.Chart
protected void ddlSystemNo_SelectedIndexChanged(object sender, EventArgs e)
{
this.AnalyseData();
BindGrid1();
BindGrid2();
}
#region 加载
#region 分页、排序
/// <summary>
/// 分页下拉
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid1();
}
/// <summary>
/// 分页索引事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid1();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
Grid1.SortDirection = e.SortDirection;
Grid1.SortField = e.SortField;
BindGrid1();
}
/// <summary>
/// 分页下拉
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize2_SelectedIndexChanged(object sender, EventArgs e)
{
Grid2.PageSize = Convert.ToInt32(ddlPageSize2.SelectedValue);
BindGrid2();
}
/// <summary>
/// 分页索引事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid2();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
Grid2.SortDirection = e.SortDirection;
Grid2.SortField = e.SortField;
BindGrid2();
}
#endregion
/// <summary>
/// 查询绑定数据
/// </summary>
public void BindGrid1()
{
List<SqlParameter> listStr = new List<SqlParameter>();
string _systemNo = string.Empty;
_systemNo = ddlSystemNo.SelectedValue;
StringBuilder strSql = new StringBuilder("");
strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllPunchlistFromSortTemp1') IS NOT NULL drop table #AllPunchlistFromSortTemp1; ");
strSql.AppendLine(" IF OBJECT_ID('tempdb..#PunchlistFromSortTemp1') IS NOT NULL drop table #PunchlistFromSortTemp1; ");
strSql.AppendLine(" select * INTO #AllPunchlistFromSortTemp1 from Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
if (!string.IsNullOrWhiteSpace(_systemNo))
{
strSql.AppendLine(" AND System_No=@System_No ");
listStr.Add(new SqlParameter("@System_No", _systemNo));
}
strSql.AppendLine(" select Disc,cast(0 as decimal(18,2)) Cat_A_Count,cast(0 as decimal(18,2)) Cat_B_Count,cast(0 as decimal(18,2)) Cat_C_Count,cast(0 as decimal(18,2)) Cat_D_Count INTO #PunchlistFromSortTemp1 from #AllPunchlistFromSortTemp1 Group by Disc; ");
strSql.AppendLine(" update a set a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')) ");
strSql.AppendLine(",a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ");
strSql.AppendLine(",a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ");
strSql.AppendLine(",a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ");
strSql.AppendLine("from #PunchlistFromSortTemp1 a;");
strSql.AppendLine("select * from #PunchlistFromSortTemp1 ");
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql.AppendLine(" order by Disc ");
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
//合计
int cat_A_Count = 0;
int cat_B_Count = 0;
int cat_C_Count = 0;
int cat_D_Count = 0;
foreach (DataRow row in tb.Rows)
{
cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
}
JObject summary = new JObject();
summary.Add("Disc", "合计");
summary.Add("Cat_A_Count", cat_A_Count.ToString());
summary.Add("Cat_B_Count", cat_B_Count.ToString());
summary.Add("Cat_C_Count", cat_C_Count.ToString());
summary.Add("Cat_D_Count", cat_D_Count.ToString());
Grid1.SummaryData = summary;
}
/// <summary>
/// 查询绑定数据
/// </summary>
public void BindGrid2()
{
List<SqlParameter> listStr = new List<SqlParameter>();
string _systemNo = string.Empty;
_systemNo = ddlSystemNo.SelectedValue;
StringBuilder strSql = new StringBuilder("");
strSql.AppendLine(" IF OBJECT_ID('tempdb..#AllPunchlistFromSortTemp2') IS NOT NULL drop table #AllPunchlistFromSortTemp2; ");
strSql.AppendLine(" IF OBJECT_ID('tempdb..#PunchlistFromSortTemp2') IS NOT NULL drop table #PunchlistFromSortTemp2; ");
strSql.AppendLine(" select * INTO #AllPunchlistFromSortTemp2 from Transfer_PunchlistFrom(NOLOCK) where ProjectId=@ProjectId ");
if (!string.IsNullOrWhiteSpace(_systemNo))
{
strSql.AppendLine(" AND System_No=@System_No ");
listStr.Add(new SqlParameter("@System_No", _systemNo));
}
strSql.AppendLine(" select Action_By,cast(0 as decimal(18,2)) Cat_All_Count,cast(0 as decimal(18,2)) Cat_A_Count,cast(0 as decimal(18,2)) Cat_B_Count,cast(0 as decimal(18,2)) Cat_C_Count,cast(0 as decimal(18,2)) Cat_D_Count INTO #PunchlistFromSortTemp2 from #AllPunchlistFromSortTemp2 Group by Action_By; ");
strSql.AppendLine(" update a set a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')) ");
strSql.AppendLine(",a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ");
strSql.AppendLine(",a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ");
strSql.AppendLine(",a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ");
strSql.AppendLine("from #PunchlistFromSortTemp2 a;");
strSql.AppendLine(" update #PunchlistFromSortTemp2 set Cat_All_Count=Cat_A_Count+Cat_B_Count+Cat_C_Count+Cat_D_Count; ");
strSql.AppendLine("select * from #PunchlistFromSortTemp2 ");
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql.AppendLine(" order by Action_By ");
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
Grid2.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid2.DataSource = table;
Grid2.DataBind();
//合计
int cat_A_Count = 0;
int cat_B_Count = 0;
int cat_C_Count = 0;
int cat_D_Count = 0;
int cat_All_Count = 0;
foreach (DataRow row in tb.Rows)
{
cat_All_Count += Convert.ToInt32(row["Cat_All_Count"]);
cat_A_Count += Convert.ToInt32(row["Cat_A_Count"]);
cat_B_Count += Convert.ToInt32(row["Cat_B_Count"]);
cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
}
JObject summary = new JObject();
summary.Add("Action_By", "合计");
summary.Add("Cat_All_Count", cat_All_Count.ToString());
summary.Add("Cat_A_Count", cat_A_Count.ToString());
summary.Add("Cat_B_Count", cat_B_Count.ToString());
summary.Add("Cat_C_Count", cat_C_Count.ToString());
summary.Add("Cat_D_Count", cat_D_Count.ToString());
Grid2.SummaryData = summary;
}
protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
{
if (TabStrip1.ActiveTabIndex == 2)
{
ddlSystemNo.Hidden = false;
ddlDateType.Hidden = true;
drpChartType.Hidden = true;
BindGrid1();
}
else if (TabStrip1.ActiveTabIndex == 3)
{
ddlSystemNo.Hidden = false;
ddlDateType.Hidden = true;
drpChartType.Hidden = true;
BindGrid2();
}
else if (TabStrip1.ActiveTabIndex == 4)
{
ddlDateType.Hidden = true;
drpChartType.Hidden = true;
ddlSystemNo.Hidden = true;
BindGrid3();
}
else {
this.AnalyseData();
ddlSystemNo.Hidden = false;
ddlDateType.Hidden = false;
drpChartType.Hidden = false;
}
}
#endregion
#region 跟踪
/// <summary>
/// 数据绑定
/// </summary>
public void BindGrid3()
{
StringBuilder strSql = new StringBuilder("");
strSql.AppendLine("IF OBJECT_ID('tempdb..#AllPunchlistFromProgressTemp') IS NOT NULL drop table #AllPunchlistFromProgressTemp; ");
strSql.AppendLine("IF OBJECT_ID('tempdb..#PunchlistFromProgressTemp') IS NOT NULL drop table #PunchlistFromProgressTemp; ");
strSql.AppendLine(" select System_No,Actual_Date,Cleared_By,Confirmed_By,Verified_By,ProjectId ");
strSql.AppendLine(" INTO #AllPunchlistFromProgressTemp from Transfer_PunchlistFrom where ProjectId = @ProjectId ");
strSql.AppendLine(" select System_No,count(System_No) SystemNoCount,cast(0 as decimal(18,2)) ActualDateCount ");
strSql.AppendLine(" ,cast(0 as decimal(18,2)) ClearedByCount,cast(0 as decimal(18,2)) ConfirmedByCount,cast(0 as decimal(18,2)) VerifiedByCount ");
strSql.AppendLine(" INTO #PunchlistFromProgressTemp from #AllPunchlistFromProgressTemp where ProjectId = @ProjectId group by System_No ");
strSql.AppendLine(" update a set a.ActualDateCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Actual_Date,'')<>'') ");
strSql.AppendLine(" ,a.ClearedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Cleared_By,'')<>'') ");
strSql.AppendLine(" ,a.ConfirmedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Confirmed_By,'')<>'') ");
strSql.AppendLine(" ,a.VerifiedByCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.System_No=b.System_No AND isnull(b.Verified_By,'')<>'') ");
strSql.AppendLine(" from #PunchlistFromProgressTemp a ");
strSql.AppendLine(" select * from #PunchlistFromProgressTemp ");
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
strSql.AppendLine(" order by System_No ");
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql.ToString(), parameter);
Grid3.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid3.DataSource = table;
Grid3.DataBind();
}
/// <summary>
/// 分页下拉
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize3_SelectedIndexChanged(object sender, EventArgs e)
{
Grid3.PageSize = Convert.ToInt32(ddlPageSize3.SelectedValue);
BindGrid3();
}
/// <summary>
/// 分页索引事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid3_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid3();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid3_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
Grid3.SortDirection = e.SortDirection;
Grid3.SortField = e.SortField;
BindGrid3();
}
#endregion
}
}
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.designer.cs
Generated
+108
View File
@@ -157,5 +157,113 @@ namespace FineUIPro.Web.Transfer.Chart
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::Web.Controls.ChartControl ChartAccidentTime1;
/// <summary>
/// Tab3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab3;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Tab4 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab4;
/// <summary>
/// Grid2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// ToolbarText2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText2;
/// <summary>
/// ddlPageSize2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize2;
/// <summary>
/// Tab5 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab5;
/// <summary>
/// Grid3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid3;
/// <summary>
/// ToolbarText3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText3;
/// <summary>
/// ddlPageSize3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize3;
}
}
SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx
+104 -126
View File
@@ -30,7 +30,7 @@
</f:Form>
</Items>
</f:Panel>
<div id='two' style="width: 100%; height: 500px;"></div>
<div id='two' style="width: 95%; height: 600px;"></div>
<%-- <f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false"
BodyPadding="10px" ShowBorder="true" ShowHeader="false" Hidden="true">
@@ -60,130 +60,6 @@
<script type="text/javascript" src="../../res/index/js/swiper-3.4.2.jquery.min.js"></script>
<script type="text/javascript" src="../../res/index/js/echarts.min.js"></script>
<script type="text/javascript">
function category_Two(id, xArr, data, num) {
// 基于准备好的dom，初始化echarts实例
var myChart = echarts.init(document.getElementById(id))
// 指定图表的配置项和数据
var option = {
title: {
// left:'center',
text: '移交统计图表',
textStyle: {
color: '#000',
fontWeight: 'normal',
fontSize: 12
},
show: true
},
tooltip: {},
legend: {
left: '15%',
show: true,
textStyle: {//图例文字的样式
color: '#000',
fontSize: 10,
}
},
xAxis: {
axisTick: {
show: false
},
axisLine: {
lineStyle: {
color: '#000',
}
},
axisLabel: {
margin: 20,
show: true,
textStyle: {
color: '#000'
},
interval: 0,
formatter: function (value) {
var ret = "";//拼接加\n返回的类目项
var maxLength = num;//每项显示文字个数
var valLength = value.length;//X轴类目项的文字个数
var rowN = Math.ceil(valLength / maxLength); //类目项需要换行的行数
if (rowN > 1)//如果类目项的文字大于maxLength,
{
for (var i = 0; i < rowN; i++) {
var temp = "";//每次截取的字符串
var start = i * maxLength;//开始截取的位置
var end = start + maxLength;//结束截取的位置
//这里也可以加一个是否是最后一行的判断，但是不加也没有影响，那就不加吧
//temp = value.substring(start, end) + "\n";
temp = value.substring(start, end) + (i == rowN - 1 ? "" : "\n");
ret += temp; //凭借最终的字符串
}
return ret;
}
else {
return value;
}
}
},
type: 'category',
data: xArr,
boundaryGap: [0, 0.01],
},
yAxis: {
axisTick: {
show: false
},
axisLine: {
show: false,
lineStyle: {
color: '#000'
}
},
axisLabel: {
show: true,
textStyle: {
color: '#000'
}
},
},
series: data,
grid: {
top: '20%',
left: '0%',
right: '0%',
bottom: '0%',
containLabel: true,
backgroundColor: 'rgba(0,162,233, 0.01)',
// borderColor: 'rgba(0,162,233, 1)'
},
backgroundColor: 'rgba(0,162,233, 0.01)',
textStyle: {
color: 'rgba(255, 255, 255, 0.3)'
}
}
option.dataZoom = [//给x轴设置滚动条
{
start: 0,//默认为0
type: 'slider',
show: true,
startValue: 0,
endValue: 9,
height: 6,
bottom: '6%',
zoomLock: true,
moveOnMouseWheel: true,
brushSelect: true,
showDetail: false,
borderColor: "rgba(43,48,67,0.8)",
fillerColor: '#269cdb',//滑动块的颜色
backgroundColor: '#33384b',//两边未选中的滑动条区域的颜色
}]
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option)
}
var xArr = [<%=AllSystemNo%>]
//var xArr = two2.categories
var data = [
@@ -242,5 +118,107 @@
itemStyle: { normal: { color: '#EB3324' } }
}
]
category_Two('two', xArr, data, 20)
//category_Two('two', xArr, data, 20)
category_SystemChart('two', xArr, data, 20);
function category_SystemChart(id, xArr, data, num){
var myChart = echarts.init(document.getElementById(id))
var option = {
tooltip: {
trigger: 'axis',
axisPointer: {
// Use axis to trigger tooltip
type: 'shadow' // 'shadow' as default; can also be 'line' or 'shadow'
}
},
legend: {},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true
},
xAxis: {
type: 'value'
},
yAxis: {
type: 'category',
data: xArr
},
series: [
{
name: '完成数量',
type: 'bar',
stack: '总量',
label: {
show: true
},
emphasis: {
focus: 'series'
},
data: [<%=completed%>],
itemStyle: { normal: { color: '#84CF75' } }
},
{
name: '进行中数量',
type: 'bar',
stack: '总量',
label: {
show: true
},
emphasis: {
focus: 'series'
},
data: [<%=Inprogress%>],
itemStyle: { normal: { color: '#3282F6' } }
},
{
name: '未完成数量',
type: 'bar',
stack: '总量',
label: {
show: true
},
emphasis: {
focus: 'series'
},
data: [<%=NotStart%>],
itemStyle: { normal: { color: '#EB3324' } }
}
],
};
option.dataZoom = [{
type: "inside",
startValue: 0,
endValue: 10,
minValueSpan: 10,
maxValueSpan: 10,
yAxisIndex: [0],
zoomOnMouseWheel: false, // 关闭滚轮缩放
moveOnMouseWheel: true, // 开启滚轮平移
moveOnMouseMove: true // 鼠标移动能触发数据窗口平移
},
{
type: 'slider',
realtime: true,
startValue: 0,
endValue: 10000,
width: '8',
yAxisIndex: [0], // 控制y轴滚动
fillerColor: "rgba(154, 181, 215, 1)", // 滚动条颜色
borderColor: "rgba(17, 100, 210, 0.12)",
backgroundColor: '#cfcfcf',//两边未选中的滑动条区域的颜色
handleSize: 0, // 两边手柄尺寸
showDataShadow: false,//是否显示数据阴影 默认auto
showDetail: false, // 拖拽时是否展示滚动条两侧的文字
top: 'middle',
// 滚动条显示位置
height: "80%",
// 距离右边
right: 3,
}]
myChart.setOption(option);
}
</script>
SGGL/FineUIPro.Web/Transfer/CivilStructure.aspx
+13 -5
View File
@@ -22,7 +22,7 @@
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtCivil_Structure" Label="Structure/Civil/Architecture" 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>
@@ -57,15 +57,19 @@
<f:GroupField HeaderText="Civil Structure" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField minWidth="200px" TextAlign="Center" ColumnID="Civil_Structure" DataField="Civil_Structure" HeaderText="Structure/Civil/Architecture" />
<f:BoundField minWidth="140px" TextAlign="Center" ColumnID="Civil_Structure" DataField="Civil_Structure" HeaderText="Tag.No" />
</Columns>
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="210px">
</f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
</Columns>
</f:GroupField>
@@ -79,11 +83,15 @@
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Roof sub-project" TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Buildingdecoration" DataField="Buildingdecoration" FieldType="String" HeaderText="Building<br/> decoration" TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Equipment" TextAlign="Center"
<%-- <f:RenderField ColumnID="Equipment" DataField="Equipment" FieldType="String" HeaderText="Equipment" TextAlign="Center"
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
@@ -97,7 +105,7 @@
<f:RenderField ColumnID="FireFighting" DataField="FireFighting" FieldType="String" HeaderText="Fire<br/> Fighting" TextAlign="Center"
HeaderTextAlign="Center" minWidth="120px">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField ColumnID="HVAC" DataField="HVAC" FieldType="String" HeaderText="HVAC" TextAlign="Center"
HeaderTextAlign="Center" minWidth="100px">
SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
+15 -19
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 12);
AddDatasetToSQL(ds.Tables[0], 10);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -171,7 +171,7 @@ namespace FineUIPro.Web.Transfer
string row4 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row4))
{
result += (i + 3).ToString() + "," + "Structure/Civil/Architecture" + "," + "不能为空！" + "|";
result += (i + 3).ToString() + "," + "Tag.No" + "," + "不能为空！" + "|";
}
}
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 12);
AddDatasetToSQL2(ds.Tables[0], 10);
}
catch (Exception ex)
{
@@ -319,21 +319,20 @@ namespace FineUIPro.Web.Transfer
// if (modelOnly == null)
// {
Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
model.Descriptions= pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Civil_Structure = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
model.SystemName = pds.Rows[i][2].ToString().Trim();
model.Subsystem = pds.Rows[i][3].ToString().Trim();
model.Test_Package = pds.Rows[i][4].ToString().Trim();
var obj1 = model.Foundation = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Mainstructure = pds.Rows[i][5].ToString().Trim();
var obj3 = model.Buildingdecoration = pds.Rows[i][6].ToString().Trim();
var obj4 = model.Equipment = pds.Rows[i][7].ToString().Trim();
var obj5 = model.Instrument = pds.Rows[i][8].ToString().Trim();
var obj6 = model.Electrical = pds.Rows[i][9].ToString().Trim();
var obj7 = model.FireFighting = pds.Rows[i][10].ToString().Trim();
var obj8 = model.HVAC = pds.Rows[i][11].ToString().Trim();
var obj1 = model.Foundation = pds.Rows[i][5].ToString().Trim();
var obj2 = model.Mainstructure = pds.Rows[i][6].ToString().Trim();
var obj3 = model.Equipment = pds.Rows[i][7].ToString().Trim();
var obj4 = model.Buildingdecoration = pds.Rows[i][8].ToString().Trim();
var obj5 = model.HVAC = pds.Rows[i][9].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
@@ -341,11 +340,8 @@ namespace FineUIPro.Web.Transfer
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
listObj.Add(obj6);
listObj.Add(obj7);
listObj.Add(obj8);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 8)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
model.FINAL_Status = "Completed";
list.Add(model);
@@ -354,7 +350,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 8)
if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
{
model.FINAL_Status = "Not Start";
list.Add(model);
SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx
+20 -10
View File
@@ -16,7 +16,7 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtCivil_Structure" runat="server" Label="Structure/Civil/Architecture" LabelAlign="Right"
<f:TextBox ID="txtCivil_Structure" runat="server" Label="Tag.No" LabelAlign="Right"
LabelWidth="180px" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
@@ -32,7 +32,15 @@
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTest_Package" runat="server" Label="Test Package"
<f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescriptions" runat="server" Label="Description"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
@@ -56,6 +64,13 @@
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlEquipment" runat="server" Label="Roof sub-project" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlBuildingdecoration" runat="server" Label="Building decoration" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
@@ -63,14 +78,9 @@
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlEquipment" runat="server" Label="Equipment" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlInstrument" runat="server" Label="Instrument" LabelWidth="180px">
<%--<f:DropDownList ID="ddlInstrument" runat="server" Label="Instrument" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -89,7 +99,7 @@
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
</f:DropDownList>--%>
<f:DropDownList ID="ddlHVAC" runat="server" Label="HVAC" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
+17 -14
View File
@@ -59,10 +59,11 @@ namespace FineUIPro.Web.Transfer
ddlBuildingdecoration.SelectedValue = model.Buildingdecoration;
ddlEquipment.SelectedValue = model.Equipment;
ddlInstrument.SelectedValue = model.Instrument;
ddlElectrical.SelectedValue = model.Electrical;
ddlFireFighting.SelectedValue = model.FireFighting;
//ddlInstrument.SelectedValue = model.Instrument;
//ddlElectrical.SelectedValue = model.Electrical;
//ddlFireFighting.SelectedValue = model.FireFighting;
ddlHVAC.SelectedValue = model.HVAC;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -82,10 +83,11 @@ namespace FineUIPro.Web.Transfer
Buildingdecoration = ddlBuildingdecoration.SelectedValue,
Equipment = ddlEquipment.SelectedValue,
Instrument = ddlInstrument.SelectedValue,
Electrical = ddlElectrical.SelectedValue,
FireFighting = ddlFireFighting.SelectedValue,
//Instrument = ddlInstrument.SelectedValue,
//Electrical = ddlElectrical.SelectedValue,
//FireFighting = ddlFireFighting.SelectedValue,
HVAC = ddlHVAC.SelectedValue,
Descriptions= txtDescriptions.Text
};
@@ -96,16 +98,16 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.Buildingdecoration);
listObj.Add(model.Equipment);
listObj.Add(model.Instrument);
listObj.Add(model.Electrical);
listObj.Add(model.FireFighting);
//listObj.Add(model.Instrument);
//listObj.Add(model.Electrical);
//listObj.Add(model.FireFighting);
listObj.Add(model.HVAC);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 8)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
model.FINAL_Status = "Completed";
} //如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 8)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
{
model.FINAL_Status = "Not Start";
}
@@ -131,11 +133,12 @@ namespace FineUIPro.Web.Transfer
newModel.Buildingdecoration = ddlBuildingdecoration.SelectedValue;
newModel.Equipment = ddlEquipment.SelectedValue;
newModel.Instrument = ddlInstrument.SelectedValue;
newModel.Electrical = ddlElectrical.SelectedValue;
newModel.FireFighting = ddlFireFighting.SelectedValue;
//newModel.Instrument = ddlInstrument.SelectedValue;
//newModel.Electrical = ddlElectrical.SelectedValue;
//newModel.FireFighting = ddlFireFighting.SelectedValue;
newModel.HVAC = ddlHVAC.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
}
else
SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.designer.cs
Generated
+11 -29
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtTest_Package;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlFoundation 控件。
/// </summary>
@@ -95,15 +104,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.DropDownList ddlMainstructure;
/// <summary>
/// ddlBuildingdecoration 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlBuildingdecoration;
/// <summary>
/// ddlEquipment 控件。
/// </summary>
@@ -114,31 +114,13 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.DropDownList ddlEquipment;
/// <summary>
/// ddlInstrument 控件。
/// ddlBuildingdecoration 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlInstrument;
/// <summary>
/// ddlElectrical 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlElectrical;
/// <summary>
/// ddlFireFighting 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlFireFighting;
protected global::FineUIPro.DropDownList ddlBuildingdecoration;
/// <summary>
/// ddlHVAC 控件。
SGGL/FineUIPro.Web/Transfer/Electrical.aspx
+6 -2
View File
@@ -58,15 +58,19 @@
<f:GroupField HeaderText="ELECTRICAL" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField minWidth="140px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
<f:BoundField minWidth="160px" TextAlign="Center" ColumnID="ELECTRICAL" DataField="ELECTRICAL" HeaderText="Tag. No" />
</Columns>
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="230px">
</f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/ElectricalDataIn.aspx.cs
+9 -8
View File
@@ -129,7 +129,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 8);
AddDatasetToSQL(ds.Tables[0], 9);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -318,17 +318,18 @@ namespace FineUIPro.Web.Transfer
// if (modelOnly == null)
// {
Model.Transfer_Electrical model = new Model.Transfer_Electrical();
model.Descriptions= pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.ELECTRICAL = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
model.SystemName = pds.Rows[i][1+1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.Installation = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Communicationtest = pds.Rows[i][5].ToString().Trim();
var obj3 = model.CableLaying = pds.Rows[i][6].ToString().Trim();
var obj4 = model.LoopTest = pds.Rows[i][7].ToString().Trim();
var obj1 = model.Installation = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.Communicationtest = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.CableLaying = pds.Rows[i][6 + 1].ToString().Trim();
var obj4 = model.LoopTest = pds.Rows[i][7 + 1].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx
+9 -1
View File
@@ -32,7 +32,15 @@
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTest_Package" runat="server" Label="Turn over Package"
<f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescriptions" runat="server" Label="Description"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
+3
View File
@@ -59,6 +59,7 @@ namespace FineUIPro.Web.Transfer
ddlCommunicationtest.SelectedValue = model.Communicationtest;
ddlCableLaying.SelectedValue = model.CableLaying;
ddlLoopTest.SelectedValue = model.LoopTest;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -77,6 +78,7 @@ namespace FineUIPro.Web.Transfer
Communicationtest = ddlCommunicationtest.SelectedValue,
CableLaying = ddlCableLaying.SelectedValue,
LoopTest = ddlLoopTest.SelectedValue,
Descriptions= txtDescriptions.Text
};
@@ -118,6 +120,7 @@ namespace FineUIPro.Web.Transfer
newModel.CableLaying = ddlCommunicationtest.SelectedValue;
newModel.LoopTest = ddlLoopTest.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
}
else
SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtTest_Package;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlInstallation 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/Firefighting.aspx
+7 -3
View File
@@ -22,7 +22,7 @@
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtFirefighting" Label="Firefighting" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtFirefighting" Label="Tag.No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
@@ -58,15 +58,19 @@
<f:GroupField HeaderText="FF" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField minWidth="140px" TextAlign="Center" ColumnID="Firefighting" DataField="Firefighting" HeaderText="Firefighting" />
<f:BoundField minWidth="140px" TextAlign="Center" ColumnID="Firefighting" DataField="Firefighting" HeaderText="Tag.No" />
</Columns>
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="210px">
</f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField minWidth="150px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
<f:BoundField minWidth="150px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField minWidth="150px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField minWidth="160px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/FirefightingDataIn.aspx.cs
+11 -10
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 7);
AddDatasetToSQL(ds.Tables[0], 8);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -171,7 +171,7 @@ namespace FineUIPro.Web.Transfer
string row4 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row4))
{
result += (i + 2).ToString() + "," + "Firefighting" + "," + "不能为空！" + "|";
result += (i + 2).ToString() + "," + "Tag.No" + "," + "不能为空！" + "|";
}
}
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 7);
AddDatasetToSQL2(ds.Tables[0], 8);
}
catch (Exception ex)
{
@@ -318,16 +318,17 @@ namespace FineUIPro.Web.Transfer
//if (modelOnly == null)
//{
Model.Transfer_Firefighting model = new Model.Transfer_Firefighting();
model.Id = Guid.NewGuid().ToString();
model.Descriptions = pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Firefighting = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
model.SystemName = pds.Rows[i][1+1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.Installation = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Debugging = pds.Rows[i][5].ToString().Trim();
var obj3 = model.Acceptancecheck = pds.Rows[i][6].ToString().Trim();
var obj1 = model.Installation = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.Debugging = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.Acceptancecheck = pds.Rows[i][6 + 1].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx
+10 -2
View File
@@ -16,7 +16,7 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtFirefighting" runat="server" Label="Firefighting" LabelAlign="Right"
<f:TextBox ID="txtFirefighting" runat="server" Label="Tag.No" LabelAlign="Right"
LabelWidth="180px" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
@@ -32,7 +32,15 @@
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTest_Package" runat="server" Label="Test Package"
<f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescriptions" runat="server" Label="Description"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs
+3
View File
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.Transfer
ddlInstallation.SelectedValue = model.Installation;
ddlDebugging.SelectedValue = model.Debugging;
ddlAcceptancecheck.SelectedValue = model.Acceptancecheck;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -74,6 +75,7 @@ namespace FineUIPro.Web.Transfer
Installation = ddlInstallation.SelectedValue,
Debugging = ddlDebugging.SelectedValue,
Acceptancecheck = ddlAcceptancecheck.SelectedValue,
Descriptions = txtDescriptions.Text
};
@@ -112,6 +114,7 @@ namespace FineUIPro.Web.Transfer
newModel.Debugging = ddlDebugging.SelectedValue;
newModel.Acceptancecheck = ddlAcceptancecheck.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
}
else
SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtTest_Package;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlInstallation 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/Instrumentation.aspx
+5 -1
View File
@@ -61,12 +61,16 @@
<f:BoundField minWidth="160px" TextAlign="Center" ColumnID="INSTRUMENTATION" DataField="INSTRUMENTATION" HeaderText="Tag No" />
</Columns>
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="240px">
</f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Sub-System" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turn over Package" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+11 -10
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 9);
AddDatasetToSQL(ds.Tables[0], 10);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 9);
AddDatasetToSQL2(ds.Tables[0], 10);
}
catch (Exception ex)
{
@@ -319,18 +319,19 @@ namespace FineUIPro.Web.Transfer
//if (modelOnly == null)
//{
Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
model.Descriptions= pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
model.SystemName = pds.Rows[i][1+1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.InstallationCalibration = pds.Rows[i][4].ToString().Trim();
var obj2 = model.PipingPressuretest = pds.Rows[i][5].ToString().Trim();
var obj3 = model.PipingLeak = pds.Rows[i][6].ToString().Trim();
var obj4 = model.PipingBlowing = pds.Rows[i][7].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][8].ToString().Trim();
var obj1 = model.InstallationCalibration = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.PipingPressuretest = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.PipingLeak = pds.Rows[i][6 + 1].ToString().Trim();
var obj4 = model.PipingBlowing = pds.Rows[i][7 + 1].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][8 + 1].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
+9 -1
View File
@@ -32,7 +32,15 @@
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTest_Package" runat="server" Label="Turn over Package"
<f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescriptions" runat="server" Label="Description"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
+4 -1
View File
@@ -60,6 +60,7 @@ namespace FineUIPro.Web.Transfer
ddlPipingLeak.SelectedValue = model.PipingLeak;
ddlPipingBlowing.SelectedValue = model.PipingBlowing;
ddlLooptest.SelectedValue = model.Looptest;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -78,7 +79,8 @@ namespace FineUIPro.Web.Transfer
PipingPressuretest = ddlPipingPressuretest.SelectedValue,
PipingLeak = ddlPipingLeak.SelectedValue,
PipingBlowing = ddlPipingBlowing.SelectedValue,
Looptest= ddlLooptest.SelectedValue
Looptest = ddlLooptest.SelectedValue,
Descriptions = txtDescriptions.Text
};
@@ -122,6 +124,7 @@ namespace FineUIPro.Web.Transfer
newModel.PipingBlowing = ddlPipingBlowing.SelectedValue;
newModel.Looptest = ddlLooptest.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
}
else
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtTest_Package;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlInstallationCalibration 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/Piping.aspx
+7 -2
View File
@@ -49,10 +49,15 @@
<f:GroupField ID="g1" HeaderText="PIPING" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PIPINGLINENUMBER" DataField="PIPINGLINENUMBER" FieldType="String" HeaderText="Test Package No" TextAlign="Center"
HeaderTextAlign="Center" Width="170px">
HeaderTextAlign="Center" minWidth="220px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="330px">
</f:RenderField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"
@@ -61,7 +66,7 @@
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
HeaderTextAlign="Center" Width="200px">
</f:RenderField>
</Columns>
SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
+14 -13
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 13);
AddDatasetToSQL(ds.Tables[0], 14);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -276,7 +276,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 13);
AddDatasetToSQL2(ds.Tables[0], 14);
}
catch (Exception ex)
{
@@ -316,19 +316,20 @@ namespace FineUIPro.Web.Transfer
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
model.SYSTEM = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.TestPackage = pds.Rows[i][3].ToString().Trim();
model.Descriptions = pds.Rows[i][1].ToString().Trim();
model.SYSTEM = pds.Rows[i][1+1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.TestPackage = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.PWD= pds.Rows[i][4].ToString().Trim();
var obj2 =model.Apunchclosed = pds.Rows[i][5].ToString().Trim();
var obj3 =model.NDTReport = pds.Rows[i][6].ToString().Trim();
var obj4 =model.TemperaryMeasurement = pds.Rows[i][7].ToString().Trim();
var obj5 =model.FWDfinished = pds.Rows[i][8].ToString().Trim();
var obj6 =model.HydrostaticTest = pds.Rows[i][9].ToString().Trim();
var obj1 = model.PWD= pds.Rows[i][4 + 1].ToString().Trim();
var obj2 =model.Apunchclosed = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 =model.NDTReport = pds.Rows[i][6 + 1].ToString().Trim();
var obj4 =model.TemperaryMeasurement = pds.Rows[i][7 + 1].ToString().Trim();
var obj5 =model.FWDfinished = pds.Rows[i][8 + 1].ToString().Trim();
var obj6 =model.HydrostaticTest = pds.Rows[i][9 + 1].ToString().Trim();
var obj7 =model.Report = pds.Rows[i][10].ToString().Trim();
var obj8 =model.Blowingflushing = pds.Rows[i][11].ToString().Trim();
var obj9 = model.Systemreinstalled = pds.Rows[i][12].ToString().Trim();
var obj8 =model.Blowingflushing = pds.Rows[i][11 + 1].ToString().Trim();
var obj9 = model.Systemreinstalled = pds.Rows[i][12 + 1].ToString().Trim();
model.BlowingReport= pds.Rows[i][13].ToString().Trim();
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
+16 -7
View File
@@ -31,11 +31,20 @@
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTestPackage" runat="server" Label="Turn over Package"
<f:TextBox ID="txtTestPackage" runat="server" Label="Turnover System Code"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescriptions" runat="server" Label="Description"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:GroupPanel Layout="Anchor" Title="Ready for Test" runat="server">
@@ -83,7 +92,7 @@
<Items>
<f:GroupPanel Layout="Anchor" Title="Hydrostatic test schedule" runat="server">
<Items>
<f:DropDownList ID="ddlHydrostaticTest" runat="server" Label="Hydrostatic Test" LabelWidth="180px">
<f:DropDownList ID="ddlHydrostaticTest" runat="server" Label="Hydrostatic Test" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -105,7 +114,7 @@
<Items>
<f:GroupPanel Layout="Anchor" Title="Pre-Commissioning" runat="server">
<Items>
<f:DropDownList ID="ddlBlowingflushing" runat="server" Label="Blowing /flushing &Dry out" LabelWidth="180px">
<f:DropDownList ID="ddlBlowingflushing" runat="server" Label="Blowing /flushing &Dry out" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@@ -119,15 +128,15 @@
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
</f:DropDownList>
<f:TextBox ID="txtBlowingReport" runat="server" Label="Blowing & flushing Report"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtBlowingReport" runat="server" Label="Blowing & flushing Report"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:GroupPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
+5 -1
View File
@@ -63,6 +63,8 @@ namespace FineUIPro.Web.Transfer
ddlFWDfinished.SelectedValue = model.FWDfinished;
ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
txtBlowingReport.Text = model.BlowingReport;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -84,7 +86,8 @@ namespace FineUIPro.Web.Transfer
Blowingflushing= ddlBlowingflushing.SelectedValue,
FWDfinished= ddlFWDfinished.SelectedValue,
Systemreinstalled= ddlSystemreinstalled.SelectedValue,
BlowingReport= txtBlowingReport.Text
BlowingReport= txtBlowingReport.Text,
Descriptions= txtDescriptions.Text
};
#region 判断状态
var listObj = new List<string>();
@@ -136,6 +139,7 @@ namespace FineUIPro.Web.Transfer
newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
newModel.BlowingReport = txtBlowingReport.Text;
newModel.FINALStatus = model.FINALStatus;
newModel.Descriptions = txtDescriptions.Text;
}
else {
model.Id=Id = Guid.NewGuid().ToString();
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtTestPackage;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlPWD 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/Plumbing.aspx
+7 -3
View File
@@ -22,7 +22,7 @@
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtPlumbing" Label="Plumbing" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtPlumbing" Label="Tag.No" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM" LabelWidth="100px" LabelAlign="Right"></f:TextBox>
@@ -50,15 +50,19 @@
<f:GroupField HeaderText="Plumbing" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField minWidth="120px" TextAlign="Center" ColumnID="Plumbing" DataField="Plumbing" HeaderText="Plumbing" />
<f:BoundField minWidth="140px" TextAlign="Center" ColumnID="Plumbing" DataField="Plumbing" HeaderText="Tag.No" />
</Columns>
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="210px">
</f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/PlumbingDataIn.aspx.cs
+10 -9
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 7);
AddDatasetToSQL(ds.Tables[0], 8);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -171,7 +171,7 @@ namespace FineUIPro.Web.Transfer
string row4 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row4))
{
result += (i + 2).ToString() + "," + "Plumbing" + "," + "不能为空！" + "|";
result += (i + 2).ToString() + "," + "Tag.No" + "," + "不能为空！" + "|";
}
}
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 7);
AddDatasetToSQL2(ds.Tables[0], 8);
}
catch (Exception ex)
{
@@ -319,15 +319,16 @@ namespace FineUIPro.Web.Transfer
// if (modelOnly == null)
// {
Model.Transfer_Plumbing model = new Model.Transfer_Plumbing();
model.Descriptions= pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Plumbing = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
var obj1 = model.Ndt = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Flushing = pds.Rows[i][5].ToString().Trim();
var obj3 = model.RunningTest = pds.Rows[i][6].ToString().Trim();
model.SystemName = pds.Rows[i][1+1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.Ndt = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.Flushing = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.RunningTest = pds.Rows[i][6 + 1].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx
+10 -2
View File
@@ -16,7 +16,7 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtPlumbing" runat="server" Label="Plumbing" LabelAlign="Right"
<f:TextBox ID="txtPlumbing" runat="server" Label="Tag.No" LabelAlign="Right"
LabelWidth="180px" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
@@ -32,7 +32,15 @@
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTest_Package" runat="server" Label="Test Package"
<f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescriptions" runat="server" Label="Description"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs
+3
View File
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.Transfer
ddlNdt.SelectedValue = model.Ndt;
ddlFlushing.SelectedValue = model.Flushing;
ddlRunningTest.SelectedValue = model.RunningTest;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -74,6 +75,7 @@ namespace FineUIPro.Web.Transfer
Ndt = ddlNdt.SelectedValue,
Flushing = ddlFlushing.SelectedValue,
RunningTest = ddlRunningTest.SelectedValue,
Descriptions= txtDescriptions.Text
};
@@ -112,6 +114,7 @@ namespace FineUIPro.Web.Transfer
newModel.Flushing = ddlFlushing.SelectedValue;
newModel.RunningTest = ddlRunningTest.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
}
else
SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtTest_Package;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlNdt 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/RotatingEquipment.aspx
+5 -1
View File
@@ -63,6 +63,10 @@
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="210px">
</f:RenderField>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
@@ -71,7 +75,7 @@
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
HeaderTextAlign="Center" minWidth="160px">
</f:RenderField>
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentDataIn.aspx.cs
+10 -8
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 7);
AddDatasetToSQL(ds.Tables[0], 8);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -276,7 +276,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 7);
AddDatasetToSQL2(ds.Tables[0], 8);
}
catch (Exception ex)
{
@@ -313,16 +313,18 @@ namespace FineUIPro.Web.Transfer
//if (modelOnly == null)
//{
Model.Transfer_RotatingEquipment model = new Model.Transfer_RotatingEquipment();
model.Descriptions = pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.RotatingEquipment = pds.Rows[i][0].ToString().Trim();
model.SYSTEM = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.TestPackage = pds.Rows[i][3].ToString().Trim();
model.SYSTEM = pds.Rows[i][1+1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.TestPackage = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.Alignment = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Motorsoloruntest = pds.Rows[i][5].ToString().Trim();
var obj3 = model.Standalonetest = pds.Rows[i][6].ToString().Trim();
var obj1 = model.Alignment = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.Motorsoloruntest = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.Standalonetest = pds.Rows[i][6 + 1].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx
+9 -1
View File
@@ -32,7 +32,15 @@
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTestPackage" runat="server" Label="Turn over Package"
<f:TextBox ID="txtTestPackage" runat="server" Label="Turnover System Code"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescriptions" runat="server" Label="Description"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
+4 -1
View File
@@ -57,6 +57,7 @@ namespace FineUIPro.Web.Transfer
ddlAlignment.SelectedValue = model.Alignment;
ddlMotorsoloruntest.SelectedValue = model.Motorsoloruntest;
ddlStandalonetest.SelectedValue = model.Standalonetest;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -73,7 +74,8 @@ namespace FineUIPro.Web.Transfer
TestPackage = txtTestPackage.Text,
Alignment = ddlAlignment.SelectedValue,
Motorsoloruntest = ddlMotorsoloruntest.SelectedValue,
Standalonetest = ddlStandalonetest.SelectedValue
Standalonetest = ddlStandalonetest.SelectedValue,
Descriptions= txtDescriptions.Text
};
#region 判断状态
@@ -112,6 +114,7 @@ namespace FineUIPro.Web.Transfer
newModel.Motorsoloruntest = ddlMotorsoloruntest.SelectedValue;
newModel.Standalonetest = ddlStandalonetest.SelectedValue;
newModel.MechanicalFINALStatus = model.MechanicalFINALStatus;
newModel.Descriptions = txtDescriptions.Text;
}
}
else
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtTestPackage;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlAlignment 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/StaticEquipment.aspx
+7 -2
View File
@@ -62,10 +62,15 @@
<f:GroupField ID="g1" HeaderText="MECHANICAL" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="StaticEquipment" DataField="StaticEquipment" FieldType="String" HeaderText="Tag No" TextAlign="Center"
HeaderTextAlign="Center" Width="140px">
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="210px">
</f:RenderField>
<f:GroupField ID="g2" HeaderText="SYSTEM AND TEST PACKAGE SELECTION" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="SYSTEM" DataField="SYSTEM" FieldType="String" HeaderText="System No" TextAlign="Center"
@@ -74,7 +79,7 @@
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Subsystem" TextAlign="Center"
HeaderTextAlign="Center" Width="140px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turn over Package" TextAlign="Center"
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
</f:RenderField>
</Columns>
SGGL/FineUIPro.Web/Transfer/StaticEquipmentDataIn.aspx.cs
+9 -8
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 7);
AddDatasetToSQL(ds.Tables[0], 8);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -276,7 +276,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 7);
AddDatasetToSQL2(ds.Tables[0], 8);
}
catch (Exception ex)
{
@@ -313,16 +313,17 @@ namespace FineUIPro.Web.Transfer
//if (modelOnly == null)
//{
Model.Transfer_StaticEquipment model = new Model.Transfer_StaticEquipment();
model.Descriptions= pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.StaticEquipment = pds.Rows[i][0].ToString().Trim();
model.SYSTEM = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.TestPackage = pds.Rows[i][3].ToString().Trim();
model.SYSTEM = pds.Rows[i][1+1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.TestPackage = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.Internalinspection = pds.Rows[i][4].ToString().Trim();
var obj2 = model.InternalsPacking = pds.Rows[i][5].ToString().Trim();
var obj3 = model.BOXupRecord = pds.Rows[i][6].ToString().Trim();
var obj1 = model.Internalinspection = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.InternalsPacking = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.BOXupRecord = pds.Rows[i][6 + 1].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx
+9 -1
View File
@@ -32,7 +32,15 @@
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTestPackage" runat="server" Label="Turn over Package"
<f:TextBox ID="txtTestPackage" runat="server" Label="Turnover System Code"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescriptions" runat="server" Label="Description"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
+4 -1
View File
@@ -58,6 +58,7 @@ namespace FineUIPro.Web.Transfer
ddlInternalinspection.SelectedValue = model.Internalinspection;
ddlInternalsPacking.SelectedValue = model.InternalsPacking;
ddlBOXupRecord.SelectedValue = model.BOXupRecord;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -74,7 +75,8 @@ namespace FineUIPro.Web.Transfer
TestPackage = txtTestPackage.Text,
Internalinspection = ddlInternalinspection.SelectedValue,
InternalsPacking = ddlInternalsPacking.SelectedValue,
BOXupRecord = ddlBOXupRecord.SelectedValue
BOXupRecord = ddlBOXupRecord.SelectedValue,
Descriptions= txtDescriptions.Text
};
#region 判断状态
@@ -113,6 +115,7 @@ namespace FineUIPro.Web.Transfer
newModel.InternalsPacking = ddlInternalsPacking.SelectedValue;
newModel.BOXupRecord = ddlBOXupRecord.SelectedValue;
newModel.MechanicalFINALStatus = model.MechanicalFINALStatus;
newModel.Descriptions = txtDescriptions.Text;
}
}
else
SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtTestPackage;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlInternalinspection 控件。
/// </summary>
SGGL/FineUIPro.Web/Transfer/Telecom.aspx
+7 -3
View File
@@ -22,7 +22,7 @@
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtTelecom" Label="Telecom" 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>
@@ -57,15 +57,19 @@
<f:GroupField HeaderText="Telecom" TextAlign="Center" MinWidth="200px">
<Columns>
<f:BoundField minWidth="120px" TextAlign="Center" ColumnID="Telecom" DataField="Telecom" HeaderText="Telecom" />
<f:BoundField minWidth="140px" TextAlign="Center" ColumnID="Telecom" DataField="Telecom" HeaderText="Tag.No" />
</Columns>
</f:GroupField>
<f:RenderField ColumnID="Descriptions" DataField="Descriptions" FieldType="String" HeaderText="Description" TextAlign="Center"
HeaderTextAlign="Center" minWidth="210px">
</f:RenderField>
<f:GroupField HeaderText="SYSTEM AND TEST PACKAGE SELECTION" TextAlign="Center" MinWidth="450">
<Columns>
<f:BoundField minWidth="120px" ColumnID="SystemName" DataField="SystemName" HeaderText="System No" TextAlign="Center"/>
<f:BoundField minWidth="120px" ColumnID="Subsystem" DataField="Subsystem" HeaderText="Subsystem" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Test Package" TextAlign="Center"/>
<f:BoundField minWidth="140px" ColumnID="Test_Package" DataField="Test_Package" HeaderText="Turnover<br/>System Code" TextAlign="Center"/>
</Columns>
</f:GroupField>
SGGL/FineUIPro.Web/Transfer/TelecomDataIn.aspx.cs
+11 -10
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 8);
AddDatasetToSQL(ds.Tables[0], 9);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -171,7 +171,7 @@ namespace FineUIPro.Web.Transfer
string row4 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row4))
{
result += (i + 2).ToString() + "," + "Telecom" + "," + "不能为空！" + "|";
result += (i + 2).ToString() + "," + "Tag.No" + "," + "不能为空！" + "|";
}
}
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 8);
AddDatasetToSQL2(ds.Tables[0], 9);
}
catch (Exception ex)
{
@@ -319,16 +319,17 @@ namespace FineUIPro.Web.Transfer
// if (modelOnly == null)
// {
Model.Transfer_Telecom model = new Model.Transfer_Telecom();
model.Descriptions = pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Telecom = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
var obj1 = model.Installation = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Communication = pds.Rows[i][5].ToString().Trim();
var obj3 = model.CableLaying = pds.Rows[i][6].ToString().Trim();
var obj4 = model.FunctionTest = pds.Rows[i][7].ToString().Trim();
model.SystemName = pds.Rows[i][1+1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.Installation = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.Communication = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.CableLaying = pds.Rows[i][6 + 1].ToString().Trim();
var obj4 = model.FunctionTest = pds.Rows[i][7 + 1].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx
+10 -2
View File
@@ -16,7 +16,7 @@
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtTelecom" runat="server" Label="Telecom" LabelAlign="Right"
<f:TextBox ID="txtTelecom" runat="server" Label="Tag.No" LabelAlign="Right"
LabelWidth="180px" Required="true" ShowRedStar="true">
</f:TextBox>
</Items>
@@ -32,7 +32,15 @@
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtTest_Package" runat="server" Label="Test Package"
<f:TextBox ID="txtTest_Package" runat="server" Label="Turnover System Code"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtDescriptions" runat="server" Label="Description"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
+3
View File
@@ -58,6 +58,7 @@ namespace FineUIPro.Web.Transfer
ddlCommunication.SelectedValue = model.Communication;
ddlCableLaying.SelectedValue = model.CableLaying;
ddlFunctionTest.SelectedValue = model.FunctionTest;
txtDescriptions.Text = model.Descriptions;
}
}
}
@@ -76,6 +77,7 @@ namespace FineUIPro.Web.Transfer
Communication = ddlCommunication.SelectedValue,
CableLaying = ddlCableLaying.SelectedValue,
FunctionTest = ddlFunctionTest.SelectedValue,
Descriptions= txtDescriptions.Text,
};
@@ -116,6 +118,7 @@ namespace FineUIPro.Web.Transfer
newModel.CableLaying = ddlCableLaying.SelectedValue;
newModel.FunctionTest = ddlFunctionTest.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}
}
else
SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.designer.cs
Generated
+9
View File
@@ -77,6 +77,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.TextBox txtTest_Package;
/// <summary>
/// txtDescriptions 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlInstallation 控件。
/// </summary>
SGGL/FineUIPro.Web/Web.config
+1 -1
View File
@@ -77,7 +77,7 @@
<add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
<add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
</httpHandlers>
<compilation debug="false" targetFramework="4.6.1"/>
<compilation debug="true" targetFramework="4.6.1"/>
<httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
<authentication mode="Forms">
<forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
SGGL/FineUIPro.Web/common/Menu_Transfer.xml
+5 -7
View File
@@ -3,6 +3,11 @@
<TreeNode id="197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB" Text="工艺系统清单&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Process System List" NavigateUrl="Transfer/LHCSystemList.aspx?Type=0">
</TreeNode>
<TreeNode id="022428DC-FC99-4916-B8AF-6A9DC885DFAF" Text="非工艺系统清单&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Non-Process System List" NavigateUrl="Transfer/LHCSystemList.aspx?Type=1"></TreeNode>
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="尾项完成统计表&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Punchlist Completion Table" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="移交统计表&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Turnover Table" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="移交统计图表&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Turnover Chart" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="移交状态汇总表&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Turnover Summary Table" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
</TreeNode>
<TreeNode id="D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B" Text="管道&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Piping" NavigateUrl="Transfer/Piping.aspx"></TreeNode>
<TreeNode id="982F746C-084C-445C-9AE8-8C37BDFE7994" Text="静设备&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Static Equipment" NavigateUrl="Transfer/StaticEquipment.aspx"></TreeNode>
<TreeNode id="7E2FB5F9-FB99-4455-B68F-460F1F9A2676" Text="动设备&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Rotating Equipment" NavigateUrl="Transfer/RotatingEquipment.aspx"></TreeNode>
@@ -13,11 +18,4 @@
<TreeNode id="58FFBD80-ACB9-4830-A18A-E025D9600D94" Text="电信&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Telecom" NavigateUrl="Transfer/Telecom.aspx"></TreeNode>
<TreeNode id="95295BF7-FB51-480D-9902-6ADA4E8427FC" Text="地管&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Plumbing" NavigateUrl="Transfer/Plumbing.aspx"></TreeNode>
<TreeNode id="016903B1-3B86-4CF5-AFF8-FF8BE389BEE5" Text="尾项管理&lt;br&gt;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;Punch List Form" NavigateUrl="Transfer/PunchlistFrom.aspx"></TreeNode>
<TreeNode id="3517DBE2-9728-4BA0-9EA5-AE2147DB883B" Text="移交图表" NavigateUrl=""><TreeNode id="2352E44F-BE12-4012-B43F-AAF649EDAC32" Text="Punchlist from完成统计表" NavigateUrl="Transfer/Chart/PunchlistFromChartNew.aspx"></TreeNode>
<TreeNode id="CB76462E-9444-4946-B787-ECB33C21E6D0" Text="Punchlist from分类表" NavigateUrl="Transfer/Chart/PunchlistFromSort.aspx"></TreeNode>
<TreeNode id="549DD0B6-05CB-4C75-B8F5-9AADDEDF399F" Text="Punchlist from进度跟踪表" NavigateUrl="Transfer/Chart/PunchlistFromProgress.aspx"></TreeNode>
<TreeNode id="E305689E-5D84-4C1A-BF67-85FA2D828115" Text="移交统计表" NavigateUrl="Transfer/Chart/Systemstatus.aspx"></TreeNode>
<TreeNode id="60838E30-4A46-4878-B299-C234900B10B7" Text="移交统计图表" NavigateUrl="Transfer/Chart/SystemstatusChart.aspx"></TreeNode>
<TreeNode id="25C13642-AE77-42E2-B0FB-32663B68F93F" Text="移交状态汇总表" NavigateUrl="Transfer/Chart/SystemStatusSummary.aspx"></TreeNode>
</TreeNode>
</Tree>