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

提交代码

This commit is contained in:
高飞 2024-12-24 19:25:18 +08:00
parent 189a020cc7
commit fabf86ce86
19 changed files with 70 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -346,31 +346,31 @@ namespace FineUIPro.Web.Transfer.Chart
from #AllPunchlistFromSortTemp1 Group by Disc; "); from #AllPunchlistFromSortTemp1 Group by Disc; ");
strSql.AppendLine(@" update a set strSql.AppendLine(@" update a set
allCount=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc), allCount=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc),
allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Required_Date is not null or b.Required_Date!='')), allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and b.Status = 'Completed'),
allWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), allWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
allBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Verified_Date is not null or b.Verified_Date!='')), allBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc and (b.Verified_Date is not null or b.Verified_Date!='')),
a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')), a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')),
a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and b.Status = 'Completed'),
a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) , ,a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ,
a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and b.Status = 'Completed'),
a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) , ,a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ,
a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and b.Status = 'Completed'),
a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) , ,a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ,
a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and b.Status = 'Completed'),
a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromSortTemp1 b where a.Disc=b.Disc AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!=''))
@ -489,31 +489,31 @@ namespace FineUIPro.Web.Transfer.Chart
from #AllPunchlistFromSortTemp2 Group by Action_By; "); from #AllPunchlistFromSortTemp2 Group by Action_By; ");
strSql.AppendLine(@" update a set strSql.AppendLine(@" update a set
allCount=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By), allCount=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By),
allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Required_Date is not null or b.Required_Date!='')), allfinshedCount=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and b.Status = 'Completed'),
allWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), allWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
allBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Verified_Date is not null or b.Verified_Date!='')), allBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By and (b.Verified_Date is not null or b.Verified_Date!='')),
a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')), a.Cat_A_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')),
a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_A_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and b.Status = 'Completed'),
a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) , ,a.Cat_B_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ,
a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_B_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and b.Status = 'Completed'),
a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) , ,a.Cat_C_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ,
a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_C_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and b.Status = 'Completed'),
a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) , ,a.Cat_D_Count=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ,
a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_D_Countf=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and b.Status = 'Completed'),
a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromSortTemp2 b where a.Action_By=b.Action_By AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!=''))
@ -680,31 +680,31 @@ namespace FineUIPro.Web.Transfer.Chart
from #AllPunchlistFromProgressTemp Group by Sub_Sys_No; "); from #AllPunchlistFromProgressTemp Group by Sub_Sys_No; ");
strSql.AppendLine(@" update a set strSql.AppendLine(@" update a set
allCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No), allCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No),
allfinshedCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Required_Date is not null or b.Required_Date!='')), allfinshedCount=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and b.Status = 'Completed'),
allWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), allWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
allBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Verified_Date is not null or b.Verified_Date!='')), allBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No and (b.Verified_Date is not null or b.Verified_Date!='')),
a.Cat_A_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')), a.Cat_A_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a')),
a.Cat_A_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_A_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and b.Status = 'Completed'),
a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_A_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_A_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='A' or isnull(b.Cat,'')='a') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_B_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) , ,a.Cat_B_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b')) ,
a.Cat_B_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_B_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and b.Status = 'Completed'),
a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_B_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_B_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='B' or isnull(b.Cat,'')='b') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_C_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) , ,a.Cat_C_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c')) ,
a.Cat_C_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_C_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and b.Status = 'Completed'),
a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_C_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_C_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='C' or isnull(b.Cat,'')='c') and (b.Verified_Date is not null or b.Verified_Date!=''))
,a.Cat_D_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) , ,a.Cat_D_Count=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d')) ,
a.Cat_D_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Required_Date is not null or b.Required_Date!='')), a.Cat_D_Countf=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and b.Status = 'Completed'),
a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')), a.Cat_D_CountWUH=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Confirmed_Date is not null or b.Confirmed_Date!='')),
a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!='')) a.Cat_D_CountBASF=(select count(1) from #AllPunchlistFromProgressTemp b where a.Sub_Sys_No=b.Sub_Sys_No AND (isnull(b.Cat,'')='D' or isnull(b.Cat,'')='d') and (b.Verified_Date is not null or b.Verified_Date!=''))
@ -772,17 +772,17 @@ namespace FineUIPro.Web.Transfer.Chart
allBASF += Convert.ToInt32(row["allBASF"]); allBASF += Convert.ToInt32(row["allBASF"]);
} }
//var Cat_A_CountPercent = 100 * ((float)Cat_A_Countf / (float)cat_A_Count); var Cat_A_CountPercent = Cat_A_Countf > 0 && cat_A_Count > 0 ? 100 * ((float)Cat_A_Countf / (float)cat_A_Count) : 0;
//var Cat_B_CountPercent = 100 * ((float)Cat_B_Countf / (float)cat_B_Count); var Cat_B_CountPercent = Cat_B_Countf > 0 && cat_B_Count > 0 ? 100 * ((float)Cat_B_Countf / (float)cat_B_Count) : 0;
//var Cat_C_CountPercent = 100 * ((float)Cat_C_Countf / (float)cat_C_Count); var Cat_C_CountPercent = Cat_C_Countf > 0 && cat_C_Count > 0 ? 100 * ((float)Cat_C_Countf / (float)cat_C_Count) : 0;
//var Cat_D_CountPercent = 100 * ((float)Cat_D_Countf / (float)cat_D_Count); var Cat_D_CountPercent = Cat_D_Countf > 0 && cat_D_Count > 0 ? 100 * ((float)Cat_D_Countf / (float)cat_D_Count) : 0;
//var allCountPercent = 100 * ((float)allfinshedCount / (float)allCount); var allCountPercent = allfinshedCount > 0 && allCount > 0 ? 100 * ((float)allfinshedCount / (float)allCount) : 0;
var Cat_A_CountPercent = Cat_A_Countf > 0 && cat_A_Count > 0 ? 100 * ((decimal)(Cat_A_Countf / cat_A_Count)) : 0; //var Cat_A_CountPercent = Cat_A_Countf > 0 && cat_A_Count > 0 ? 100 * ((decimal)(Cat_A_Countf / cat_A_Count)) : 0;
var Cat_B_CountPercent = Cat_B_Countf > 0 && cat_B_Count > 0 ? 100 * ((decimal)(Cat_B_Countf / cat_B_Count)) : 0; //var Cat_B_CountPercent = Cat_B_Countf > 0 && cat_B_Count > 0 ? 100 * ((decimal)(Cat_B_Countf / cat_B_Count)) : 0;
var Cat_C_CountPercent = Cat_C_Countf > 0 && cat_C_Count > 0 ? 100 * ((decimal)(Cat_C_Countf / cat_C_Count)) : 0; //var Cat_C_CountPercent = Cat_C_Countf > 0 && cat_C_Count > 0 ? 100 * ((decimal)(Cat_C_Countf / cat_C_Count)) : 0;
var Cat_D_CountPercent = Cat_D_Countf > 0 && cat_D_Count > 0 ? 100 * ((decimal)(Cat_D_Countf / cat_D_Count)) : 0; //var Cat_D_CountPercent = Cat_D_Countf > 0 && cat_D_Count > 0 ? 100 * ((decimal)(Cat_D_Countf / cat_D_Count)) : 0;
var allCountPercent = allfinshedCount > 0 && allCount > 0 ? 100 * ((decimal)(allfinshedCount / allCount)) : 0; //var allCountPercent = allfinshedCount > 0 && allCount > 0 ? 100 * ((decimal)(allfinshedCount / allCount)) : 0;
JObject summary = new JObject(); JObject summary = new JObject();
summary.Add("SubSysNo", "合计"); summary.Add("SubSysNo", "合计");

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

@ -56,6 +56,7 @@
<f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server"> <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
<Items> <Items>
<f:DropDownList ID="ddlFoundation" runat="server" Label="Construction" LabelWidth="180px"> <f:DropDownList ID="ddlFoundation" runat="server" Label="Construction" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -63,6 +64,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlMainstructure" runat="server" Label="CQVD" LabelWidth="180px"> <f:DropDownList ID="ddlMainstructure" runat="server" Label="CQVD" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>

2
SGGL/FineUIPro.Web/Transfer/CivilStructureEdit.aspx.cs
View File

@ -112,6 +112,8 @@ namespace FineUIPro.Web.Transfer
//listObj.Add(model.Electrical); //listObj.Add(model.Electrical);
//listObj.Add(model.FireFighting); //listObj.Add(model.FireFighting);
//listObj.Add(model.HVAC); //listObj.Add(model.HVAC);
model.FINAL_Status = "Not Start";
//全是NA或Completed 状态是Completed //全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 2) if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 2)
{ {

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

@ -56,6 +56,7 @@
<f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server"> <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
<Items> <Items>
<f:DropDownList ID="ddlInstallation" runat="server" Label="Installation&Inspection Reocrd" LabelWidth="180px"> <f:DropDownList ID="ddlInstallation" runat="server" Label="Installation&Inspection Reocrd" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -63,6 +64,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlCommunicationtest" runat="server" Label="Communication test" LabelWidth="180px"> <f:DropDownList ID="ddlCommunicationtest" runat="server" Label="Communication test" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -70,6 +72,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlCableLaying" runat="server" Label="Cable Laying and Insulation Test Record" LabelWidth="180px"> <f:DropDownList ID="ddlCableLaying" runat="server" Label="Cable Laying and Insulation Test Record" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -77,6 +80,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlLoopTest" runat="server" Label="Loop Test" LabelWidth="180px"> <f:DropDownList ID="ddlLoopTest" runat="server" Label="Loop Test" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>

1
SGGL/FineUIPro.Web/Transfer/ElectricalEdit.aspx.cs
View File

@ -99,6 +99,7 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.CableLaying); listObj.Add(model.CableLaying);
listObj.Add(model.LoopTest); listObj.Add(model.LoopTest);
model.FINAL_Status = "Not Start";
//全是NA或Completed 状态是Completed //全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4) if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
{ {

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

@ -51,6 +51,7 @@
<f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server"> <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
<Items> <Items>
<f:DropDownList ID="ddlInstallation" runat="server" Label="Installation" LabelWidth="180px"> <f:DropDownList ID="ddlInstallation" runat="server" Label="Installation" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -58,6 +59,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlDebugging" runat="server" Label="Debugging" LabelWidth="180px"> <f:DropDownList ID="ddlDebugging" runat="server" Label="Debugging" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -65,6 +67,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlAcceptancecheck" runat="server" Label="Acceptance check" LabelWidth="180px"> <f:DropDownList ID="ddlAcceptancecheck" runat="server" Label="Acceptance check" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>

2
SGGL/FineUIPro.Web/Transfer/FirefightingEdit.aspx.cs
View File

@ -84,6 +84,8 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.Installation); listObj.Add(model.Installation);
listObj.Add(model.Debugging); listObj.Add(model.Debugging);
listObj.Add(model.Acceptancecheck); listObj.Add(model.Acceptancecheck);
model.FINAL_Status = "Not Start";
//全是NA或Completed 状态是Completed //全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{ {

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

@ -63,6 +63,7 @@
</f:DropDownList>--%> </f:DropDownList>--%>
<f:DropDownList ID="ddlInstallationCalibration" runat="server" Label="Installation" LabelWidth="180px"> <f:DropDownList ID="ddlInstallationCalibration" runat="server" Label="Installation" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -84,6 +85,7 @@
</f:DropDownList>--%> </f:DropDownList>--%>
<f:DropDownList ID="ddlPipingBlowing" runat="server" Label="Piping Blowing" LabelWidth="180px"> <f:DropDownList ID="ddlPipingBlowing" runat="server" Label="Piping Blowing" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -91,6 +93,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlLooptest" runat="server" Label="Loop test" LabelWidth="180px"> <f:DropDownList ID="ddlLooptest" runat="server" Label="Loop test" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>

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

@ -105,6 +105,7 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.Looptest); listObj.Add(model.Looptest);
//listObj.Add(model.Calibration); //listObj.Add(model.Calibration);
model.FINAL_Status = "Not Start";
//全是NA或Completed 状态是Completed //全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{ {

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

@ -176,6 +176,7 @@
<f:GroupPanel Layout="Anchor" Title="试压包状态" runat="server"> <f:GroupPanel Layout="Anchor" Title="试压包状态" runat="server">
<Items> <Items>
<f:DropDownList ID="ddlPressureTestCompleted" runat="server" Label="试压完成" LabelWidth="180px"> <f:DropDownList ID="ddlPressureTestCompleted" runat="server" Label="试压完成" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -183,6 +184,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlRinseAndBlowClean" runat="server" Label="冲洗吹扫" LabelWidth="180px"> <f:DropDownList ID="ddlRinseAndBlowClean" runat="server" Label="冲洗吹扫" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -190,6 +192,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlReduction" runat="server" Label="复位" LabelWidth="180px"> <f:DropDownList ID="ddlReduction" runat="server" Label="复位" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>

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

@ -140,6 +140,7 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.RinseAndBlowClean); listObj.Add(model.RinseAndBlowClean);
listObj.Add(model.Reduction); listObj.Add(model.Reduction);
model.FINALStatus = "Not Start";
//全是NA或Completed 状态是Completed //全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{ {

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

@ -51,6 +51,7 @@
<f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server"> <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
<Items> <Items>
<f:DropDownList ID="ddlNdt" runat="server" Label="NDT" LabelWidth="180px"> <f:DropDownList ID="ddlNdt" runat="server" Label="NDT" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -58,6 +59,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlFlushing" runat="server" Label="Flushing" LabelWidth="180px"> <f:DropDownList ID="ddlFlushing" runat="server" Label="Flushing" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -65,6 +67,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlRunningTest" runat="server" Label="Running Test" LabelWidth="180px"> <f:DropDownList ID="ddlRunningTest" runat="server" Label="Running Test" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>

2
SGGL/FineUIPro.Web/Transfer/PlumbingEdit.aspx.cs
View File

@ -84,6 +84,8 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.Ndt); listObj.Add(model.Ndt);
listObj.Add(model.Flushing); listObj.Add(model.Flushing);
listObj.Add(model.RunningTest); listObj.Add(model.RunningTest);
model.FINAL_Status = "Not Start";
//全是NA或Completed 状态是Completed //全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{ {

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

@ -56,6 +56,7 @@
<f:GroupPanel Layout="Anchor" Title="" runat="server"> <f:GroupPanel Layout="Anchor" Title="" runat="server">
<Items> <Items>
<f:DropDownList ID="ddlAlignment" runat="server" Label="Alignment" LabelWidth="180px"> <f:DropDownList ID="ddlAlignment" runat="server" Label="Alignment" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -63,6 +64,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlLubricatefilling" runat="server" Label="Lubricate filling" LabelWidth="180px"> <f:DropDownList ID="ddlLubricatefilling" runat="server" Label="Lubricate filling" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -70,6 +72,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlMotorsoloruntest" runat="server" Label="Motor solorun test" LabelWidth="180px"> <f:DropDownList ID="ddlMotorsoloruntest" runat="server" Label="Motor solorun test" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -77,6 +80,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlStandalonetest" runat="server" Label="Standalone test" LabelWidth="180px"> <f:DropDownList ID="ddlStandalonetest" runat="server" Label="Standalone test" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>

2
SGGL/FineUIPro.Web/Transfer/RotatingEquipmentEdit.aspx.cs
View File

@ -96,6 +96,8 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.Motorsoloruntest); listObj.Add(model.Motorsoloruntest);
listObj.Add(model.Standalonetest); listObj.Add(model.Standalonetest);
listObj.Add(model.Lubricatefilling); listObj.Add(model.Lubricatefilling);
model.MechanicalFINALStatus = "Not Start";
//全是NA或Completed 状态是Completed //全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4) if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
{ {

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

@ -56,6 +56,7 @@
<f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server"> <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
<Items> <Items>
<f:DropDownList ID="ddlInternalinspection" runat="server" Label="Construction" LabelWidth="180px"> <f:DropDownList ID="ddlInternalinspection" runat="server" Label="Construction" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -63,6 +64,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlInternalsPacking" runat="server" Label="Internals/Packing installation" LabelWidth="180px"> <f:DropDownList ID="ddlInternalsPacking" runat="server" Label="Internals/Packing installation" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -70,6 +72,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlBOXupRecord" runat="server" Label="BOX-up Record" LabelWidth="180px"> <f:DropDownList ID="ddlBOXupRecord" runat="server" Label="BOX-up Record" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>

1
SGGL/FineUIPro.Web/Transfer/StaticEquipmentEdit.aspx.cs
View File

@ -95,6 +95,7 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.InternalsPacking); listObj.Add(model.InternalsPacking);
listObj.Add(model.BOXupRecord); listObj.Add(model.BOXupRecord);
model.MechanicalFINALStatus = "Not Start";
//全是NA或Completed 状态是Completed //全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3) if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{ {

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

@ -56,6 +56,7 @@
<f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server"> <f:GroupPanel Layout="Anchor" Title="Test Package Schedule" runat="server">
<Items> <Items>
<f:DropDownList ID="ddlInstallation" runat="server" Label="Installation&Inspection Reocrd" LabelWidth="180px"> <f:DropDownList ID="ddlInstallation" runat="server" Label="Installation&Inspection Reocrd" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -63,6 +64,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlCommunication" runat="server" Label="Communication test" LabelWidth="180px"> <f:DropDownList ID="ddlCommunication" runat="server" Label="Communication test" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -70,6 +72,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlCableLaying" runat="server" Label="Cable Laying and Insulation Test Record" LabelWidth="180px"> <f:DropDownList ID="ddlCableLaying" runat="server" Label="Cable Laying and Insulation Test Record" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>
@ -77,6 +80,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="ddlFunctionTest" runat="server" Label="Function Test" LabelWidth="180px"> <f:DropDownList ID="ddlFunctionTest" runat="server" Label="Function Test" LabelWidth="180px">
<f:ListItem Value="" Text=""></f:ListItem>
<f:ListItem Value="NA" Text="NA"></f:ListItem> <f:ListItem Value="NA" Text="NA"></f:ListItem>
<f:ListItem Value="Completed" Text="Completed"></f:ListItem> <f:ListItem Value="Completed" Text="Completed"></f:ListItem>
<f:ListItem Value="In progress" Text="In progress"></f:ListItem> <f:ListItem Value="In progress" Text="In progress"></f:ListItem>

7
SGGL/FineUIPro.Web/Transfer/TelecomEdit.aspx.cs
View File

@ -87,7 +87,7 @@ namespace FineUIPro.Web.Transfer
Communication = ddlCommunication.SelectedValue, Communication = ddlCommunication.SelectedValue,
CableLaying = ddlCableLaying.SelectedValue, CableLaying = ddlCableLaying.SelectedValue,
FunctionTest = ddlFunctionTest.SelectedValue, FunctionTest = ddlFunctionTest.SelectedValue,
Descriptions= txtDescriptions.Text, Descriptions = txtDescriptions.Text,
}; };
#region 判断状态 #region 判断状态
@ -96,8 +96,10 @@ namespace FineUIPro.Web.Transfer
listObj.Add(model.Communication); listObj.Add(model.Communication);
listObj.Add(model.CableLaying); listObj.Add(model.CableLaying);
listObj.Add(model.FunctionTest); listObj.Add(model.FunctionTest);
model.FINAL_Status = "Not Start";
//全是NA或Completed 状态是Completed //全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count ==4) if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
{ {
model.FINAL_Status = "Completed"; model.FINAL_Status = "Completed";
} }
@ -106,7 +108,6 @@ namespace FineUIPro.Web.Transfer
{ {
model.FINAL_Status = "Not Start"; model.FINAL_Status = "Not Start";
} }
//如果其中有一项是In progress 或Not Start 是 In progress //如果其中有一项是In progress 或Not Start 是 In progress
else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1) else if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
{ {