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

移交调整

This commit is contained in:
夏菊 2024-12-06 09:09:51 +08:00
parent 20363206d7
commit f31a3fe9fa
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@
</f:DropDownList> </f:DropDownList>
<f:DropDownList ID="drpType" runat="server" Label="Type" LabelAlign="Right" <f:DropDownList ID="drpType" runat="server" Label="Type" LabelAlign="Right"
LabelWidth="80px"> LabelWidth="80px">
<f:ListItem Value="" Text="" /> <f:ListItem Value="" Text="ALL" />
<f:ListItem Value="0" Text="工艺系统清单" /> <f:ListItem Value="0" Text="工艺系统清单" />
<f:ListItem Value="1" Text="非工艺系统清单" /> <f:ListItem Value="1" Text="非工艺系统清单" />
</f:DropDownList> </f:DropDownList>
@ -55,6 +55,10 @@
FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center" FieldType="String" HeaderText="Turnover<br/>System Code" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="180px" EnableLock="true" Locked="true"> HeaderTextAlign="Center" MinWidth="180px" EnableLock="true" Locked="true">
</f:RenderField> </f:RenderField>
<f:RenderField ColumnID="CommissioningCodeDescription" DataField="CommissioningCodeDescription"
FieldType="String" HeaderText="Commissioning Code<br/>Description" TextAlign="Center"
HeaderTextAlign="Center" MinWidth="300px" EnableLock="true" Locked="true">
</f:RenderField>
<f:RenderField MinWidth="100px" ColumnID="PlanPWD" DataField="PlanPWD" <f:RenderField MinWidth="100px" ColumnID="PlanPWD" DataField="PlanPWD"
HeaderText="Plan PWD<br/>计划PWD" TextAlign="Center" HeaderText="Plan PWD<br/>计划PWD" TextAlign="Center"

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

@ -45,7 +45,7 @@ namespace FineUIPro.Web.Transfer.Chart
public DataTable DataSql() public DataTable DataSql()
{ {
string strSql = @"select f.SubSysNo,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation, string strSql = @"select f.SubSysNo,lhcs.CommissioningCodeDescription,f.ProjectId,tpi3.TotalFactor,tpi3.CompleteFactor,ts.ElectricHeatTracing,ts.Insulation,
case ISNULL(tpi3.TotalFactor,0) when 0 then 0 case ISNULL(tpi3.TotalFactor,0) when 0 then 0
else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi3.CompleteFactor,0)*1.0/ISNULL(tpi3.TotalFactor,0))) end CompleteProportion, else CONVERT(DECIMAL(10,2),100*(ISNULL(tpi3.CompleteFactor,0)*1.0/ISNULL(tpi3.TotalFactor,0))) end CompleteProportion,
@ -86,8 +86,9 @@ else CONVERT(DECIMAL(10,2),100*(ISNULL(TtScount,0)*1.0/ISNULL(TtCount,0))) end
ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark ts.PlanPWD,PlanJWD,McPlan,SubmitPackage,ActualPWD,ActualJWD,ActualMC,Commissioning,IaQian,TcccQ,SystemStatus,TurnoverDescription,ts.Remark
from( from(
SELECT SubCommissioningsystem as SubSysNo,SN,Type,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,SN,Type,ProjectId SELECT SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList where ProjectId = @ProjectId group by SubCommissioningsystem,ProjectId
) f ) f
left join Transfer_LHCSystemList lhcs on f.ProjectId=lhcs.ProjectId and f.SubSysNo=lhcs.SubCommissioningsystem
left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
--piping --piping
@ -171,12 +172,12 @@ where f.ProjectId = @ProjectId ";
} }
if (!string.IsNullOrEmpty(drpType.SelectedValue)) if (!string.IsNullOrEmpty(drpType.SelectedValue))
{ {
strSql += " AND f.Type='" + drpType.SelectedValue + "' "; strSql += " AND lhcs.Type='" + drpType.SelectedValue + "' ";
} }
//strSql += " order by f.Type "; //strSql += " order by f.Type ";
//strSql += " order by f.SubSysNo "; //strSql += " order by f.SubSysNo ";
strSql += " order by f.Type,f.SN "; strSql += " order by lhcs.Type,lhcs.SN ";
SqlParameter[] parameter = listStr.ToArray(); SqlParameter[] parameter = listStr.ToArray();
return SQLHelper.GetDataTableRunText(strSql, parameter); return SQLHelper.GetDataTableRunText(strSql, parameter);
} }