1、索引项目中,删除英文,保留中文;

2、尾项管理中,筛选条件调整;
3、尾项管理中,支持点击图片预览;
4、增加尾项统计表中的完成比例;
5、更新管道表的表格(增加焊接信息、试压包状态、电伴热和保温/冷信息);
6、更新移交统计表(补充管道试压包其他信息统计);
7、删除索引项目中的地管和消防2个项目;
This commit is contained in:
liuhui11
2024-10-31 19:11:00 +08:00
parent 27df9766f7
commit ea734b0874
23 changed files with 1623 additions and 329 deletions
@@ -94,8 +94,6 @@
</Columns>
</f:GroupField>
<f:GroupField HeaderText="A" TextAlign="Center" >
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
@@ -233,6 +231,7 @@
<Columns>
<f:RenderField Width="50px" ColumnID="allCount" DataField="allCount" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="allfinshedCount" DataField="allfinshedCount" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="allCountPercent" DataField="allCountPercent" HeaderText="完成率(%)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="allWUH" DataField="allWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="allBASF" DataField="allBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
@@ -244,6 +243,7 @@
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_A_Count" DataField="Cat_A_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_A_Countf" DataField="Cat_A_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_A_CountPercent" DataField="Cat_A_CountPercent" HeaderText="完成率(%)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_A_CountWUH" DataField="Cat_A_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_A_CountBASF" DataField="Cat_A_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
@@ -253,6 +253,7 @@
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_B_Count" DataField="Cat_B_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_B_Countf" DataField="Cat_B_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_B_CountPercent" DataField="Cat_B_CountPercent" HeaderText="完成率(%)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_B_CountWUH" DataField="Cat_B_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_B_CountBASF" DataField="Cat_B_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
@@ -262,6 +263,7 @@
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_C_Count" DataField="Cat_C_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_C_Countf" DataField="Cat_C_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_C_CountPercent" DataField="Cat_C_CountPercent" HeaderText="完成率(%)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_C_CountWUH" DataField="Cat_C_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_C_CountBASF" DataField="Cat_C_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
@@ -271,6 +273,7 @@
<Columns>
<f:RenderField Width="50px" ColumnID="Cat_D_Count" DataField="Cat_D_Count" HeaderText="总数" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="70px" ColumnID="Cat_D_Countf" DataField="Cat_D_Countf" HeaderText="已完成" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_D_CountPercent" DataField="Cat_D_CountPercent" HeaderText="完成率(%)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="90px" ColumnID="Cat_D_CountWUH" DataField="Cat_D_CountWUH" HeaderText="Confirmed<br/>(WUH)" TextAlign="Center" FieldType="Double" />
<f:RenderField Width="80px" ColumnID="Cat_D_CountBASF" DataField="Cat_D_CountBASF" HeaderText="Verified<br/>(BASF)" TextAlign="Center" FieldType="Double" />
</Columns>
@@ -79,7 +79,7 @@ namespace FineUIPro.Web.Transfer.Chart
{
#region 30
var nowDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
for (var i = nowDate.AddDays(-30); i <= nowDate; i=i.AddDays(1))
for (var i = nowDate.AddDays(-30); i <= nowDate; i = i.AddDays(1))
{
//i是日期
@@ -87,7 +87,7 @@ namespace FineUIPro.Web.Transfer.Chart
DateTime startTime = Convert.ToDateTime(i.ToString("yyyy-MM-dd") + " 00:00:00");
DateTime endTime = Convert.ToDateTime(i.ToString("yyyy-MM-dd") + " 23:59:59");
//当天计划完成量
var dtjhwcl= forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
var dtjhwcl = forms.Where(x => x.Required_Date >= startTime && x.Required_Date <= endTime).Count();
wcl1 += "'" + dtjhwcl + "',";
//当天实际完成量
var dtsjwcl = forms.Where(x => x.Actual_Date >= startTime && x.Actual_Date <= endTime).Count();
@@ -96,12 +96,12 @@ namespace FineUIPro.Web.Transfer.Chart
var ljjhwcl = forms.Where(x => x.Required_Date <= endTime).Count();
wcl3 += "'" + ljjhwcl + "',";
//累计实际完成量
var ljsjwcl= forms.Where(x => x.Actual_Date <= endTime).Count();
var ljsjwcl = forms.Where(x => x.Actual_Date <= endTime).Count();
wcl4 += "'" + ljsjwcl + "',";
AllxDate += "'"+ d + "',";
AllxDate += "'" + d + "',";
}
if (AllxDate.Length>0)
if (AllxDate.Length > 0)
{
AllxDate = AllxDate.Substring(0, AllxDate.Length - 1);
wcl1 = wcl1.Substring(0, wcl1.Length - 1);
@@ -403,7 +403,7 @@ namespace FineUIPro.Web.Transfer.Chart
cat_C_Count += Convert.ToInt32(row["Cat_C_Count"]);
cat_D_Count += Convert.ToInt32(row["Cat_D_Count"]);
//
Cat_A_Countf+= Convert.ToInt32(row["Cat_A_Countf"]);
Cat_A_Countf += Convert.ToInt32(row["Cat_A_Countf"]);
Cat_A_CountWUH += Convert.ToInt32(row["Cat_A_CountWUH"]);
Cat_A_CountBASF += Convert.ToInt32(row["Cat_A_CountBASF"]);
@@ -604,7 +604,7 @@ namespace FineUIPro.Web.Transfer.Chart
protected void TabStrip1_TabIndexChanged(object sender, EventArgs e)
{
if (TabStrip1.ActiveTabIndex ==0)
if (TabStrip1.ActiveTabIndex == 0)
{
ddlSystemNo.Hidden = true;
ddlDateType.Hidden = true;
@@ -636,7 +636,8 @@ namespace FineUIPro.Web.Transfer.Chart
BtnAnalyse.Hidden = false;
BindGrid3();
}
else {
else
{
this.AnalyseData();
ddlSystemNo.Hidden = false;
ddlDateType.Hidden = false;
@@ -667,14 +668,14 @@ namespace FineUIPro.Web.Transfer.Chart
strSql.AppendLine(@" select System_No,
cast(0 as decimal(18, 2)) Cat_A_Count,
cast(0 as decimal(18, 2)) Cat_A_Countf, cast(0 as decimal(18, 2)) Cat_A_CountWUH, cast(0 as decimal(18, 2)) Cat_A_CountBASF,
cast(0 as decimal(18, 2)) Cat_A_Countf,cast(0 as decimal(18, 2)) Cat_A_CountPercent, cast(0 as decimal(18, 2)) Cat_A_CountWUH, cast(0 as decimal(18, 2)) Cat_A_CountBASF,
cast(0 as decimal(18, 2)) Cat_B_Count,
cast(0 as decimal(18, 2)) Cat_B_Countf, cast(0 as decimal(18, 2)) Cat_B_CountWUH, cast(0 as decimal(18, 2)) Cat_B_CountBASF,
cast(0 as decimal(18, 2)) Cat_B_Countf,cast(0 as decimal(18, 2)) Cat_B_CountPercent, cast(0 as decimal(18, 2)) Cat_B_CountWUH, cast(0 as decimal(18, 2)) Cat_B_CountBASF,
cast(0 as decimal(18, 2)) Cat_C_Count,
cast(0 as decimal(18, 2)) Cat_C_Countf, cast(0 as decimal(18, 2)) Cat_C_CountWUH, cast(0 as decimal(18, 2)) Cat_C_CountBASF,
cast(0 as decimal(18, 2)) Cat_C_Countf,cast(0 as decimal(18, 2)) Cat_C_CountPercent, cast(0 as decimal(18, 2)) Cat_C_CountWUH, cast(0 as decimal(18, 2)) Cat_C_CountBASF,
cast(0 as decimal(18, 2)) Cat_D_Count,
cast(0 as decimal(18, 2)) Cat_D_Countf, cast(0 as decimal(18, 2)) Cat_D_CountWUH, cast(0 as decimal(18, 2)) Cat_D_CountBASF,
cast(0 as decimal(18, 2)) allCount, cast(0 as decimal(18, 2)) allfinshedCount, cast(0 as decimal(18, 2)) allWUH, cast(0 as decimal(18, 2)) allBASF
cast(0 as decimal(18, 2)) Cat_D_Countf,cast(0 as decimal(18, 2)) Cat_D_CountPercent, cast(0 as decimal(18, 2)) Cat_D_CountWUH, cast(0 as decimal(18, 2)) Cat_D_CountBASF,
cast(0 as decimal(18, 2)) allCount,cast(0 as decimal(18, 2)) allfinshedCount,cast(0 as decimal(18, 2)) allCountPercent,cast(0 as decimal(18, 2)) allWUH, cast(0 as decimal(18, 2)) allBASF
INTO #PunchlistFromProgressTemp
from #AllPunchlistFromProgressTemp Group by System_No; ");
strSql.AppendLine(@" update a set
@@ -710,7 +711,14 @@ namespace FineUIPro.Web.Transfer.Chart
from #PunchlistFromProgressTemp a;");
strSql.AppendLine(@" update a set
a.Cat_A_CountPercent=(case ISNULL(a.Cat_A_Count,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_A_Countf,0)*1.0/ISNULL(a.Cat_A_Count,0))) end ),
a.Cat_B_CountPercent=(case ISNULL(a.Cat_B_Count,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_B_Countf,0)*1.0/ISNULL(a.Cat_B_Count,0))) end ),
a.Cat_C_CountPercent=(case ISNULL(a.Cat_C_Count,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_C_Countf,0)*1.0/ISNULL(a.Cat_C_Count,0))) end ),
a.Cat_D_CountPercent=(case ISNULL(a.Cat_D_Count,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.Cat_D_Countf,0)*1.0/ISNULL(a.Cat_D_Count,0))) end ),
a.allCountPercent=(case ISNULL(a.allCount,0) when 0 then 0 else CONVERT(DECIMAL(10,2),100*(ISNULL(a.allfinshedCount,0)*1.0/ISNULL(a.allCount,0))) end )
from #PunchlistFromProgressTemp a; ");
strSql.AppendLine(" select * from #PunchlistFromProgressTemp ");
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@@ -734,13 +742,14 @@ namespace FineUIPro.Web.Transfer.Chart
Cat_C_Countf = 0, Cat_C_CountWUH = 0, Cat_C_CountBASF = 0,
Cat_D_Countf = 0, Cat_D_CountWUH = 0, Cat_D_CountBASF = 0,
allCount = 0, allfinshedCount = 0, allWUH = 0, allBASF = 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"]);
//
Cat_A_Countf += Convert.ToInt32(row["Cat_A_Countf"]);
Cat_A_CountWUH += Convert.ToInt32(row["Cat_A_CountWUH"]);
Cat_A_CountBASF += Convert.ToInt32(row["Cat_A_CountBASF"]);
@@ -763,6 +772,11 @@ namespace FineUIPro.Web.Transfer.Chart
allBASF += Convert.ToInt32(row["allBASF"]);
}
var Cat_A_CountPercent = 100 * ((float)Cat_A_Countf / (float)cat_A_Count);
var Cat_B_CountPercent = 100 * ((float)Cat_B_Countf / (float)cat_B_Count);
var Cat_C_CountPercent = 100 * ((float)Cat_C_Countf / (float)cat_C_Count);
var Cat_D_CountPercent = 100 * ((float)Cat_D_Countf / (float)cat_D_Count);
var allCountPercent = 100 * ((float)allfinshedCount / (float)allCount);
JObject summary = new JObject();
summary.Add("System_No", "合计");
@@ -772,27 +786,31 @@ namespace FineUIPro.Web.Transfer.Chart
summary.Add("Cat_D_Count", cat_D_Count.ToString());
summary.Add("Cat_A_Countf", Cat_A_Countf.ToString());
summary.Add("Cat_A_CountPercent", Cat_A_CountPercent.ToString("F2"));
summary.Add("Cat_A_CountWUH", Cat_A_CountWUH.ToString());
summary.Add("Cat_A_CountBASF", Cat_A_CountBASF.ToString());
summary.Add("Cat_B_Countf", Cat_B_Countf.ToString());
summary.Add("Cat_B_CountPercent", Cat_B_CountPercent.ToString("F2"));
summary.Add("Cat_B_CountWUH", Cat_B_CountWUH.ToString());
summary.Add("Cat_B_CountBASF", Cat_B_CountBASF.ToString());
summary.Add("Cat_C_Countf", Cat_C_Countf.ToString());
summary.Add("Cat_C_CountPercent", Cat_C_CountPercent.ToString("F2"));
summary.Add("Cat_C_CountWUH", Cat_C_CountWUH.ToString());
summary.Add("Cat_C_CountBASF", Cat_C_CountBASF.ToString());
summary.Add("Cat_D_Countf", Cat_D_Countf.ToString());
summary.Add("Cat_D_CountPercent", Cat_D_CountPercent.ToString("F2"));
summary.Add("Cat_D_CountWUH", Cat_D_CountWUH.ToString());
summary.Add("Cat_D_CountBASF", Cat_D_CountBASF.ToString());
summary.Add("allCount", allCount.ToString());
summary.Add("allfinshedCount", allfinshedCount.ToString());
summary.Add("allCountPercent", allCountPercent.ToString("F2"));
summary.Add("allWUH", allWUH.ToString());
summary.Add("allBASF", allBASF.ToString());
Grid3.SummaryData = summary;
}
@@ -15,7 +15,7 @@
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="设备材料报验" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="SystemNo" AllowCellEditing="true" EnableColumnLines="true"
ClicksToEdit="2" DataIDField="SystemNo" AllowSorting="true"
ClicksToEdit="2" DataIDField="SystemNo" AllowSorting="true"
AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange"
EnableTextSelection="true" AllowColumnLocking="true">
<Toolbars>
@@ -28,21 +28,21 @@
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</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:ToolbarFill runat="server"></f:ToolbarFill>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="true">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
<%-- <f:RenderField ColumnID="SN" DataField="SN" FieldType="String" HeaderText="SN" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="50px">
</f:RenderField>--%>
@@ -53,17 +53,30 @@
<f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
HeaderText="Plan PWD<br/>计划PWD" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
<f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
HeaderText="Plan JWD<br/>计划联合检查" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
<f:RenderField MinWidth="120px" ColumnID="PlanPWD" DataField="PlanPWD"
HeaderText="MC Plan<br/>MC 计划" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true"/>
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" EnableLock="true" Locked="true" />
<f:GroupField HeaderText="Welding<br/>管道焊接信息" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField MinWidth="50px" ColumnID="TotalFactor" DataField="TotalFactor"
HeaderText="总达因数" TextAlign="Center" />
<f:GroupField HeaderText="Piping<br/>管道测试包" TextAlign="Center" MinWidth="200px">
<f:RenderField MinWidth="50px" ColumnID="CompleteFactor" DataField="CompleteFactor"
HeaderText="完成达因数" TextAlign="Center" />
<f:RenderField MinWidth="80px" ColumnID="CompleteProportion" DataField="CompleteProportion"
HeaderText="完成率(%)" TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Piping<br/>管道试压包" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField MinWidth="50px" ColumnID="PipingCount" DataField="PipingCount"
HeaderText="总数" TextAlign="Center" />
@@ -75,6 +88,19 @@
HeaderText="完成率(%)" TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Reinstate<br/>管道冲洗吹扫&复位信息" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField MinWidth="50px" ColumnID="ReinstateCount" DataField="ReinstateCount"
HeaderText="总数" TextAlign="Center" />
<f:RenderField MinWidth="50px" ColumnID="ReinstateScount" DataField="ReinstateScount"
HeaderText="完成数" TextAlign="Center" />
<f:RenderField MinWidth="80px" ColumnID="ReinstatePercent" DataField="ReinstatePercent"
HeaderText="完成率(%)" TextAlign="Center" />
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Equipment<br/>设备测试包" TextAlign="Center" MinWidth="200px">
<Columns>
@@ -115,7 +141,7 @@
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Civil/Structure<br/>土建/建筑/结构测试包" TextAlign="Center" MinWidth="200px">
<f:GroupField HeaderText="Civil/Structure<br/>土建/建筑/结构测试包" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField MinWidth="50px" ColumnID="TcsCount" DataField="TcsCount"
HeaderText="总数" TextAlign="Center" />
@@ -154,7 +180,7 @@
</Columns>
</f:GroupField>
<f:GroupField HeaderText="Plumbing<br/>地管测试包" TextAlign="Center" MinWidth="200px">
<%--<f:GroupField HeaderText="Plumbing<br/>地管测试包" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField MinWidth="50px" ColumnID="TpCount" DataField="TpCount"
HeaderText="总数" TextAlign="Center" />
@@ -165,23 +191,31 @@
<f:RenderField MinWidth="80px" ColumnID="TpPercent" DataField="TpPercent"
HeaderText="完成率(%)" TextAlign="Center" />
</Columns>
</f:GroupField>
</f:GroupField>--%>
<f:TemplateField ColumnID="Count4" minWidth="120px" HeaderText="Total<br/>completion<br/>percentage<br/>总完成率(%" HeaderTextAlign="Center" TextAlign="Right">
<f:TemplateField ColumnID="Count4" MinWidth="120px" HeaderText="Total<br/>completion<br/>percentage<br/>总完成率(%" HeaderTextAlign="Center" TextAlign="Right">
<ItemTemplate>
<asp:Label ID="Label5" runat="server" Text='<%# totalper(Eval("SystemNo")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField MinWidth="140px" ColumnID="ElectricHeatTracing" DataField="ElectricHeatTracing"
HeaderText="electric heat<br/> tracing<br/>电伴热 " TextAlign="Center"
FieldType="String" />
<f:RenderField MinWidth="140px" ColumnID="SubmitPackage" DataField="SubmitPackage"
<f:RenderField MinWidth="140px" ColumnID="Insulation" DataField="Insulation"
HeaderText="Insulation<br/>保温/冷 " TextAlign="Center"
FieldType="String" />
<f:RenderField MinWidth="140px" ColumnID="SubmitPackage" DataField="SubmitPackage"
HeaderText="Submit Package<br/>系统包提交 " TextAlign="Center"
FieldType="String"/>
FieldType="String" />
<f:RenderField MinWidth="120px" ColumnID="ActualPWD" DataField="ActualPWD"
<f:RenderField MinWidth="120px" ColumnID="ActualPWD" DataField="ActualPWD"
HeaderText="Actual PWD<br/>实际预联合检查" TextAlign="Center"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
<f:GroupField HeaderText="PWD Punch items <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
<%--<f:GroupField HeaderText="PWD Punch items <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField MinWidth="50px" ColumnID="pwdACount" DataField="pwdACount"
HeaderText="A" TextAlign="Center" />
@@ -192,7 +226,7 @@
<f:RenderField MinWidth="50px" ColumnID="pwdCCount" DataField="pwdCCount"
HeaderText="C" TextAlign="Center" />
</Columns>
</f:GroupField>
</f:GroupField>--%>
<f:RenderField MinWidth="120px" ColumnID="ActualJWD" DataField="ActualJWD"
@@ -200,7 +234,7 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
<f:GroupField HeaderText="FWD Punch items <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
<%--<f:GroupField HeaderText="FWD Punch items <br/>outstanding 未完成数" TextAlign="Center" MinWidth="200px">
<Columns>
<f:RenderField MinWidth="50px" ColumnID="fwdACount" DataField="fwdACount"
HeaderText="A" TextAlign="Center" />
@@ -211,7 +245,7 @@
<f:RenderField MinWidth="50px" ColumnID="fwdCCount" DataField="fwdCCount"
HeaderText="C" TextAlign="Center" />
</Columns>
</f:GroupField>
</f:GroupField>--%>
<f:RenderField MinWidth="120px" ColumnID="ActualMC" DataField="ActualMC"
@@ -219,32 +253,32 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" />
<f:RenderField MinWidth="120px" ColumnID="Commissioning" DataField="Commissioning"
<f:RenderField MinWidth="120px" ColumnID="Commissioning" DataField="Commissioning"
HeaderText="Commissioning<br/>试运行 " TextAlign="Center"
FieldType="String"/>
FieldType="String" />
<f:RenderField MinWidth="120px" ColumnID="IaQian" DataField="IaQian"
<f:RenderField MinWidth="120px" ColumnID="IaQian" DataField="IaQian"
HeaderText="IA签署 " TextAlign="Center"
FieldType="String"/>
FieldType="String" />
<f:RenderField MinWidth="120px" ColumnID="TcccQ" DataField="TcccQ"
<f:RenderField MinWidth="120px" ColumnID="TcccQ" DataField="TcccQ"
HeaderText="TCCC签署" TextAlign="Center"
FieldType="String"/>
FieldType="String" />
<f:RenderField MinWidth="120px" ColumnID="SystemStatus" DataField="SystemStatus"
<f:RenderField MinWidth="120px" ColumnID="SystemStatus" DataField="SystemStatus"
HeaderText="System Status<br/>系统状态 " TextAlign="Center"
FieldType="String"/>
FieldType="String" />
<f:RenderField MinWidth="160px" ColumnID="TurnoverDescription" DataField="TurnoverDescription"
<f:RenderField MinWidth="160px" ColumnID="TurnoverDescription" DataField="TurnoverDescription"
HeaderText="Turnover Description" TextAlign="Center"
FieldType="String"/>
FieldType="String" />
<f:RenderField MinWidth="120px" ColumnID="Remark" DataField="Remark"
HeaderText="Remark<br/>备注" TextAlign="Center"
FieldType="String"/>
FieldType="String" />
</Columns>
<Listeners>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
@@ -261,11 +295,11 @@
</f:Grid>
</Items>
</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" Width="1200px" OnClose="Window1_Close"
Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton>
@@ -47,10 +47,15 @@ namespace FineUIPro.Web.Transfer.Chart
{
string strSql = @"
select f.SystemNo,f.ProjectId,
pp.TotalFactor,pp.CompleteFactor,pp.CompleteProportion,pp.ElectricHeatTracing,pp.Insulation,
ISNULL(tpi.PipingCount,0) PipingCount,ISNULL(tpi1.PipingScount,0) PipingScount,
case ISNULL(tpi.PipingCount,0)
when 0 then 0
else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi1.PipingScount,0)*1.0/ISNULL(tpi.PipingCount,0))) end PipingPercent,
ISNULL(tpi.PipingCount,0) ReinstateCount,ISNULL(tpi2.ReinstateScount,0) ReinstateScount,
case ISNULL(tpi.PipingCount,0)
when 0 then 0
else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi2.ReinstateScount,0)*1.0/ISNULL(tpi.PipingCount,0))) end ReinstatePercent,
ISNULL((TseCount+TreCount),0) as EqCount,ISNULL((TseSCount+TreSCount),0) as EqScount,
case ISNULL((TseCount+TreCount),0)
@@ -82,22 +87,17 @@ namespace FineUIPro.Web.Transfer.Chart
when 0 then 0
else CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0))) end TtPercent,
ISNULL(TpCount,0) TpCount,ISNULL(TpScount,0) TpScount,
case ISNULL(TpCount,0)
when 0 then 0
else CONVERT(DECIMAL(10,2),100*(ISNULL(TpScount,0)*1.0/ISNULL(TpCount,0))) end TpPercent,
ts.PlanPWD,PlanJWD,McPlan,
SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,
IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark,
ISNULL(pwdACount,0) pwdACount,ISNULL(pwdBCount,0) pwdBCount,ISNULL(pwdCCount,0) pwdCCount,
ISNULL(fwdACount,0) fwdACount,ISNULL(fwdBCount,0) fwdBCount,ISNULL(fwdCCount,0) fwdCCount
IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark
from(
SELECT SystemNo,ProjectId FROM Transfer_LHCSystemList group by SystemNo,ProjectId
) f
left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SystemNo=ts.SystemNo
--piping
left join Transfer_Piping pp on f.ProjectId=pp.ProjectId and f.SystemNo=pp.SYSTEM
left join (select count(*)as PipingCount,ProjectId,SYSTEM from Transfer_Piping
group by ProjectId,SYSTEM)
tpi on f.ProjectId=tpi.ProjectId and f.SystemNo=tpi.SYSTEM
@@ -105,6 +105,11 @@ namespace FineUIPro.Web.Transfer.Chart
left join (select count(*)as PipingScount,ProjectId,SYSTEM from Transfer_Piping where FINALStatus='Completed'
group by ProjectId,SYSTEM)
tpi1 on f.ProjectId=tpi1.ProjectId and f.SystemNo=tpi1.SYSTEM
left join (select count(*)as ReinstateScount,ProjectId,SYSTEM from Transfer_Piping where RinseAndBlowClean='Completed' and Reduction='Completed'
group by ProjectId,SYSTEM)
tpi2 on f.ProjectId=tpi2.ProjectId and f.SystemNo=tpi2.SYSTEM
--设备测试包
left join (select count(*)as TseCount,ProjectId,SYSTEM from Transfer_StaticEquipment
group by ProjectId,SYSTEM)
@@ -167,40 +172,169 @@ namespace FineUIPro.Web.Transfer.Chart
group by ProjectId,SystemName)
Tt1 on f.ProjectId=Tt1.ProjectId and f.SystemNo=Tt1.SystemName
--Transfer_Plumbing
left join (select count(*)as TpCount,ProjectId,SystemName from Transfer_Plumbing
group by ProjectId,SystemName)
tp on f.ProjectId=tp.ProjectId and f.SystemNo=tp.SystemName
where f.ProjectId = @ProjectId";
left join (select count(*)as TpScount,ProjectId,SystemName from Transfer_Plumbing where FINAL_Status='Completed'
group by ProjectId,SystemName)
tp1 on f.ProjectId=tp1.ProjectId and f.SystemNo=tp1.SystemName
#region sql
//string strSql = @"
// select f.SystemNo,f.ProjectId,
// ISNULL(tpi.PipingCount,0) PipingCount,ISNULL(tpi1.PipingScount,0) PipingScount,
// case ISNULL(tpi.PipingCount,0)
// when 0 then 0
// else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi1.PipingScount,0)*1.0/ISNULL(tpi.PipingCount,0))) end PipingPercent,
// ISNULL((TseCount+TreCount),0) as EqCount,ISNULL((TseSCount+TreSCount),0) as EqScount,
// case ISNULL((TseCount+TreCount),0)
// when 0 then 0
// else CONVERT(DECIMAL(10,2),100 *(ISNULL((TseSCount+TreSCount),0)*1.0/ISNULL((TseCount+TreCount),0))) end EqPercent,
// ISNULL(TeCount,0) TeCount,ISNULL(TeScount,0) TeScount,
// case ISNULL(TeCount,0)
// when 0 then 0
// else CONVERT(DECIMAL(10,2),100*(ISNULL(TeScount,0)*1.0/ISNULL(TeCount,0))) end TePercent,
// ISNULL(TiCount,0) TiCount,ISNULL(TiScount,0) TiScount,
// case ISNULL(TiCount,0)
// when 0 then 0
// else CONVERT(DECIMAL(10,2),100*(ISNULL(TiScount,0)*1.0/ISNULL(TiCount,0))) end TiPercent,
// ISNULL(TcsCount,0) TcsCount,ISNULL(TcsScount,0) TcsScount,
// case ISNULL(TcsCount,0)
// when 0 then 0
// else CONVERT(DECIMAL(10,2),100*(ISNULL(TcsScount,0)*1.0/ISNULL(TcsCount,0))) end TcsPercent,
// ISNULL(TfCount,0) TfCount,ISNULL(TfScount,0) TfScount,
// case ISNULL(TfCount,0)
// when 0 then 0
// else CONVERT(DECIMAL(10,2),100*(ISNULL(TfScount,0)*1.0/ISNULL(TfCount,0))) end TfPercent,
// ISNULL(TtCount,0) TtCount,ISNULL(TtScount,0) TtScount,
// case ISNULL(TtCount,0)
// when 0 then 0
// else CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0))) end TtPercent,
// ISNULL(TpCount,0) TpCount,ISNULL(TpScount,0) TpScount,
// case ISNULL(TpCount,0)
// when 0 then 0
// else CONVERT(DECIMAL(10,2),100*(ISNULL(TpScount,0)*1.0/ISNULL(TpCount,0))) end TpPercent,
// ts.PlanPWD,PlanJWD,McPlan,
// SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,
// IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark,
// ISNULL(pwdACount,0) pwdACount,ISNULL(pwdBCount,0) pwdBCount,ISNULL(pwdCCount,0) pwdCCount,
// ISNULL(fwdACount,0) fwdACount,ISNULL(fwdBCount,0) fwdBCount,ISNULL(fwdCCount,0) fwdCCount
// from(
// SELECT SystemNo,ProjectId FROM Transfer_LHCSystemList group by SystemNo,ProjectId
// ) f
// left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SystemNo=ts.SystemNo
// --piping
// left join (select count(*)as PipingCount,ProjectId,SYSTEM from Transfer_Piping
// group by ProjectId,SYSTEM)
// tpi on f.ProjectId=tpi.ProjectId and f.SystemNo=tpi.SYSTEM
// left join (select count(*)as PipingScount,ProjectId,SYSTEM from Transfer_Piping where FINALStatus='Completed'
// group by ProjectId,SYSTEM)
// tpi1 on f.ProjectId=tpi1.ProjectId and f.SystemNo=tpi1.SYSTEM
// --设备测试包
// left join (select count(*)as TseCount,ProjectId,SYSTEM from Transfer_StaticEquipment
// group by ProjectId,SYSTEM)
// tse on f.ProjectId=tse.ProjectId and f.SystemNo=tse.SYSTEM
// left join (select count(*)as TseSCount,ProjectId,SYSTEM from Transfer_StaticEquipment where MechanicalFINALStatus='Completed'
// group by ProjectId,SYSTEM)
// tse1 on f.ProjectId=tse1.ProjectId and f.SystemNo=tse1.SYSTEM
// --
// left join (select count(*)as TreCount,ProjectId,SYSTEM from Transfer_RotatingEquipment
// group by ProjectId,SYSTEM)
// tre on f.ProjectId=tre.ProjectId and f.SystemNo=tre.SYSTEM
// left join (select count(*)as TreSCount,ProjectId,SYSTEM from Transfer_RotatingEquipment where MechanicalFINALStatus='Completed'
// group by ProjectId,SYSTEM)
// tre1 on f.ProjectId=tre1.ProjectId and f.SystemNo=tre1.SYSTEM
// --Transfer_Electrical
// left join (select count(*)as TeCount,ProjectId,SystemName from Transfer_Electrical
// group by ProjectId,SystemName)
// te on f.ProjectId=te.ProjectId and f.SystemNo=te.SystemName
// left join (select count(*)as TeScount,ProjectId,SystemName from Transfer_Electrical where FINAL_Status='Completed'
// group by ProjectId,SystemName)
// te1 on f.ProjectId=te1.ProjectId and f.SystemNo=te1.SystemName
// --Transfer_Instrumentation
// left join (select count(*)as TiCount,ProjectId,SystemName from Transfer_Instrumentation
// group by ProjectId,SystemName)
// ti on f.ProjectId=ti.ProjectId and f.SystemNo=ti.SystemName
// left join (select count(*)as TiScount,ProjectId,SystemName from Transfer_Instrumentation where FINAL_Status='Completed'
// group by ProjectId,SystemName)
// ti1 on f.ProjectId=ti1.ProjectId and f.SystemNo=ti1.SystemName
// --Transfer_Civil_Structure
// left join (select count(*)as TcsCount,ProjectId,SystemName from Transfer_Civil_Structure
// group by ProjectId,SystemName)
// tcs on f.ProjectId=tcs.ProjectId and f.SystemNo=tcs.SystemName
// left join (select count(*)as TcsScount,ProjectId,SystemName from Transfer_Civil_Structure where FINAL_Status='Completed'
// group by ProjectId,SystemName)
// tcs1 on f.ProjectId=tcs1.ProjectId and f.SystemNo=tcs1.SystemName
// --Transfer_Firefighting
// left join (select count(*)as TfCount,ProjectId,SystemName from Transfer_Firefighting
// group by ProjectId,SystemName)
// tf on f.ProjectId=tf.ProjectId and f.SystemNo=tf.SystemName
// left join (select count(*)as TfScount,ProjectId,SystemName from Transfer_Firefighting where FINAL_Status='Completed'
// group by ProjectId,SystemName)
// tf1 on f.ProjectId=tf1.ProjectId and f.SystemNo=tf1.SystemName
// --Transfer_Telecom
// left join (select count(*)as TtCount,ProjectId,SystemName from Transfer_Telecom
// group by ProjectId,SystemName)
// Tt on f.ProjectId=Tt.ProjectId and f.SystemNo=Tt.SystemName
// left join (select count(*)as TtScount,ProjectId,SystemName from Transfer_Telecom where FINAL_Status='Completed'
// group by ProjectId,SystemName)
// Tt1 on f.ProjectId=Tt1.ProjectId and f.SystemNo=Tt1.SystemName
// --Transfer_Plumbing
// left join (select count(*)as TpCount,ProjectId,SystemName from Transfer_Plumbing
// group by ProjectId,SystemName)
// tp on f.ProjectId=tp.ProjectId and f.SystemNo=tp.SystemName
// left join (select count(*)as TpScount,ProjectId,SystemName from Transfer_Plumbing where FINAL_Status='Completed'
// group by ProjectId,SystemName)
// tp1 on f.ProjectId=tp1.ProjectId and f.SystemNo=tp1.SystemName
left join (select count(*) as pwdACount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
and Punch_Type='PWD' and Cat='A' group by ProjectId,System_No)
tpA on f.ProjectId=tpA.ProjectId and f.SystemNo=tpA.System_No
// left join (select count(*) as pwdACount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
// and Punch_Type='PWD' and Cat='A' group by ProjectId,System_No)
// tpA on f.ProjectId=tpA.ProjectId and f.SystemNo=tpA.System_No
left join (select count(*) as pwdBCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
and Punch_Type='PWD' and Cat='B' group by ProjectId,System_No)
tpB on f.ProjectId=tpB.ProjectId and f.SystemNo=tpB.System_No
// left join (select count(*) as pwdBCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
// and Punch_Type='PWD' and Cat='B' group by ProjectId,System_No)
// tpB on f.ProjectId=tpB.ProjectId and f.SystemNo=tpB.System_No
left join (select count(*) as pwdCCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
and Punch_Type='PWD' and Cat='C' group by ProjectId,System_No)
tpC on f.ProjectId=tpC.ProjectId and f.SystemNo=tpC.System_No
// left join (select count(*) as pwdCCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
// and Punch_Type='PWD' and Cat='C' group by ProjectId,System_No)
// tpC on f.ProjectId=tpC.ProjectId and f.SystemNo=tpC.System_No
left join (select count(*) as fwdACount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
and Punch_Type='FWD' and Cat='A' group by ProjectId,System_No)
tpfA on f.ProjectId=tpfA.ProjectId and f.SystemNo=tpfA.System_No
// left join (select count(*) as fwdACount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
// and Punch_Type='FWD' and Cat='A' group by ProjectId,System_No)
// tpfA on f.ProjectId=tpfA.ProjectId and f.SystemNo=tpfA.System_No
left join (select count(*) as fwdBCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
and Punch_Type='FWD' and Cat='B' group by ProjectId,System_No)
tpfB on f.ProjectId=tpfB.ProjectId and f.SystemNo=tpfB.System_No
// left join (select count(*) as fwdBCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
// and Punch_Type='FWD' and Cat='B' group by ProjectId,System_No)
// tpfB on f.ProjectId=tpfB.ProjectId and f.SystemNo=tpfB.System_No
left join (select count(*) as fwdCCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
and Punch_Type='FWD' and Cat='C' group by ProjectId,System_No)
tpfC on f.ProjectId=tpfC.ProjectId and f.SystemNo=tpfC.System_No
// left join (select count(*) as fwdCCount,ProjectId,System_No from Transfer_PunchlistFrom where Status!='Completed'
// and Punch_Type='FWD' and Cat='C' group by ProjectId,System_No)
// tpfC on f.ProjectId=tpfC.ProjectId and f.SystemNo=tpfC.System_No
// where f.ProjectId = @ProjectId";
#endregion
where f.ProjectId = @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));