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/InspectionMachineDataIn.aspx.cs
+10 -7
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 13);
AddDatasetToSQL(ds.Tables[0], 14);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -278,13 +278,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row12 + "]错误！" + "|";
}
}
string row13 = pds.Rows[i][13].ToString();
if (string.IsNullOrEmpty(row13))
{
result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
}
}
else
{
result += (i + 2).ToString() + "," + "单位名称" + "," + "[" + row0 + "]不存在！" + "|";
}
}
if (!string.IsNullOrEmpty(result))
{
@@ -390,7 +393,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 13);
AddDatasetToSQL2(ds.Tables[0], 14);
}
catch (Exception ex)
{
@@ -437,7 +440,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine();
oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId
&& x.InspectionMachineCode == pds.Rows[i][1].ToString().Trim());
&& x.RemarkCode == pds.Rows[i][13].ToString().Trim());
if (oldViewInfo==null)
{
Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine();
@@ -483,7 +486,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Ins.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
}
Ins.RemarkCode = pds.Rows[i][13].ToString().Trim();
Ins.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine));
Ins.CompileMan = this.CurrUser.UserId;
Ins.CompileDate = DateTime.Now.Date;
@@ -533,8 +536,8 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
oldViewInfo.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
}
oldViewInfo.RemarkCode = pds.Rows[i][13].ToString().Trim();
oldViewInfo.CompileMan = this.CurrUser.UserId;
oldViewInfo.CompileDate = DateTime.Now.Date;
BLL.InspectionMachineService.UpdateInspectionMachine(oldViewInfo);