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/RotatingEquipmentDataIn.aspx.cs
+10 -9
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 8);
AddDatasetToSQL(ds.Tables[0], 9);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -276,7 +276,7 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 8);
AddDatasetToSQL2(ds.Tables[0], 9);
}
catch (Exception ex)
{
@@ -305,7 +305,7 @@ namespace FineUIPro.Web.Transfer
if (pds != null && ir > 0)
{
List<Model.Transfer_RotatingEquipment> list = new List<Model.Transfer_RotatingEquipment>();
for (int i = 1; i < ir; i++)
for (int i = 0; i < ir; i++)
{
////查询第一列，没查到的情况下作导入处理
//var modelOnly = Funs.DB.Transfer_RotatingEquipment.FirstOrDefault(x => x.RotatingEquipment == pds.Rows[i][0].ToString().Trim()
@@ -323,16 +323,17 @@ namespace FineUIPro.Web.Transfer
model.TestPackage = pds.Rows[i][3 + 1].ToString().Trim();
var obj1 = model.Alignment = pds.Rows[i][4 + 1].ToString().Trim();
var obj2 = model.Motorsoloruntest = pds.Rows[i][5 + 1].ToString().Trim();
var obj3 = model.Standalonetest = pds.Rows[i][6 + 1].ToString().Trim();
var obj4=model.Lubricatefilling= pds.Rows[i][6].ToString().Trim();
var obj2 = model.Motorsoloruntest = pds.Rows[i][7].ToString().Trim();
var obj3 = model.Standalonetest = pds.Rows[i][8].ToString().Trim();
#region 判断状态
var listObj = new List<string>();
listObj.Add(obj1);
listObj.Add(obj2);
listObj.Add(obj3);
listObj.Add(obj4);
//全是NA或Completed 状态是Completed
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 3)
if (listObj.Where(x => x == "NA" || x == "Completed").ToList().Count == 4)
{
model.MechanicalFINALStatus = "Completed";
list.Add(model);
@@ -341,7 +342,7 @@ namespace FineUIPro.Web.Transfer
//如果全是Not Start 就是 Not Start
if (listObj.Where(x => x == "Not Start").ToList().Count == 3)
if (listObj.Where(x => x == "Not Start").ToList().Count == 4)
{
model.MechanicalFINALStatus = "Not Start";
list.Add(model);
@@ -361,7 +362,7 @@ namespace FineUIPro.Web.Transfer
#endregion
model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
//model.MechanicalFINALStatus = pds.Rows[i][6].ToString().Trim();
if (model.MechanicalFINALStatus.ToLower() == "finished")
{
model.CompleteTime = DateTime.Now;