lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1移交子表状态判断逻辑调整

Browse Source
This commit is contained in:
夏菊
2025-02-17 12:15:10 +08:00
parent 8039877553
commit d7504526a4
16 changed files with 64 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/InstrumentationDataIn.aspx.cs
+8 -7
View File
@@ -316,7 +316,8 @@ namespace FineUIPro.Web.Transfer
{
Sn = 1000;
}
else {
else
{
Sn = snModel.SN;
}
for (int i = 1; i < ir; i++)
@@ -329,7 +330,7 @@ namespace FineUIPro.Web.Transfer
//if (modelOnly == null)
//{
Model.Transfer_Instrumentation model = new Model.Transfer_Instrumentation();
model.Descriptions= pds.Rows[i][1].ToString().Trim();
model.Descriptions = pds.Rows[i][1].ToString().Trim();
model.Id = Guid.NewGuid().ToString();
model.ProjectId = CurrUser.LoginProjectId;
@@ -337,7 +338,7 @@ namespace FineUIPro.Web.Transfer
model.SN = Sn;
model.INSTRUMENTATION = pds.Rows[i][0].ToString().Trim();
model.SystemName = pds.Rows[i][1+1].ToString().Trim();
model.SystemName = pds.Rows[i][1 + 1].ToString().Trim();
model.Subsystem = pds.Rows[i][2 + 1].ToString().Trim();
model.Test_Package = pds.Rows[i][3 + 1].ToString().Trim();
@@ -370,16 +371,16 @@ namespace FineUIPro.Web.Transfer
continue;
}
//如果全是NA或Not Start 就是 Not Start
if (listObj.Where(x => x == "NA" || x == "Not Start").ToList().Count == 3)
//如果全是NA或Not Start、空 就是 Not Start
if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "NA" || x == "Not Start").ToList().Count == 3)
{
model.FINAL_Status = "Not Start";
list.Add(model);
continue;
}
//如果其中有一项是In progress 或Not Start 是 In progress
if (listObj.Where(x => x == "In progress" || x == "Not Start").ToList().Count >= 1)
//如果其中有一项是In progress 或Not Start、空 是 In progress
if (listObj.Where(x => string.IsNullOrWhiteSpace(x) || x == "In progress" || x == "Not Start").ToList().Count >= 1)
{
model.FINAL_Status = "In progress";
list.Add(model);