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-09 10:48:15 +08:00
parent cc639f4cab
commit 8c3bd0fe80
65 changed files with 1335 additions and 471 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/CivilStructureDataIn.aspx.cs
+15 -19
View File
@@ -130,7 +130,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 12);
AddDatasetToSQL(ds.Tables[0], 10);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -171,7 +171,7 @@ namespace FineUIPro.Web.Transfer
string row4 = pds.Rows[i][0].ToString();
if (string.IsNullOrEmpty(row4))
{
result += (i + 3).ToString() + "," + "Structure/Civil/Architecture" + "," + "不能为空！" + "|";
result += (i + 3).ToString() + "," + "Tag.No" + "," + "不能为空！" + "|";
}
}
@@ -280,7 +280,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 12);
AddDatasetToSQL2(ds.Tables[0], 10);
}
catch (Exception ex)
{
@@ -319,21 +319,20 @@ namespace FineUIPro.Web.Transfer
// if (modelOnly == null)
// {
Model.Transfer_Civil_Structure model = new Model.Transfer_Civil_Structure();
model.Descriptions= pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
model.Civil_Structure = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1].ToString().Trim();
model.Subsystem = pds.Rows[i][2].ToString().Trim();
model.Test_Package = pds.Rows[i][3].ToString().Trim();
model.SystemName = pds.Rows[i][2].ToString().Trim();
model.Subsystem = pds.Rows[i][3].ToString().Trim();
model.Test_Package = pds.Rows[i][4].ToString().Trim();
var obj1 = model.Foundation = pds.Rows[i][4].ToString().Trim();
var obj2 = model.Mainstructure = pds.Rows[i][5].ToString().Trim();
var obj3 = model.Buildingdecoration = pds.Rows[i][6].ToString().Trim();
var obj4 = model.Equipment = pds.Rows[i][7].ToString().Trim();
var obj5 = model.Instrument = pds.Rows[i][8].ToString().Trim();
var obj6 = model.Electrical = pds.Rows[i][9].ToString().Trim();
var obj7 = model.FireFighting = pds.Rows[i][10].ToString().Trim();
var obj8 = model.HVAC = pds.Rows[i][11].ToString().Trim();
var obj1 = model.Foundation = pds.Rows[i][5].ToString().Trim();
var obj2 = model.Mainstructure = pds.Rows[i][6].ToString().Trim();
var obj3 = model.Equipment = pds.Rows[i][7].ToString().Trim();
var obj4 = model.Buildingdecoration = pds.Rows[i][8].ToString().Trim();
var obj5 = model.HVAC = pds.Rows[i][9].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
@@ -341,11 +340,8 @@ namespace FineUIPro.Web.Transfer
listObj.Add(obj3);
listObj.Add(obj4);
listObj.Add(obj5);
listObj.Add(obj6);
listObj.Add(obj7);
listObj.Add(obj8);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 8)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 5)
{
model.FINAL_Status = "Completed";
list.Add(model);
@@ -354,7 +350,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 8)
if (listObj.Where(x => x == "Not Start").ToList().Count == 5)
{
model.FINAL_Status = "Not Start";
list.Add(model);