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

20240429 修改综合管理导入导出

Browse Source
This commit is contained in:
毕文静
2024-04-29 19:13:54 +08:00
parent fc56b1f6c2
commit a3e123957d
48 changed files with 560 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineDataIn.aspx.cs
+39 -18
View File
@@ -126,7 +126,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL(ds.Tables[0], 14);
AddDatasetToSQL(ds.Tables[0], 15);
hdCheckResult.Text = "1";
}
catch (Exception exc)
@@ -173,7 +173,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++)
{
Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine();
string row0 = pds.Rows[i][0].ToString().Trim();
@@ -269,20 +269,39 @@ namespace FineUIPro.Web.CQMS.Comprehensive
string row12 = pds.Rows[i][12].ToString();
if (!string.IsNullOrEmpty(row12))
{
try
if (row12 != "是" && row12 != "否")
{
DateTime leaveDate = Convert.ToDateTime(row12);
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row12 + "]错误！" + "|";
result += (i + 2).ToString() + "," + "校验合格" + "," + "[" + row12 + "]错误！" + "|";
}
}
string row13 = pds.Rows[i][13].ToString();
if (string.IsNullOrEmpty(row13))
if (!string.IsNullOrEmpty(row13))
{
try
{
DateTime leaveDate = Convert.ToDateTime(row13);
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "离场时间" + "," + "[" + row13 + "]错误！" + "|";
}
}
string row14 = pds.Rows[i][14].ToString();
if (string.IsNullOrEmpty(row14))
{
result += (i + 2).ToString() + "," + "标志编号" + "," + "此项为必填项！" + "|";
}
else
{
try
{
int t = Convert.ToInt32(row14);
}
catch (Exception)
{
result += (i + 2).ToString() + "," + "标志编号" + "," + "[" + row14 + "]错误！" + "|";
}
}
}
else
{
@@ -393,7 +412,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
oleDBConn.Close();
oleDBConn.Dispose();
AddDatasetToSQL2(ds.Tables[0], 14);
AddDatasetToSQL2(ds.Tables[0], 15);
}
catch (Exception ex)
{
@@ -432,7 +451,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();
var unitInfo = units.Where(y => y.UnitName == row0).FirstOrDefault();
@@ -440,7 +459,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Model.Comprehensive_InspectionMachine oldViewInfo = new Model.Comprehensive_InspectionMachine();
oldViewInfo = oldViewInfos.FirstOrDefault(x => x.UnitId == unitInfo.UnitId
&& x.RemarkCode == pds.Rows[i][13].ToString().Trim());
&& x.RemarkCode ==Funs.GetNewInt(pds.Rows[i][13].ToString().Trim()));
if (oldViewInfo==null)
{
Model.Comprehensive_InspectionMachine Ins = new Model.Comprehensive_InspectionMachine();
@@ -482,11 +501,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
Ins.UnitsCount = Convert.ToInt32(pds.Rows[i][11].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim()))
Ins.IsCheckOK = pds.Rows[i][12].ToString().Trim() == "是" ? true : false;
if (!string.IsNullOrEmpty(pds.Rows[i][13].ToString().Trim()))
{
Ins.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
Ins.LeaveDate = Convert.ToDateTime(pds.Rows[i][13].ToString().Trim());
}
Ins.RemarkCode = pds.Rows[i][13].ToString().Trim();
Ins.RemarkCode =Funs.GetNewInt(pds.Rows[i][14].ToString().Trim());
Ins.InspectionMachineId = SQLHelper.GetNewID(typeof(Model.Comprehensive_InspectionMachine));
Ins.CompileMan = this.CurrUser.UserId;
Ins.CompileDate = DateTime.Now.Date;
@@ -533,11 +553,12 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
oldViewInfo.UnitsCount = Convert.ToInt32(pds.Rows[i][11].ToString().Trim());
}
if (!string.IsNullOrEmpty(pds.Rows[i][12].ToString().Trim()))
oldViewInfo.IsCheckOK = pds.Rows[i][12].ToString().Trim() == "是" ? true : false;
if (!string.IsNullOrEmpty(pds.Rows[i][13].ToString().Trim()))
{
oldViewInfo.LeaveDate = Convert.ToDateTime(pds.Rows[i][12].ToString().Trim());
oldViewInfo.LeaveDate = Convert.ToDateTime(pds.Rows[i][13].ToString().Trim());
}
oldViewInfo.RemarkCode = pds.Rows[i][13].ToString().Trim();
oldViewInfo.RemarkCode = Funs.GetNewInt(pds.Rows[i][14].ToString().Trim());
oldViewInfo.CompileMan = this.CurrUser.UserId;
oldViewInfo.CompileDate = DateTime.Now.Date;