Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN
This commit is contained in:
commit
d8e79a9fd8
|
|
@ -19321,7 +19321,7 @@
|
|||
</FlavorProperties>
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
|
|
|
|||
|
|
@ -28,13 +28,13 @@ namespace FineUIPro.Web.Transfer.Chart
|
|||
{
|
||||
var systemCode = Funs.DB.Transfer_LHCSystemList
|
||||
.Where(x => x.ProjectId == CurrUser.LoginProjectId)
|
||||
.GroupBy(p => new { p.Commissioningsystemcode })
|
||||
.Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
|
||||
.GroupBy(p => new { p.SubCommissioningsystem })
|
||||
.Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList();
|
||||
int indexRow = 1;
|
||||
ddlSubSysNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
|
||||
foreach (var t in systemCode)
|
||||
{
|
||||
ddlSubSysNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode));
|
||||
ddlSubSysNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SubCommissioningsystem, t.SubCommissioningsystem));
|
||||
indexRow++;
|
||||
}
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ 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
|
||||
|
||||
from(
|
||||
SELECT Commissioningsystemcode as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by Commissioningsystemcode,ProjectId
|
||||
SELECT SubCommissioningsystem as SubSysNo,ProjectId FROM Transfer_LHCSystemList group by SubCommissioningsystem,ProjectId
|
||||
) f
|
||||
left join Transfer_SystemControl ts on f.ProjectId=ts.ProjectId and f.SubSysNo=ts.SystemNo
|
||||
--piping
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ namespace FineUIPro.Web.Transfer.Chart
|
|||
if (!IsPostBack) {
|
||||
var systemCode = Funs.DB.Transfer_LHCSystemList
|
||||
.Where(x => x.ProjectId == CurrUser.LoginProjectId)
|
||||
.GroupBy(p => new { p.Commissioningsystemcode })
|
||||
.Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
|
||||
.GroupBy(p => new { p.SubCommissioningsystem })
|
||||
.Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList();
|
||||
int indexRow = 1;
|
||||
ddlSystemNo.Items.Insert(0, new FineUIPro.ListItem("ALL", ""));
|
||||
foreach (var t in systemCode)
|
||||
{
|
||||
ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.Commissioningsystemcode, t.Commissioningsystemcode));
|
||||
ddlSystemNo.Items.Insert(indexRow, new FineUIPro.ListItem(t.SubCommissioningsystem, t.SubCommissioningsystem));
|
||||
indexRow++;
|
||||
}
|
||||
|
||||
|
|
@ -40,15 +40,15 @@ namespace FineUIPro.Web.Transfer.Chart
|
|||
#region 统计所有
|
||||
var systemCode = Funs.DB.Transfer_LHCSystemList
|
||||
.Where(x => x.ProjectId == CurrUser.LoginProjectId)
|
||||
.GroupBy(p => new { p.Commissioningsystemcode })
|
||||
.Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
|
||||
.GroupBy(p => new { p.SubCommissioningsystem })
|
||||
.Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList();
|
||||
|
||||
if (!string.IsNullOrEmpty(ddlSystemNo.SelectedValue))
|
||||
{
|
||||
systemCode= Funs.DB.Transfer_LHCSystemList
|
||||
.Where(x => x.ProjectId == CurrUser.LoginProjectId && x.Commissioningsystemcode == ddlSystemNo.SelectedValue)
|
||||
.GroupBy(p => new { p.Commissioningsystemcode })
|
||||
.Select(p => new { Commissioningsystemcode = p.Key.Commissioningsystemcode }).ToList();
|
||||
.Where(x => x.ProjectId == CurrUser.LoginProjectId && x.SubCommissioningsystem == ddlSystemNo.SelectedValue)
|
||||
.GroupBy(p => new { p.SubCommissioningsystem })
|
||||
.Select(p => new { SubCommissioningsystem = p.Key.SubCommissioningsystem }).ToList();
|
||||
}
|
||||
#region 九个表的数据
|
||||
var list1 = Funs.DB.Transfer_Piping.Where(x => x.ProjectId == pid).ToList();
|
||||
|
|
@ -67,7 +67,7 @@ namespace FineUIPro.Web.Transfer.Chart
|
|||
dt.Columns.Add("进行中数量", typeof(string));
|
||||
dt.Columns.Add("未完成数量", typeof(string));
|
||||
foreach (var t in systemCode) {
|
||||
var scode = t.Commissioningsystemcode;
|
||||
var scode = t.SubCommissioningsystem;
|
||||
AllSystemNo += "'" + scode + "',";
|
||||
DataRow dr = dt.NewRow();
|
||||
dr["系统编号"] = scode;
|
||||
|
|
|
|||
|
|
@ -74,24 +74,23 @@
|
|||
<f:ListItem Value="In progress" Text="In progress"></f:ListItem>
|
||||
<f:ListItem Value="Not Start" Text="Not Start"></f:ListItem>
|
||||
</f:DropDownList>
|
||||
|
||||
<f:TextBox ID="txtTurnoverDescription" runat="server" Label="Turnover Description" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
<f:DropDownList ID="ddlElectricHeatTracing" runat="server" Label="电伴热" >
|
||||
<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="保温/冷" >
|
||||
<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:FormRow>
|
||||
|
||||
|
||||
<f:FormRow>
|
||||
<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>
|
||||
<f:TextBox ID="txtTurnoverDescription" runat="server" Label="Turnover Description" LabelWidth="200px" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
|
||||
|
|
|
|||
|
|
@ -140,15 +140,6 @@ namespace FineUIPro.Web.Transfer.Chart
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlSystemStatus;
|
||||
|
||||
/// <summary>
|
||||
/// txtTurnoverDescription 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtTurnoverDescription;
|
||||
|
||||
/// <summary>
|
||||
/// ddlElectricHeatTracing 控件。
|
||||
/// </summary>
|
||||
|
|
@ -167,6 +158,15 @@ namespace FineUIPro.Web.Transfer.Chart
|
|||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlInsulation;
|
||||
|
||||
/// <summary>
|
||||
/// txtTurnoverDescription 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtTurnoverDescription;
|
||||
|
||||
/// <summary>
|
||||
/// txtRemark 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@
|
|||
|
||||
<f:RenderField ColumnID="SubCommissioningsystem" DataField="SubCommissioningsystem"
|
||||
FieldType="String" HeaderText="Sub-system No" TextAlign="Center"
|
||||
HeaderTextAlign="Center" MinWidth="120px">
|
||||
HeaderTextAlign="Center" MinWidth="180px">
|
||||
</f:RenderField>
|
||||
|
||||
<f:RenderField ColumnID="PlanStartofTestingDate" DataField="PlanStartofTestingDate" FieldType="Date" Renderer="Date"
|
||||
|
|
|
|||
Loading…
Reference in New Issue