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/PipingDataIn.aspx.cs
+27 -15
View File
@@ -317,21 +317,32 @@ namespace FineUIPro.Web.Transfer
model.ProjectId = CurrUser.LoginProjectId;
model.PIPINGLINENUMBER = pds.Rows[i][0].ToString().Trim();
model.Descriptions = pds.Rows[i][1].ToString().Trim();
model.SYSTEM = pds.Rows[i][1+1].ToString().Trim();
model.SYSTEM = pds.Rows[i][1 + 1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.TestPackage = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.PWD= pds.Rows[i][4 + 1].ToString().Trim();
//var obj2 =model.Apunchclosed = pds.Rows[i][5 + 1].ToString().Trim();
//var obj3 =model.NDTReport = pds.Rows[i][6 + 1].ToString().Trim();
//var obj4 =model.TemperaryMeasurement = pds.Rows[i][7 + 1].ToString().Trim();
//var obj5 =model.FWDfinished = pds.Rows[i][8 + 1].ToString().Trim();
var obj6 =model.HydrostaticTest = pds.Rows[i][6].ToString().Trim();
var obj7 =model.Report = pds.Rows[i][7].ToString().Trim();
var obj8 =model.Blowingflushing = pds.Rows[i][8].ToString().Trim();
var obj9 = model.Systemreinstalled = pds.Rows[i][9].ToString().Trim();
//var obj1 = model.PWD = pds.Rows[i][4 + 1].ToString().Trim();
////var obj2 =model.Apunchclosed = pds.Rows[i][5 + 1].ToString().Trim();
////var obj3 =model.NDTReport = pds.Rows[i][6 + 1].ToString().Trim();
////var obj4 =model.TemperaryMeasurement = pds.Rows[i][7 + 1].ToString().Trim();
////var obj5 =model.FWDfinished = pds.Rows[i][8 + 1].ToString().Trim();
//var obj6 = model.HydrostaticTest = pds.Rows[i][6].ToString().Trim();
//var obj7 = model.Report = pds.Rows[i][7].ToString().Trim();
//var obj8 = model.Blowingflushing = pds.Rows[i][8].ToString().Trim();
//var obj9 = model.Systemreinstalled = pds.Rows[i][9].ToString().Trim();
model.BlowingReport= pds.Rows[i][10].ToString().Trim();
//model.BlowingReport = pds.Rows[i][10].ToString().Trim();
var obj1 = model.TotalFactor = pds.Rows[i][5].ToString().Trim();
var obj6 = model.CompleteFactor = pds.Rows[i][6].ToString().Trim();
var obj7 = model.CompleteProportion = pds.Rows[i][7].ToString().Trim();
var obj8 = model.PressureTestCompleted = pds.Rows[i][8].ToString().Trim();
var obj9 = model.RinseAndBlowClean = pds.Rows[i][9].ToString().Trim();
var obj10 = model.Reduction = pds.Rows[i][10].ToString().Trim();
model.ElectricHeatTracing = pds.Rows[i][11].ToString().Trim();
model.Insulation = pds.Rows[i][12].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
@@ -344,17 +355,18 @@ namespace FineUIPro.Web.Transfer
listObj.Add(obj7);
listObj.Add(obj8);
listObj.Add(obj9);
listObj.Add(obj10);
//全是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";
list.Add(model);
continue ;
continue;
}
//如果全是Not Start 就是 Not Start
if (listObj.Where(x=>x== "Not Start").ToList().Count==5)
if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
{
model.FINALStatus = "Not Start";
list.Add(model);