20240430 质量综合管理导入导出
This commit is contained in:
@@ -170,7 +170,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
|
||||
var cns = from x in Funs.DB.Base_CNProfessional select x;
|
||||
|
||||
for (int i = 0; i < ir; i++)
|
||||
for (int i = 1; i < ir; i++)
|
||||
{
|
||||
string row0 = pds.Rows[i][0].ToString().Trim();
|
||||
if (!string.IsNullOrEmpty(row0))
|
||||
@@ -195,6 +195,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
result += (i + 2).ToString() + "," + "专业名称" + "," + "[" + row1 + "]不存在!" + "|";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
result += (i + 2).ToString() + "," + "专业名称" + "," + "此项为必填项!" + "|";
|
||||
}
|
||||
|
||||
string row2 = pds.Rows[i][2].ToString();
|
||||
if (string.IsNullOrEmpty(row2))
|
||||
@@ -220,6 +224,17 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
{
|
||||
result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项!" + "|";
|
||||
}
|
||||
else
|
||||
{
|
||||
try
|
||||
{
|
||||
int t = Convert.ToInt32(row7);
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row7 + "]错误!" + "|";
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!string.IsNullOrEmpty(result))
|
||||
{
|
||||
@@ -363,9 +378,9 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
var oldViewInfos = from x in Funs.DB.Inspection_Test_Plan
|
||||
where x.ProjectId == this.CurrUser.LoginProjectId
|
||||
select x;
|
||||
for (int i = 0; i < ir; i++)
|
||||
for (int i = 1; i < ir; i++)
|
||||
{
|
||||
var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == pds.Rows[i][7].ToString().Trim()).FirstOrDefault();
|
||||
var oldViewInfo = oldViewInfos.Where(x => x.RemarkCode == Funs.GetNewInt(pds.Rows[i][7].ToString().Trim())).FirstOrDefault();
|
||||
if (oldViewInfo == null)
|
||||
{
|
||||
Model.Inspection_Test_Plan Ins = new Model.Inspection_Test_Plan();
|
||||
@@ -384,7 +399,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
|
||||
Ins.ApprovalDate = Funs.GetNewDateTime(pds.Rows[i][4].ToString().Trim());
|
||||
Ins.AuditMan = pds.Rows[i][5].ToString().Trim();
|
||||
Ins.ApprovalMan= pds.Rows[i][6].ToString().Trim();
|
||||
Ins.RemarkCode= pds.Rows[i][7].ToString().Trim();
|
||||
Ins.RemarkCode= Funs.GetNewInt(pds.Rows[i][7].ToString().Trim());
|
||||
Ins.CreateMan = this.CurrUser.UserId;
|
||||
Ins.CreateDate = DateTime.Now;
|
||||
BLL.InspectionTestPlanService.Insert(Ins);
|
||||
|
||||
Reference in New Issue
Block a user