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-07-29 18:06:25 +08:00
parent aa8fe6b2b7
commit eb8003142c
26 changed files with 716 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/Transfer/LHCSystemListDataIn.aspx.cs
+12 -10
View File
@@ -420,11 +420,11 @@ namespace FineUIPro.Web.Transfer
oleDBConn.Dispose();
if (Type == "0")
{
AddDatasetToSQL2(ds.Tables[0], 8);
AddDatasetToSQL2(ds.Tables[0], 9);
}
else
{
AddDatasetToSQL2(ds.Tables[0], 9);
AddDatasetToSQL2(ds.Tables[0], 10);
}
}
@@ -472,7 +472,7 @@ namespace FineUIPro.Web.Transfer
//根据项目id查询sn
var snModel = Funs.DB.Transfer_LHCSystemList.Where(x => x.ProjectId == CurrUser.LoginProjectId
&& x.Type == Type).OrderByDescending(x => x.SN).FirstOrDefault();
if (snModel == null && Sn!=1001)
if (snModel == null && Sn==0)
{
Sn = 1001;
model.SN = Sn;
@@ -490,13 +490,15 @@ namespace FineUIPro.Web.Transfer
}
}
model.SystemNo = pds.Rows[i][0].ToString().Trim();
model.Commissioningsystemcode= pds.Rows[i][0].ToString().Trim();
model.CommissioningCodeDescription = pds.Rows[i][1].ToString().Trim();
model.Commissioningsystemcode= pds.Rows[i][1].ToString().Trim();
model.CommissioningCodeDescription = pds.Rows[i][2].ToString().Trim();
if (Type == "0")
{
model.SubCommissioningsystem = pds.Rows[i][2].ToString().Trim();
model.Turnover_Code= pds.Rows[i][3].ToString().Trim();
model.SubCommissioningsystem = pds.Rows[i][3].ToString().Trim();
//model.Turnover_Code= pds.Rows[i][4].ToString().Trim();
DateTime t1, t2,t3;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
model.PlanStartofTestingDate = t1;
@@ -508,9 +510,9 @@ namespace FineUIPro.Web.Transfer
}
else {
model.Describe = pds.Rows[i][2].ToString().Trim();
model.SubCommissioningsystem = pds.Rows[i][3].ToString().Trim();
model.Turnover_Code = pds.Rows[i][4].ToString().Trim();
model.Describe = pds.Rows[i][3].ToString().Trim();
model.SubCommissioningsystem = pds.Rows[i][4].ToString().Trim();
//model.Turnover_Code = pds.Rows[i][5].ToString().Trim();
DateTime t1, t2, t3;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
model.PlanStartofTestingDate = t1;