移交优化

This commit is contained in:
2024-12-05 18:48:45 +08:00
parent 3984e18e6c
commit 20363206d7
3 changed files with 39 additions and 31 deletions
@@ -226,7 +226,8 @@ namespace FineUIPro.Web.Transfer
}
}
}
else {
else
{
string row4 = pds.Rows[i][5].ToString();
if (!string.IsNullOrEmpty(row4))
{
@@ -472,9 +473,9 @@ 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==0)
if (snModel == null && Sn == 0)
{
Sn = 1001;
Sn = Type == "0" ? 1001 : 2001;
model.SN = Sn;
}
else
@@ -484,32 +485,34 @@ namespace FineUIPro.Web.Transfer
Sn = Convert.ToInt32(snModel.SN + 1);
model.SN = Sn;
}
else {
else
{
Sn += 1;
model.SN = Sn;
}
}
model.SystemNo = pds.Rows[i][0].ToString().Trim();
model.Commissioningsystemcode= 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][3].ToString().Trim();
//model.Turnover_Code= pds.Rows[i][4].ToString().Trim();
DateTime t1, t2,t3;
DateTime t1, t2, t3;
if (DateTime.TryParse(pds.Rows[i][4].ToString(), out t1) && !string.IsNullOrEmpty(pds.Rows[i][4].ToString()))
model.PlanStartofTestingDate = t1;
if (DateTime.TryParse(pds.Rows[i][5].ToString(), out t2) && !string.IsNullOrEmpty(pds.Rows[i][5].ToString()))
model.PlanFinishofTestingDate = t2;
model.Status= pds.Rows[i][6].ToString().Trim();
model.Status = pds.Rows[i][6].ToString().Trim();
if (DateTime.TryParse(pds.Rows[i][7].ToString(), out t3) && !string.IsNullOrEmpty(pds.Rows[i][7].ToString()))
model.ActualFinishedDate = t3;
}
else {
else
{
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();