gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: gaofei:751270c1c6c46aa9a956e8e104251c13d55d5a21
Branches Tags
gaofei:master
..
compare: gaofei:97b99f4ec11a649fef62b22f0926fee8df5b5c90
Branches Tags
gaofei:master

No commits in common. "751270c1c6c46aa9a956e8e104251c13d55d5a21" and "97b99f4ec11a649fef62b22f0926fee8df5b5c90" have entirely different histories.
751270c1c6 ... 97b99f4ec1

2 changed files with 3 additions and 20 deletions
Show Stats Expand all files Collapse all files

BIN
HJGL_DS/FineUIPro.Web/File/Excel/HJGL_DataIn/焊口信息导入模板.xls
View File

Binary file not shown.

23
HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
View File

@ -295,8 +295,7 @@ namespace FineUIPro.Web.HJGL.DataIn
string col27 = pds.Rows[i][27].ToString().Trim();//合格等级
string col28 = pds.Rows[i][28].ToString().Trim();//硬度合格标准
string col29 = pds.Rows[i][29].ToString().Trim();//非常焊缝
string col30 = pds.Rows[i][30].ToString().Trim();//是否黄金口
string col31 = pds.Rows[i][31].ToString().Trim();//备注
string col30 = pds.Rows[i][30].ToString().Trim();//备注
Model.HJGL_PW_IsoInfo NewIsoInfo = new Model.HJGL_PW_IsoInfo();
var getProject = projects.FirstOrDefault(x => x.ProjectCode == col0);//项目号
Model.HJGL_PW_IsoInfo getPWisInfo = null;
@ -584,13 +583,6 @@ namespace FineUIPro.Web.HJGL.DataIn
result += "第" + (i + 2).ToString() + "行," + "非常焊缝格式输入有误" + "\n";
}
}
if (!string.IsNullOrEmpty(col30))
{
if (col30 != "是" && col30 != "否" && col30 != "")
{
result += "第" + (i + 2).ToString() + "行," + "是否黄金口格式输入有误" + "\n";
}
}
if (string.IsNullOrEmpty(result))
{
if (getProject != null && getPWisInfo != null)
@ -710,8 +702,7 @@ namespace FineUIPro.Web.HJGL.DataIn
string col27 = pds.Rows[i][27].ToString().Trim();//合格等级
string col28 = pds.Rows[i][28].ToString().Trim();//硬度合格标准
string col29 = pds.Rows[i][29].ToString().Trim();//非常焊缝
string col30 = pds.Rows[i][30].ToString().Trim();//是否黄金口
string col31 = pds.Rows[i][31].ToString().Trim();//备注
string col30 = pds.Rows[i][30].ToString().Trim();//备注
Model.HJGL_PW_IsoInfo NewIsoInfo = new Model.HJGL_PW_IsoInfo();
var getProject = projects.FirstOrDefault(x => x.ProjectCode == col0);//项目号
Model.HJGL_PW_IsoInfo getPWisInfo = null;
@ -854,15 +845,7 @@ namespace FineUIPro.Web.HJGL.DataIn
{
newJointInfo.IS_Proess = "0";
}
if (col30 == "是")
{
newJointInfo.IsGold = true;
}
else
{
newJointInfo.IsGold = false;
}
newJointInfo.JOT_Remark = col31;
newJointInfo.JOT_Remark = col30;
newJointInfo.InstallationId = getInstallation.InstallationId;
if (getNDTRate != null)
{