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/InstrumentationDataIn.aspx.cs
+16 -9
View File
@@ -327,12 +327,19 @@ namespace FineUIPro.Web.Transfer
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
var obj0 = model.Calibration = pds.Rows[i][5].ToString().Trim();
var obj1 = model.InstallationCalibration = pds.Rows[i][6].ToString().Trim();
var obj2 = model.PipingPressuretest = pds.Rows[i][7].ToString().Trim();
var obj3 = model.PipingLeak = pds.Rows[i][8].ToString().Trim();
var obj4 = model.PipingBlowing = pds.Rows[i][9].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
//var obj0 = model.Calibration = pds.Rows[i][5].ToString().Trim();
//var obj1 = model.InstallationCalibration = pds.Rows[i][6].ToString().Trim();
//var obj2 = model.PipingPressuretest = pds.Rows[i][7].ToString().Trim();
//var obj3 = model.PipingLeak = pds.Rows[i][8].ToString().Trim();
//var obj4 = model.PipingBlowing = pds.Rows[i][9].ToString().Trim();
//var obj5 = model.Looptest = pds.Rows[i][10].ToString().Trim();
var obj1 = model.InstallationCalibration = pds.Rows[i][5].ToString().Trim();
var obj2 = model.PipingPressuretest = pds.Rows[i][6].ToString().Trim();
var obj3 = model.PipingLeak = pds.Rows[i][7].ToString().Trim();
var obj4 = model.PipingBlowing = pds.Rows[i][8].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][9].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
@@ -340,9 +347,9 @@ namespace FineUIPro.Web.Transfer
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
listObj.Add(obj0);
//listObj.Add(obj0);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 6)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
model.FINAL_Status = "Completed";
list.Add(model);
@@ -351,7 +358,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 6)
if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
{
model.FINAL_Status = "Not Start";
list.Add(model);