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/PipingDataIn.aspx.cs
+18 -18
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 14);
AddDatasetToSQL(ds.Tables[0], 10);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -276,7 +276,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 14);
AddDatasetToSQL2(ds.Tables[0], 10);
}
catch (Exception ex)
{
@@ -322,30 +322,30 @@ namespace FineUIPro.Web.Transfer
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][9 + 1].ToString().Trim();
var obj7 =model.Report = pds.Rows[i][10].ToString().Trim();
var obj8 =model.Blowingflushing = pds.Rows[i][11 + 1].ToString().Trim();
var obj9 = model.Systemreinstalled = pds.Rows[i][12 + 1].ToString().Trim();
model.BlowingReport= pds.Rows[i][13].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();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
//listObj.Add(obj2);
//listObj.Add(obj3);
//listObj.Add(obj4);
//listObj.Add(obj10);
listObj.Add(obj6);
listObj.Add(obj7);
listObj.Add(obj8);
listObj.Add(obj9);
//全是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";
list.Add(model);
@@ -354,7 +354,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x=>x== "Not Start").ToList().Count==9)
if (listObj.Where(x=>x== "Not Start").ToList().Count==5)
{
model.FINALStatus = "Not Start";
list.Add(model);