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

20240422 综合管理导入

Browse Source
This commit is contained in:
毕文静
2024-04-22 11:19:05 +08:00
parent 4e9dddbaed
commit 5d9374cdd7
22 changed files with 765 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonDataIn.aspx.cs
+10 -8
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 12);
AddDatasetToSQL(ds.Tables[0], 13);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -273,15 +273,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row10 + "]错误！" + "|";
}
}
string row12 = pds.Rows[i][12].ToString();
if (string.IsNullOrEmpty(row12))
{
result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
}
}
else
{
result += (i + 2).ToString() + "," + "单位名称" + "," + "[" + row0 + "]不存在！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -387,7 +388,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 12);
AddDatasetToSQL2(ds.Tables[0], 13);
}
catch (Exception ex)
{
@@ -435,7 +436,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
if (unitInfo != null && !string.IsNullOrEmpty(row0))
{
oldViewInfo = oldViewInfos.Where(x => x.UnitId == unitInfo.UnitId
&& x.CertificateNumber == pds.Rows[i][5].ToString().Trim()
&& x.RemarkCode == pds.Rows[i][12].ToString().Trim()
).FirstOrDefault();
if (oldViewInfo == null)
{
@@ -473,6 +474,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
Ins.DepartureTime = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim());
}
Ins.Remark = pds.Rows[i][11].ToString().Trim();
Ins.RemarkCode = pds.Rows[i][12].ToString().Trim();
Ins.InspectionPersonId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionPerson));
Ins.CompileMan = this.CurrUser.UserId;
@@ -531,6 +533,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oldViewInfo.DepartureTime = Convert.ToDateTime(pds.Rows[i][10].ToString().Trim());
}
oldViewInfo.Remark = pds.Rows[i][11].ToString().Trim();
oldViewInfo.RemarkCode= pds.Rows[i][12].ToString().Trim();
oldViewInfo.CompileMan = this.CurrUser.UserId;
oldViewInfo.CompileDate = DateTime.Now.Date;
@@ -594,7 +597,6 @@ namespace FineUIPro.Web.CQMS.Comprehensive
#endregion
#endregion
#region 下载模板
/// <summary>
/// 下载模板按钮