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

移交调整

This commit is contained in:
夏菊 2024-12-03 19:00:05 +08:00
parent ce75af6899
commit ce83292f2a
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

18
SGGL/FineUIPro.Web/Transfer/Chart/SystemstatusChart.aspx.cs
View File

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

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

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