shecs/Basf_TCC11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-06-05 08:24:19 +08:00
parent 1677a6d714
commit 3990f747ce
67 changed files with 6774 additions and 1645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs
+67 -14
View File
@@ -535,6 +535,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
var ndtType = from x in Funs.DB.Base_DetectionType select x;
var wpsList = from x in Funs.DB.WPQ_WPQList select x;
var DNCompareList = BLL.Base_DNCompareService.GetDNCompareList();
var coodeList= from x in Funs.DB.Base_MaterialCoode where x.ProjectId == this.CurrUser.LoginProjectId select x; //coode
var dataInTemp = from x in Funs.DB.Sys_DataInTemp
where x.UserId == this.CurrUser.UserId && x.ProjectId == this.CurrUser.LoginProjectId
@@ -955,8 +956,6 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
errInfo += "焊接方法为必填项；";
}
weldJoint.HeartNo1 = tempData.Value25;
weldJoint.HeartNo2 = tempData.Value26;
if (!string.IsNullOrEmpty(tempData.Value27))
{
var grooveType = grooveTypes.FirstOrDefault(x => x.GrooveTypeCode == tempData.Value27);
@@ -982,16 +981,18 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
}
else
{
if (tempData.Value28 == "S")
{
weldJoint.JointAttribute = "活动S";
weldJoint.JointArea = "S";
}
else
{
weldJoint.JointAttribute = "固定F";
weldJoint.JointArea = "F";
}
weldJoint.JointAttribute = tempData.Value28;
weldJoint.JointArea = tempData.Value28;
//if (tempData.Value28 == "S")
//{
// weldJoint.JointAttribute = "活动S";
// weldJoint.JointArea = "S";
//}
//else
//{
// weldJoint.JointAttribute = "固定F";
// weldJoint.JointArea = "F";
//}
}
}
@@ -1073,6 +1074,10 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
pipeline.DetectionRateId = rate.DetectionRateId;
}
}
else
{
errInfo += "探伤比例为必填项；";
}
if (!string.IsNullOrEmpty(tempData.Value35))
{
@@ -1189,8 +1194,56 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
}
}
weldJoint.Coode1 = tempData.Value39;
weldJoint.Coode2 = tempData.Value40;
if (!string.IsNullOrEmpty(tempData.Value39))
{
var cood = coodeList.FirstOrDefault(x => x.Coode == tempData.Value39);
if (cood == null)
{
errInfo += "Coode1:[" + tempData.Value39 + "]不存在；";
}
else
{
weldJoint.Coode1 = cood.Coode;
}
}
if (!string.IsNullOrEmpty(tempData.Value40))
{
var cood = coodeList.FirstOrDefault(x => x.Coode == tempData.Value40);
if (cood == null)
{
errInfo += "Coode2:[" + tempData.Value40 + "]不存在；";
}
else
{
weldJoint.Coode2 = cood.Coode;
}
}
if (!string.IsNullOrEmpty(tempData.Value25))
{
var cood = coodeList.FirstOrDefault(x => x.Coode == tempData.Value39 && x.HeartNo== tempData.Value25);
if (cood == null)
{
errInfo += "炉批号1:[" + tempData.Value25 + "]或对应的Coode码不存在；";
}
else
{
weldJoint.HeartNo1 = tempData.Value25;
}
}
if (!string.IsNullOrEmpty(tempData.Value26))
{
var cood = coodeList.FirstOrDefault(x => x.Coode == tempData.Value40 && x.HeartNo == tempData.Value26);
if (cood == null)
{
errInfo += "炉批号2:[" + tempData.Value26 + "]或对应的Coode码不存在；";
}
else
{
weldJoint.HeartNo2 = tempData.Value26;
}
}
//if (!string.IsNullOrEmpty(tempData.Value22) && !string.IsNullOrEmpty(tempData.Value23))
//{