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

1、索引项目中，删除英文，保留中文；

Browse Source 
2、尾项管理中，筛选条件调整；
3、尾项管理中，支持点击图片预览；
4、增加尾项统计表中的完成比例；
5、更新管道表的表格（增加焊接信息、试压包状态、电伴热和保温/冷信息）；
6、更新移交统计表（补充管道试压包其他信息统计）；
7、删除索引项目中的地管和消防2个项目；
This commit is contained in:
liuhui11
2024-10-31 19:11:00 +08:00
parent 27df9766f7
commit ea734b0874
23 changed files with 1623 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/PipingEdit.aspx.cs
+63 -27
View File
@@ -53,18 +53,26 @@ namespace FineUIPro.Web.Transfer
txtSYSTEM.Text = model.SYSTEM;
txtSubsystem.Text = model.Subsystem;
txtTestPackage.Text = model.TestPackage;
ddlPWD.SelectedValue = model.PWD;
txtDescriptions.Text = model.Descriptions;
//ddlPWD.SelectedValue = model.PWD;
//ddlApunchclosed.SelectedValue = model.Apunchclosed;
//ddlNDTReport.SelectedValue = model.NDTReport;
//ddlTemperaryMeasurement.SelectedValue = model.TemperaryMeasurement;
ddlHydrostaticTest.SelectedValue = model.HydrostaticTest;
ddlReport.SelectedValue = model.Report;
ddlBlowingflushing.SelectedValue = model.Blowingflushing;
//ddlHydrostaticTest.SelectedValue = model.HydrostaticTest;
//ddlReport.SelectedValue = model.Report;
//ddlBlowingflushing.SelectedValue = model.Blowingflushing;
//ddlFWDfinished.SelectedValue = model.FWDfinished;
ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
txtBlowingReport.Text = model.BlowingReport;
//ddlSystemreinstalled.SelectedValue = model.Systemreinstalled;
//txtBlowingReport.Text = model.BlowingReport;
txtDescriptions.Text = model.Descriptions;
txtTotalFactor.Text = model.TotalFactor;
txtCompleteFactor.Text = model.CompleteFactor;
txtCompleteProportion.Text = model.CompleteProportion;
ddlPressureTestCompleted.SelectedValue = model.PressureTestCompleted;
ddlRinseAndBlowClean.SelectedValue = model.RinseAndBlowClean;
ddlReduction.SelectedValue = model.Reduction;
ddlElectricHeatTracing.SelectedValue = model.ElectricHeatTracing;
ddlInsulation.SelectedValue = model.Insulation;
}
}
}
@@ -77,38 +85,56 @@ namespace FineUIPro.Web.Transfer
SYSTEM = txtSYSTEM.Text,
Subsystem = txtSubsystem.Text,
TestPackage = txtTestPackage.Text,
PWD = ddlPWD.SelectedValue,
//PWD = ddlPWD.SelectedValue,
//Apunchclosed = ddlApunchclosed.SelectedValue,
//NDTReport= ddlNDTReport.SelectedValue,
//TemperaryMeasurement= ddlTemperaryMeasurement.SelectedValue,
HydrostaticTest=ddlHydrostaticTest.SelectedValue,
Report= ddlReport.SelectedValue,
Blowingflushing= ddlBlowingflushing.SelectedValue,
//HydrostaticTest=ddlHydrostaticTest.SelectedValue,
//Report= ddlReport.SelectedValue,
//Blowingflushing= ddlBlowingflushing.SelectedValue,
//FWDfinished= ddlFWDfinished.SelectedValue,
Systemreinstalled= ddlSystemreinstalled.SelectedValue,
BlowingReport= txtBlowingReport.Text,
Descriptions= txtDescriptions.Text
//Systemreinstalled= ddlSystemreinstalled.SelectedValue,
//BlowingReport= txtBlowingReport.Text,
TotalFactor = txtTotalFactor.Text,
CompleteFactor = txtCompleteFactor.Text,
CompleteProportion = txtCompleteProportion.Text,
PressureTestCompleted = ddlPressureTestCompleted.SelectedValue,
RinseAndBlowClean = ddlRinseAndBlowClean.SelectedValue,
Reduction = ddlReduction.SelectedValue,
ElectricHeatTracing = ddlElectricHeatTracing.SelectedValue,
Insulation = ddlInsulation.SelectedValue,
Descriptions = txtDescriptions.Text
};
#region 判断状态
var listObj = new List<string>();
listObj.Add(model.PWD);
//listObj.Add(model.PWD);
//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.HydrostaticTest);
//listObj.Add(model.Report);
//listObj.Add(model.Blowingflushing);
//listObj.Add(model.FWDfinished);
listObj.Add(model.Systemreinstalled);
//listObj.Add(model.Systemreinstalled);
//listObj.Add(model.BlowingReport);
//listObj.Add(model.TotalFactor);
//listObj.Add(model.CompleteFactor);
//listObj.Add(model.CompleteProportion);
listObj.Add(model.PressureTestCompleted);
listObj.Add(model.RinseAndBlowClean);
listObj.Add(model.Reduction);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
{
model.FINALStatus = "Completed";
}
//如果全是Not Start 就是 Not Start
else if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
else if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
{
model.FINALStatus = "Not Start";
@@ -129,16 +155,26 @@ namespace FineUIPro.Web.Transfer
newModel.SYSTEM = model.SYSTEM;
newModel.Subsystem = newModel.Subsystem;
newModel.TestPackage = txtTestPackage.Text;
newModel.PWD = ddlPWD.SelectedValue;
//newModel.PWD = ddlPWD.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.HydrostaticTest = ddlHydrostaticTest.SelectedValue;
//newModel.Report = ddlReport.SelectedValue;
//newModel.Blowingflushing = ddlBlowingflushing.SelectedValue;
//newModel.FWDfinished = ddlFWDfinished.SelectedValue;
newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
newModel.BlowingReport = txtBlowingReport.Text;
//newModel.Systemreinstalled = ddlSystemreinstalled.SelectedValue;
//newModel.BlowingReport = txtBlowingReport.Text;
newModel.TotalFactor = txtTotalFactor.Text;
newModel.CompleteFactor = txtCompleteFactor.Text;
newModel.CompleteProportion = txtCompleteProportion.Text;
newModel.PressureTestCompleted = ddlPressureTestCompleted.SelectedValue;
newModel.RinseAndBlowClean = ddlRinseAndBlowClean.SelectedValue;
newModel.Reduction = ddlReduction.SelectedValue;
newModel.ElectricHeatTracing = ddlElectricHeatTracing.SelectedValue;
newModel.Insulation = ddlInsulation.SelectedValue;
newModel.FINALStatus = model.FINALStatus;
newModel.Descriptions = txtDescriptions.Text;
}