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

修改移交管理，增加统计报表以及添加字段

Browse Source
This commit is contained in:
潘鸿锋
2024-08-30 17:45:02 +08:00
parent 7311a2b6fa
commit d21533d599
30 changed files with 885 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
+19 -18
View File
@@ -54,13 +54,13 @@ namespace FineUIPro.Web.Transfer
txtSubsystem.Text = model.Subsystem;
txtTestPackage.Text = model.TestPackage;
ddlPWD.SelectedValue = model.PWD;
ddlApunchclosed.SelectedValue = model.Apunchclosed;
ddlNDTReport.SelectedValue = model.NDTReport;
ddlTemperaryMeasurement.SelectedValue = model.TemperaryMeasurement;
//ddlApunchclosed.SelectedValue = model.Apunchclosed;
//ddlNDTReport.SelectedValue = model.NDTReport;
//ddlTemperaryMeasurement.SelectedValue = model.TemperaryMeasurement;
ddlHydrostaticTest.SelectedValue = model.HydrostaticTest;
ddlReport.SelectedValue = model.Report;
ddlBlowingflushing.SelectedValue = model.Blowingflushing;
ddlFWDfinished.SelectedValue = model.FWDfinished;
//ddlFWDfinished.SelectedValue = model.FWDfinished;
ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
txtBlowingReport.Text = model.BlowingReport;
@@ -78,13 +78,13 @@ namespace FineUIPro.Web.Transfer
Subsystem = txtSubsystem.Text,
TestPackage = txtTestPackage.Text,
PWD = ddlPWD.SelectedValue,
Apunchclosed = ddlApunchclosed.SelectedValue,
NDTReport= ddlNDTReport.SelectedValue,
TemperaryMeasurement= ddlTemperaryMeasurement.SelectedValue,
//Apunchclosed = ddlApunchclosed.SelectedValue,
//NDTReport= ddlNDTReport.SelectedValue,
//TemperaryMeasurement= ddlTemperaryMeasurement.SelectedValue,
HydrostaticTest=ddlHydrostaticTest.SelectedValue,
Report= ddlReport.SelectedValue,
Blowingflushing= ddlBlowingflushing.SelectedValue,
FWDfinished= ddlFWDfinished.SelectedValue,
//FWDfinished= ddlFWDfinished.SelectedValue,
Systemreinstalled= ddlSystemreinstalled.SelectedValue,
BlowingReport= txtBlowingReport.Text,
Descriptions= txtDescriptions.Text
@@ -92,22 +92,23 @@ namespace FineUIPro.Web.Transfer
#region 判断状态
var listObj = new List<string>();
listObj.Add(model.PWD);
listObj.Add(model.Apunchclosed);
listObj.Add(model.NDTReport);
listObj.Add(model.TemperaryMeasurement);
//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.FWDfinished);
//listObj.Add(model.FWDfinished);
listObj.Add(model.Systemreinstalled);
//listObj.Add(model.BlowingReport);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 9)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
model.FINALStatus = "Completed";
}
//如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 9)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
{
model.FINALStatus = "Not Start";
@@ -129,13 +130,13 @@ namespace FineUIPro.Web.Transfer
newModel.Subsystem = newModel.Subsystem;
newModel.TestPackage = txtTestPackage.Text;
newModel.PWD = ddlPWD.SelectedValue;
newModel.Apunchclosed = ddlApunchclosed.SelectedValue;
newModel.NDTReport = ddlNDTReport.SelectedValue;
newModel.TemperaryMeasurement = ddlTemperaryMeasurement.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.FWDfinished = ddlFWDfinished.SelectedValue;
//newModel.FWDfinished = ddlFWDfinished.SelectedValue;
newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
newModel.BlowingReport = txtBlowingReport.Text;
newModel.FINALStatus = model.FINALStatus;