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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
DataBase/版本日志/SUBQHSE_V2024-10-31-xiaj.sql Normal file
View File

@ -0,0 +1,48 @@
--1、索引项目中，删除英文，保留中文
update Sys_Menu set MenuName='尾项管理' where MenuId='016903B1-3B86-4CF5-AFF8-FF8BE389BEE5';
update Sys_Menu set MenuName='非工艺系统清单' where MenuId='022428DC-FC99-4916-B8AF-6A9DC885DFAF';
update Sys_Menu set MenuName='工艺系统清单' where MenuId='197F9A9A-480C-4CC3-B6B7-3A7D382DC3EB';
update Sys_Menu set MenuName='尾项完成统计表' where MenuId='2352E44F-BE12-4012-B43F-AAF649EDAC32';
update Sys_Menu set MenuName='移交状态汇总表' where MenuId='25C13642-AE77-42E2-B0FB-32663B68F93F';
update Sys_Menu set MenuName='电气' where MenuId='296E75D2-192A-4D1F-8471-DD34263F8691';
update Sys_Menu set MenuName='尾项进度跟踪表' where MenuId='549DD0B6-05CB-4C75-B8F5-9AADDEDF399F';
update Sys_Menu set MenuName='电信' where MenuId='58FFBD80-ACB9-4830-A18A-E025D9600D94';
update Sys_Menu set MenuName='移交统计图表' where MenuId='60838E30-4A46-4878-B299-C234900B10B7';
update Sys_Menu set MenuName='动设备' where MenuId='7E2FB5F9-FB99-4455-B68F-460F1F9A2676';
update Sys_Menu set MenuName='仪表' where MenuId='88F51059-55B4-4CD5-A38C-36404E5029F6';
update Sys_Menu set MenuName='土建/建筑/结构' where MenuId='95C39F86-C060-452E-BA37-D891C466A39B';
update Sys_Menu set MenuName='静设备' where MenuId='982F746C-084C-445C-9AE8-8C37BDFE7994';
update Sys_Menu set MenuName='尾项分类表' where MenuId='CB76462E-9444-4946-B787-ECB33C21E6D0';
update Sys_Menu set MenuName='管道' where MenuId='D94C1BA4-9DFD-4514-AE12-6F886C5D8C9B';
update Sys_Menu set MenuName='移交统计表' where MenuId='E305689E-5D84-4C1A-BF67-85FA2D828115';
go
--2、删除项目中的地管和消防2个项目（隐藏菜单）
update Sys_Menu set MenuName='消防',IsUsed=0 where MenuId='794E64E2-FDD2-4B7D-8408-F7FB06F9C92A';
update Sys_Menu set MenuName='地管',IsUsed=0 where MenuId='95295BF7-FB51-480D-9902-6ADA4E8427FC';
go
--3、更新管道表的表格
--判断字段不存在则添加
IF NOT EXISTS(select * from sys.columns where name='TotalFactor' and [object_id]=object_id(N'Transfer_Piping'))
BEGIN
--总达因数
ALTER TABLE Transfer_Piping ADD TotalFactor nvarchar(50) NULL;
--完成达因数
ALTER TABLE Transfer_Piping ADD CompleteFactor nvarchar(50) NULL;
--完成比例
ALTER TABLE Transfer_Piping ADD CompleteProportion nvarchar(50) NULL;
--试压完成
ALTER TABLE Transfer_Piping ADD PressureTestCompleted nvarchar(50) NULL;
--冲洗吹扫
ALTER TABLE Transfer_Piping ADD RinseAndBlowClean nvarchar(50) NULL;
--复位
ALTER TABLE Transfer_Piping ADD Reduction nvarchar(50) NULL;
--电伴热
ALTER TABLE Transfer_Piping ADD ElectricHeatTracing nvarchar(50) NULL;
--保温/冷
ALTER TABLE Transfer_Piping ADD Insulation nvarchar(50) NULL;
END
go

3
SGGL/BLL/Common/AttachFileService.cs
View File

@ -501,6 +501,9 @@ namespace BLL
list.Add(".txt");
list.Add(".xlsx");
list.Add(".xls");
list.Add(".png");
list.Add(".jpg");
list.Add(".jpeg");
foreach (var item in list)
{
if (item == FiletExtension)

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/Instrumentation导入模板.xls
View File

Binary file not shown.

BIN
SGGL/FineUIPro.Web/File/Excel/DataIn/Piping导入模板.xls
View File

Binary file not shown.

7
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx
View File

@ -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>

50
SGGL/FineUIPro.Web/Transfer/Chart/PunchlistFromChartNew.aspx.cs
View File

@ -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;
}

102
SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx
View File

@ -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>

204
SGGL/FineUIPro.Web/Transfer/Chart/Systemstatus.aspx.cs
View File

@ -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));

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

@ -76,9 +76,9 @@
<f:GroupField HeaderText="Test Package Schedule" TextAlign="Center" MinWidth="400px">
<Columns>
<f:RenderField ColumnID="Calibration" DataField="Calibration" FieldType="String" HeaderText="Calibration " TextAlign="Center"
<%--<f:RenderField ColumnID="Calibration" DataField="Calibration" FieldType="String" HeaderText="Calibration " TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField ColumnID="InstallationCalibration" DataField="InstallationCalibration" FieldType="String" HeaderText="Installation" TextAlign="Center"
HeaderTextAlign="Center" minWidth="140px">
@ -102,7 +102,7 @@
</Columns>
</f:GroupField>
<f:BoundField MinWidth="200px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="Mechanical FINAL Status" TextAlign="Center"/>
<f:BoundField MinWidth="200px" ColumnID="FINAL_Status" DataField="FINAL_Status" HeaderText="FINAL Status" TextAlign="Center"/>
</Columns>
<Listeners>

25
SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
View File

@ -327,12 +327,19 @@ namespace FineUIPro.Web.Transfer
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
var obj0 = model.Calibration = pds.Rows[i][5].ToString().Trim();
var obj1 = model.InstallationCalibration = pds.Rows[i][6].ToString().Trim();
var obj2 = model.PipingPressuretest = pds.Rows[i][7].ToString().Trim();
var obj3 = model.PipingLeak = pds.Rows[i][8].ToString().Trim();
var obj4 = model.PipingBlowing = pds.Rows[i][9].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
//var obj0 = model.Calibration = pds.Rows[i][5].ToString().Trim();
//var obj1 = model.InstallationCalibration = pds.Rows[i][6].ToString().Trim();
//var obj2 = model.PipingPressuretest = pds.Rows[i][7].ToString().Trim();
//var obj3 = model.PipingLeak = pds.Rows[i][8].ToString().Trim();
//var obj4 = model.PipingBlowing = pds.Rows[i][9].ToString().Trim();
//var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
var obj1 = model.InstallationCalibration = pds.Rows[i][5].ToString().Trim();
var obj2 = model.PipingPressuretest = pds.Rows[i][6].ToString().Trim();
var obj3 = model.PipingLeak = pds.Rows[i][7].ToString().Trim();
var obj4 = model.PipingBlowing = pds.Rows[i][8].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][9].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
@ -340,9 +347,9 @@ namespace FineUIPro.Web.Transfer
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
listObj.Add(obj0);
//listObj.Add(obj0);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 6)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
model.FINAL_Status = "Completed";
list.Add(model);
@ -351,7 +358,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 6)
if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
{
model.FINAL_Status = "Not Start";
list.Add(model);

4
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx
View File

@ -50,12 +50,12 @@
<Items>
<f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
<Items>
<f:DropDownList ID="ddlCalibration" runat="server" Label="Calibration" LabelWidth="180px">
<%--<f:DropDownList ID="ddlCalibration" runat="server" Label="Calibration" 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>--%>
<f:DropDownList ID="ddlInstallationCalibration" runat="server" Label="Installation" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>

6
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.cs
View File

@ -60,7 +60,7 @@ namespace FineUIPro.Web.Transfer
ddlPipingLeak.SelectedValue = model.PipingLeak;
ddlPipingBlowing.SelectedValue = model.PipingBlowing;
ddlLooptest.SelectedValue = model.Looptest;
ddlCalibration.SelectedValue = model.Calibration;
//ddlCalibration.SelectedValue = model.Calibration;
txtDescriptions.Text = model.Descriptions;
}
}
@ -81,7 +81,7 @@ namespace FineUIPro.Web.Transfer
PipingLeak = ddlPipingLeak.SelectedValue,
PipingBlowing = ddlPipingBlowing.SelectedValue,
Looptest = ddlLooptest.SelectedValue,
Calibration= ddlCalibration.SelectedValue,
//Calibration= ddlCalibration.SelectedValue,
Descriptions = txtDescriptions.Text
};
@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
newModel.PipingLeak = ddlPipingLeak.SelectedValue;
newModel.PipingBlowing = ddlPipingBlowing.SelectedValue;
newModel.Looptest = ddlLooptest.SelectedValue;
newModel.Calibration = ddlCalibration.SelectedValue;
//newModel.Calibration = ddlCalibration.SelectedValue;
newModel.FINAL_Status = model.FINAL_Status;
newModel.Descriptions = txtDescriptions.Text;
}

9
SGGL/FineUIPro.Web/Transfer/InstrumentationEdit.aspx.designer.cs generated
View File

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

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

@ -27,17 +27,17 @@
<f:TextBox runat="server" ID="txtSystem" Label="SYSTEM NO" LabelWidth="120px" LabelAlign="Right"></f:TextBox>
<f:DropDownList runat="server" ID="ddStatus" Label="Status" LabelWidth="80px" LabelAlign="Right">
<f:ListItem Value="" Text="All" Selected="true"/>
<f:ListItem Value="Not Start" Text="Not Start"/>
<f:ListItem Value="In progress" Text="In progress"/>
<f:ListItem Value="Completed" Text="Completed"/>
<f:ListItem Value="" Text="All" Selected="true" />
<f:ListItem Value="Not Start" Text="Not Start" />
<f:ListItem Value="In progress" Text="In progress" />
<f:ListItem Value="Completed" Text="Completed" />
</f:DropDownList>
<f:Button ID="btnSearch" Icon="SystemSearch" EnablePostBack="true" runat="server" OnClick="btnSearch_Click" ToolTip="查询">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
<f:Button ID="btnNew" Icon="Add" EnablePostBack="false" runat="server" ToolTip="新增">
</f:Button>
<f:Button ID="btnImport" ToolTip="导入" Icon="PackageIn" runat="server" OnClick="btnImport_Click" Hidden="true">
@ -49,21 +49,21 @@
<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" minWidth="220px">
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: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"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System" TextAlign="Center"
<f:RenderField ColumnID="Subsystem" DataField="Subsystem" FieldType="String" HeaderText="Sub-System No" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="TestPackage" DataField="TestPackage" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
@ -96,7 +96,7 @@
</Columns>
</f:GroupField>--%>
<f:GroupField ID="g4" HeaderText="Hydrostatic test schedule" HeaderTextAlign="Center">
<%--<f:GroupField ID="g4" HeaderText="Hydrostatic test schedule" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PWD" DataField="PWD" FieldType="String" HeaderText="Ready for Test" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
@ -110,9 +110,9 @@
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</Columns>
</f:GroupField>
</f:GroupField>--%>
<f:GroupField ID="g5" HeaderText="Pre-Commissioning" HeaderTextAlign="Center">
<%--<f:GroupField ID="g5" HeaderText="Pre-Commissioning" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="Blowingflushing" DataField="Blowingflushing" FieldType="String" HeaderText="Blowing /flushing &<br/> Dry out" TextAlign="Center"
HeaderTextAlign="Center" Width="160px">
@ -126,9 +126,45 @@
HeaderTextAlign="Center" Width="150px">
</f:RenderField>
</Columns>
</f:GroupField>--%>
<f:GroupField ID="g6" HeaderText="焊接信息" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="TotalFactor" DataField="TotalFactor" FieldType="String" HeaderText="总达因数" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="CompleteFactor" DataField="CompleteFactor" FieldType="String" HeaderText="完成达因数" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="CompleteProportion" DataField="CompleteProportion" FieldType="String" HeaderText="完成比例" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="Final Status" TextAlign="Center"
<f:GroupField ID="g7" HeaderText="试压包状态" HeaderTextAlign="Center">
<Columns>
<f:RenderField ColumnID="PressureTestCompleted" DataField="PressureTestCompleted" FieldType="String" HeaderText="试压完成" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="RinseAndBlowClean" DataField="RinseAndBlowClean" FieldType="String" HeaderText="冲洗吹扫" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField ColumnID="Reduction" DataField="Reduction" FieldType="String" HeaderText="复位" TextAlign="Center"
HeaderTextAlign="Center" Width="120px">
</f:RenderField>
</Columns>
</f:GroupField>
<f:RenderField ColumnID="ElectricHeatTracing" DataField="ElectricHeatTracing" FieldType="String" HeaderText="电伴热" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="Insulation" DataField="Insulation" FieldType="String" HeaderText="保温/冷" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
</f:RenderField>
<f:RenderField ColumnID="FINALStatus" DataField="FINALStatus" FieldType="String" HeaderText="Final Status" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="120px">
</f:RenderField>
@ -164,7 +200,7 @@
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
<f:MenuButton ID="btnMenuModify" EnablePostBack="true" runat="server" Text="修改" Icon="Pencil" OnClick="btnMenuModify_Click">
</f:MenuButton>
<f:MenuButton ID="btnMenuDel" EnablePostBack="true" runat="server" Icon="Delete" Text="删除" ConfirmText="确定删除当前数据？"

8
SGGL/FineUIPro.Web/Transfer/Piping.aspx.designer.cs generated
View File

@ -132,22 +132,22 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.GroupField g2;
/// <summary>
/// g4 控件。
/// g6 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupField g4;
protected global::FineUIPro.GroupField g6;
/// <summary>
/// g5 控件。
/// g7 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.GroupField g5;
protected global::FineUIPro.GroupField g7;
/// <summary>
/// ToolbarText1 控件。

42
SGGL/FineUIPro.Web/Transfer/PipingDataIn.aspx.cs
View File

@ -317,21 +317,32 @@ namespace FineUIPro.Web.Transfer
model.ProjectId = CurrUser.LoginProjectId;
model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
model.Descriptions = pds.Rows[i][1].ToString().Trim();
model.SYSTEM = pds.Rows[i][1+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 + 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][6].ToString().Trim();
var obj7 =model.Report = pds.Rows[i][7].ToString().Trim();
var obj8 =model.Blowingflushing = pds.Rows[i][8].ToString().Trim();
var obj9 = model.Systemreinstalled = 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][6].ToString().Trim();
//var obj7 = model.Report = pds.Rows[i][7].ToString().Trim();
//var obj8 = model.Blowingflushing = pds.Rows[i][8].ToString().Trim();
//var obj9 = model.Systemreinstalled = pds.Rows[i][9].ToString().Trim();
model.BlowingReport= pds.Rows[i][10].ToString().Trim();
//model.BlowingReport = pds.Rows[i][10].ToString().Trim();
var obj1 = model.TotalFactor = pds.Rows[i][5].ToString().Trim();
var obj6 = model.CompleteFactor = pds.Rows[i][6].ToString().Trim();
var obj7 = model.CompleteProportion = pds.Rows[i][7].ToString().Trim();
var obj8 = model.PressureTestCompleted = pds.Rows[i][8].ToString().Trim();
var obj9 = model.RinseAndBlowClean = pds.Rows[i][9].ToString().Trim();
var obj10 = model.Reduction = pds.Rows[i][10].ToString().Trim();
model.ElectricHeatTracing = pds.Rows[i][11].ToString().Trim();
model.Insulation = pds.Rows[i][12].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
@ -344,17 +355,18 @@ namespace FineUIPro.Web.Transfer
listObj.Add(obj7);
listObj.Add(obj8);
listObj.Add(obj9);
listObj.Add(obj10);
//全是NA或Completed 状态是Completed
if (listObj.Where(x=>x=="NA" || x== "Completed").ToList().Count==5)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{
model.FINALStatus = "Completed";
list.Add(model);
continue ;
continue;
}
//如果全是Not Start 就是 Not Start
if (listObj.Where(x=>x== "Not Start").ToList().Count==5)
if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
{
model.FINALStatus = "Not Start";
list.Add(model);

74
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx
View File

@ -44,7 +44,6 @@
</Items>
</f:FormRow>
<%--<f:FormRow>
<Items>
<f:GroupPanel Layout="Anchor" Title="Ready for Test" runat="server">
@ -88,7 +87,7 @@
</Items>
</f:FormRow>--%>
<f:FormRow>
<%--<f:FormRow>
<Items>
<f:GroupPanel Layout="Anchor" Title="Hydrostatic test schedule" runat="server">
<Items>
@ -115,9 +114,9 @@
</Items>
</f:GroupPanel>
</Items>
</f:FormRow>
</f:FormRow>--%>
<f:FormRow>
<%--<f:FormRow>
<Items>
<f:GroupPanel Layout="Anchor" Title="Pre-Commissioning" runat="server">
<Items>
@ -141,7 +140,74 @@
</Items>
</f:GroupPanel>
</Items>
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:GroupPanel Layout="Anchor" Title="焊接信息" runat="server">
<Items>
<f:TextBox ID="txtTotalFactor" runat="server" Label="总达因数"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtCompleteFactor" runat="server" Label="完成达因数"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
<f:TextBox ID="txtCompleteProportion" runat="server" Label="完成比例"
LabelAlign="Right" LabelWidth="180px">
</f:TextBox>
</Items>
</f:GroupPanel>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:GroupPanel Layout="Anchor" Title="试压包状态" runat="server">
<Items>
<f:DropDownList ID="ddlPressureTestCompleted" runat="server" Label="试压完成" 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="ddlRinseAndBlowClean" runat="server" Label="冲洗吹扫" 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="ddlReduction" runat="server" Label="复位" 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>
</Items>
</f:GroupPanel>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:GroupPanel Layout="Anchor" Title="其他信息" runat="server">
<Items>
<f:DropDownList ID="ddlElectricHeatTracing" runat="server" Label="电伴热" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Y" Text="Y"></f:ListItem>
<f:ListItem Value="N" Text="N"></f:ListItem>
</f:DropDownList>
<f:DropDownList ID="ddlInsulation" runat="server" Label="保温/冷" LabelWidth="180px">
<f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Y" Text="Y"></f:ListItem>
<f:ListItem Value="N" Text="N"></f:ListItem>
</f:DropDownList>
</Items>
</f:GroupPanel>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">

90
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
View File

@ -53,18 +53,26 @@ namespace FineUIPro.Web.Transfer
txtSYSTEM.Text = model.SYSTEM;
txtSubsystem.Text = model.Subsystem;
txtTestPackage.Text = model.TestPackage;
ddlPWD.SelectedValue = model.PWD;
txtDescriptions.Text = model.Descriptions;
//ddlPWD.SelectedValue = model.PWD;
//ddlApunchclosed.SelectedValue = model.Apunchclosed;
//ddlNDTReport.SelectedValue = model.NDTReport;
//ddlTemperaryMeasurement.SelectedValue = model.TemperaryMeasurement;
ddlHydrostaticTest.SelectedValue = model.HydrostaticTest;
ddlReport.SelectedValue = model.Report;
ddlBlowingflushing.SelectedValue = model.Blowingflushing;
//ddlHydrostaticTest.SelectedValue = model.HydrostaticTest;
//ddlReport.SelectedValue = model.Report;
//ddlBlowingflushing.SelectedValue = model.Blowingflushing;
//ddlFWDfinished.SelectedValue = model.FWDfinished;
ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
txtBlowingReport.Text = model.BlowingReport;
//ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
//txtBlowingReport.Text = model.BlowingReport;
txtDescriptions.Text = model.Descriptions;
txtTotalFactor.Text = model.TotalFactor;
txtCompleteFactor.Text = model.CompleteFactor;
txtCompleteProportion.Text = model.CompleteProportion;
ddlPressureTestCompleted.SelectedValue = model.PressureTestCompleted;
ddlRinseAndBlowClean.SelectedValue = model.RinseAndBlowClean;
ddlReduction.SelectedValue = model.Reduction;
ddlElectricHeatTracing.SelectedValue = model.ElectricHeatTracing;
ddlInsulation.SelectedValue = model.Insulation;
}
}
}
@ -77,38 +85,56 @@ namespace FineUIPro.Web.Transfer
SYSTEM = txtSYSTEM.Text,
Subsystem = txtSubsystem.Text,
TestPackage = txtTestPackage.Text,
PWD = ddlPWD.SelectedValue,
//PWD = ddlPWD.SelectedValue,
//Apunchclosed = ddlApunchclosed.SelectedValue,
//NDTReport= ddlNDTReport.SelectedValue,
//TemperaryMeasurement= ddlTemperaryMeasurement.SelectedValue,
HydrostaticTest=ddlHydrostaticTest.SelectedValue,
Report= ddlReport.SelectedValue,
Blowingflushing= ddlBlowingflushing.SelectedValue,
//HydrostaticTest=ddlHydrostaticTest.SelectedValue,
//Report= ddlReport.SelectedValue,
//Blowingflushing= ddlBlowingflushing.SelectedValue,
//FWDfinished= ddlFWDfinished.SelectedValue,
Systemreinstalled= ddlSystemreinstalled.SelectedValue,
BlowingReport= txtBlowingReport.Text,
Descriptions= txtDescriptions.Text
//Systemreinstalled= ddlSystemreinstalled.SelectedValue,
//BlowingReport= txtBlowingReport.Text,
TotalFactor = txtTotalFactor.Text,
CompleteFactor = txtCompleteFactor.Text,
CompleteProportion = txtCompleteProportion.Text,
PressureTestCompleted = ddlPressureTestCompleted.SelectedValue,
RinseAndBlowClean = ddlRinseAndBlowClean.SelectedValue,
Reduction = ddlReduction.SelectedValue,
ElectricHeatTracing = ddlElectricHeatTracing.SelectedValue,
Insulation = ddlInsulation.SelectedValue,
Descriptions = txtDescriptions.Text
};
#region 判断状态
var listObj = new List<string>();
listObj.Add(model.PWD);
//listObj.Add(model.PWD);
//listObj.Add(model.Apunchclosed);
//listObj.Add(model.NDTReport);
//listObj.Add(model.TemperaryMeasurement);
listObj.Add(model.HydrostaticTest);
listObj.Add(model.Report);
listObj.Add(model.Blowingflushing);
//listObj.Add(model.HydrostaticTest);
//listObj.Add(model.Report);
//listObj.Add(model.Blowingflushing);
//listObj.Add(model.FWDfinished);
listObj.Add(model.Systemreinstalled);
//listObj.Add(model.Systemreinstalled);
//listObj.Add(model.BlowingReport);
//listObj.Add(model.TotalFactor);
//listObj.Add(model.CompleteFactor);
//listObj.Add(model.CompleteProportion);
listObj.Add(model.PressureTestCompleted);
listObj.Add(model.RinseAndBlowClean);
listObj.Add(model.Reduction);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{
model.FINALStatus = "Completed";
}
//如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
{
model.FINALStatus = "Not Start";
@ -129,16 +155,26 @@ namespace FineUIPro.Web.Transfer
newModel.SYSTEM = model.SYSTEM;
newModel.Subsystem = newModel.Subsystem;
newModel.TestPackage = txtTestPackage.Text;
newModel.PWD = ddlPWD.SelectedValue;
//newModel.PWD = ddlPWD.SelectedValue;
//newModel.Apunchclosed = ddlApunchclosed.SelectedValue;
//newModel.NDTReport = ddlNDTReport.SelectedValue;
//newModel.TemperaryMeasurement = ddlTemperaryMeasurement.SelectedValue;
newModel.HydrostaticTest = ddlHydrostaticTest.SelectedValue;
newModel.Report = ddlReport.SelectedValue;
newModel.Blowingflushing = ddlBlowingflushing.SelectedValue;
//newModel.HydrostaticTest = ddlHydrostaticTest.SelectedValue;
//newModel.Report = ddlReport.SelectedValue;
//newModel.Blowingflushing = ddlBlowingflushing.SelectedValue;
//newModel.FWDfinished = ddlFWDfinished.SelectedValue;
newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
newModel.BlowingReport = txtBlowingReport.Text;
//newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
//newModel.BlowingReport = txtBlowingReport.Text;
newModel.TotalFactor = txtTotalFactor.Text;
newModel.CompleteFactor = txtCompleteFactor.Text;
newModel.CompleteProportion = txtCompleteProportion.Text;
newModel.PressureTestCompleted = ddlPressureTestCompleted.SelectedValue;
newModel.RinseAndBlowClean = ddlRinseAndBlowClean.SelectedValue;
newModel.Reduction = ddlReduction.SelectedValue;
newModel.ElectricHeatTracing = ddlElectricHeatTracing.SelectedValue;
newModel.Insulation = ddlInsulation.SelectedValue;
newModel.FINALStatus = model.FINALStatus;
newModel.Descriptions = txtDescriptions.Text;
}

42
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.designer.cs generated
View File

@ -87,58 +87,76 @@ namespace FineUIPro.Web.Transfer
protected global::FineUIPro.TextBox txtDescriptions;
/// <summary>
/// ddlPWD 控件。
/// txtTotalFactor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPWD;
protected global::FineUIPro.TextBox txtTotalFactor;
/// <summary>
/// ddlHydrostaticTest 控件。
/// txtCompleteFactor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlHydrostaticTest;
protected global::FineUIPro.TextBox txtCompleteFactor;
/// <summary>
/// ddlReport 控件。
/// txtCompleteProportion 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlReport;
protected global::FineUIPro.TextBox txtCompleteProportion;
/// <summary>
/// ddlBlowingflushing 控件。
/// ddlPressureTestCompleted 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlBlowingflushing;
protected global::FineUIPro.DropDownList ddlPressureTestCompleted;
/// <summary>
/// ddlSystemreinstalled 控件。
/// ddlRinseAndBlowClean 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlSystemreinstalled;
protected global::FineUIPro.DropDownList ddlRinseAndBlowClean;
/// <summary>
/// txtBlowingReport 控件。
/// ddlReduction 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtBlowingReport;
protected global::FineUIPro.DropDownList ddlReduction;
/// <summary>
/// ddlElectricHeatTracing 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlElectricHeatTracing;
/// <summary>
/// ddlInsulation 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlInsulation;
/// <summary>
/// Toolbar1 控件。

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

@ -39,7 +39,7 @@
</f:DropDownList>
<f:DropDownList ID="ddlMatI" runat="server" Label="Mat'l" AutoPostBack="true" Width="80px" LabelWidth="40px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="Y" Text="Y"></f:ListItem>
<%--<f:ListItem Value="Y" Text="Y"></f:ListItem>--%>
<f:ListItem Value="Y1" Text="Y1"></f:ListItem>
<f:ListItem Value="Y2" Text="Y2"></f:ListItem>
<f:ListItem Value="N" Text="N"></f:ListItem>
@ -63,7 +63,7 @@
<f:ListItem Value="PWD" Text="PWD"></f:ListItem>
<f:ListItem Value="FWD" Text="FWD"></f:ListItem>
</f:DropDownList>
<f:TextBox runat="server" ID="txtAction_By" Label="Action By" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>
<%--<f:TextBox runat="server" ID="txtAction_By" Label="Action By" LabelWidth="80px" LabelAlign="Right" Width="180px"></f:TextBox>--%>
<f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="180px"></f:TextBox>
<f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="180px" LabelAlign="Right" Width="300px"></f:TextBox>
<f:DropDownList ID="ddlStatus" runat="server" Label="状态/Status" AutoPostBack="true" Width="200px" LabelWidth="100px">
@ -78,7 +78,7 @@
</f:Button>
</Items>
</f:Toolbar>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="100px"
Width="220px">
@ -102,7 +102,7 @@
<f:DatePicker runat="server" ID="txtEndActual_Date" LabelAlign="Right" Width="110px">
</f:DatePicker>
</Items>
</f:Toolbar>
</f:Toolbar>--%>
</Toolbars>
<Columns>

70
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
View File

@ -62,36 +62,36 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Sub_Sys_No like @Sub_Sys_No";
listStr.Add(new SqlParameter("@Sub_Sys_No", "%" + this.txtSub_Sys_No.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
{
strSql += " AND Date_Raised >= @StartDate_Raised";
listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim()))
{
strSql += " AND Date_Raised <= @EndDate_Raised";
listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
{
strSql += " AND Required_Date >= @StartRequired_Date";
listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
{
strSql += " AND Required_Date <= @EndRequired_Date";
listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
{
strSql += " AND Actual_Date >= @StartActual_Date";
listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
}
if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
{
strSql += " AND Actual_Date <= @EndActual_Date";
listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
}
//if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
//{
// strSql += " AND Date_Raised >= @StartDate_Raised";
// listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndDate_Raised.Text.Trim()))
//{
// strSql += " AND Date_Raised <= @EndDate_Raised";
// listStr.Add(new SqlParameter("@EndDate_Raised", Funs.GetNewDateTime(txtEndDate_Raised.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtStartRequired_Date.Text.Trim()))
//{
// strSql += " AND Required_Date >= @StartRequired_Date";
// listStr.Add(new SqlParameter("@StartRequired_Date", Funs.GetNewDateTime(txtStartRequired_Date.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndRequired_Date.Text.Trim()))
//{
// strSql += " AND Required_Date <= @EndRequired_Date";
// listStr.Add(new SqlParameter("@EndRequired_Date", Funs.GetNewDateTime(txtEndRequired_Date.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtStartActual_Date.Text.Trim()))
//{
// strSql += " AND Actual_Date >= @StartActual_Date";
// listStr.Add(new SqlParameter("@StartActual_Date", Funs.GetNewDateTime(txtStartActual_Date.Text.Trim())));
//}
//if (!string.IsNullOrEmpty(txtEndActual_Date.Text.Trim()))
//{
// strSql += " AND Actual_Date <= @EndActual_Date";
// listStr.Add(new SqlParameter("@EndActual_Date", Funs.GetNewDateTime(txtEndActual_Date.Text.Trim())));
//}
if (!string.IsNullOrEmpty(txtDisc.Text.Trim()))
{
strSql += " AND Disc = @Disc";
@ -117,11 +117,11 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Cat = @Cat";
listStr.Add(new SqlParameter("@Cat", ddlCat.SelectedValue.Trim()));
}
if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
{
strSql += " AND Action_By = @Action_By";
listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
}
//if (!string.IsNullOrEmpty(txtAction_By.Text.Trim()))
//{
// strSql += " AND Action_By = @Action_By";
// listStr.Add(new SqlParameter("@Action_By", txtAction_By.Text.Trim()));
//}
if (!string.IsNullOrEmpty(txtPIC.Text.Trim()))
{
strSql += " AND PIC = @PIC";

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

@ -167,15 +167,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.DropDownList ddlPunchType;
/// <summary>
/// txtAction_By 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtAction_By;
/// <summary>
/// txtPIC 控件。
/// </summary>
@ -212,96 +203,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtStartDate_Raised 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate_Raised;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndDate_Raised 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate_Raised;
/// <summary>
/// txtStartRequired_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartRequired_Date;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label2;
/// <summary>
/// txtEndRequired_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndRequired_Date;
/// <summary>
/// txtStartActual_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartActual_Date;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// txtEndActual_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndActual_Date;
/// <summary>
/// lbPhotoesImageUrl 控件。
/// </summary>

989
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff