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-11-25 09:35:14 +08:00
parent da8977ac94
commit ce75af6899
16 changed files with 92 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+10 -10
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 10);
AddDatasetToSQL(ds.Tables[0], 8);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 11);
AddDatasetToSQL2(ds.Tables[0], 8);
}
catch (Exception ex)
{
@@ -335,21 +335,21 @@ namespace FineUIPro.Web.Transfer
//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();
//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][6].ToString().Trim();
var obj5 = model.Looptest = pds.Rows[i][7].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
//listObj.Add(obj2);
//listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
//listObj.Add(obj0);
//全是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.FINAL_Status = "Completed";
list.Add(model);
@@ -357,7 +357,7 @@ namespace FineUIPro.Web.Transfer
}
//如果全是NA或Not Start 就是 Not Start
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 5)
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
{
model.FINAL_Status = "Not Start";
list.Add(model);