This commit is contained in:
2026-06-14 14:43:35 +08:00
parent 08d3555783
commit d59368478a
@@ -314,7 +314,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
if (tempData != null) if (tempData != null)
{ {
string errInfo = string.Empty; //string errInfo = string.Empty;
Model.HJGL_PW_JointInfo jointInfo = new Model.HJGL_PW_JointInfo(); ///焊口 Model.HJGL_PW_JointInfo jointInfo = new Model.HJGL_PW_JointInfo(); ///焊口
jointInfo.JOT_JointStatus = "100"; jointInfo.JOT_JointStatus = "100";
@@ -327,7 +327,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
if (string.IsNullOrEmpty(tempData.Value4)) if (string.IsNullOrEmpty(tempData.Value4))
{ {
errInfo += "焊口代号此项为必填项!"; // errInfo += "焊口代号此项为必填项!";
} }
else else
{ {
@@ -340,7 +340,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
var steel = steels.FirstOrDefault(x => x.STE_Code == tempData.Value5); var steel = steels.FirstOrDefault(x => x.STE_Code == tempData.Value5);
if (steel == null) if (steel == null)
{ {
errInfo += "材质1[" + tempData.Value5 + "]不存在;"; // errInfo += "材质1[" + tempData.Value5 + "]不存在;";
} }
else else
{ {
@@ -350,14 +350,14 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
else else
{ {
errInfo += "材质1为必填项;"; //errInfo += "材质1为必填项;";
} }
if (!string.IsNullOrEmpty(tempData.Value8)) if (!string.IsNullOrEmpty(tempData.Value8))
{ {
var type = types.FirstOrDefault(x => x.JOTY_Code == tempData.Value8); var type = types.FirstOrDefault(x => x.JOTY_Code == tempData.Value8);
if (type == null) if (type == null)
{ {
errInfo += "焊缝类型代号[" + tempData.Value8 + "]不存在;"; // errInfo += "焊缝类型代号[" + tempData.Value8 + "]不存在;";
} }
else else
{ {
@@ -366,11 +366,11 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
else else
{ {
errInfo += "焊缝类型代号为必填项;"; //errInfo += "焊缝类型代号为必填项;";
} }
if (string.IsNullOrEmpty(tempData.Value13)) if (string.IsNullOrEmpty(tempData.Value13))
{ {
errInfo += "壁厚此项为必填项!"; //errInfo += "壁厚此项为必填项!";
} }
else else
{ {
@@ -386,7 +386,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
catch (Exception) catch (Exception)
{ {
errInfo += "试验压力[" + tempData.Value15 + "]错误;"; // errInfo += "试验压力[" + tempData.Value15 + "]错误;";
} }
} }
@@ -395,7 +395,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
var service = services.FirstOrDefault(x => x.SER_Code == tempData.Value18); var service = services.FirstOrDefault(x => x.SER_Code == tempData.Value18);
if (service == null) if (service == null)
{ {
errInfo += "介质代号[" + tempData.Value18 + "]不存在;"; // errInfo += "介质代号[" + tempData.Value18 + "]不存在;";
} }
else else
{ {
@@ -411,7 +411,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
catch (Exception) catch (Exception)
{ {
errInfo += "设计压力[" + tempData.Value20 + "]错误;"; // errInfo += "设计压力[" + tempData.Value20 + "]错误;";
} }
} }
if (!string.IsNullOrEmpty(tempData.Value21)) if (!string.IsNullOrEmpty(tempData.Value21))
@@ -423,7 +423,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
catch (Exception) catch (Exception)
{ {
errInfo += "设计温度[" + tempData.Value21 + "]错误;"; // errInfo += "设计温度[" + tempData.Value21 + "]错误;";
} }
} }
@@ -432,7 +432,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
var isoClass = isoClasss.FirstOrDefault(x => x.ISC_IsoCode == tempData.Value23); var isoClass = isoClasss.FirstOrDefault(x => x.ISC_IsoCode == tempData.Value23);
if (isoClass == null) if (isoClass == null)
{ {
errInfo += "管线等级代号[" + tempData.Value23 + "]不存在;"; // errInfo += "管线等级代号[" + tempData.Value23 + "]不存在;";
} }
else else
{ {
@@ -444,7 +444,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
var component = components.FirstOrDefault(x => x.COM_Code == tempData.Value24); var component = components.FirstOrDefault(x => x.COM_Code == tempData.Value24);
if (component == null) if (component == null)
{ {
errInfo += "组件一代号[" + tempData.Value24 + "]不存在;"; // errInfo += "组件一代号[" + tempData.Value24 + "]不存在;";
} }
else else
{ {
@@ -462,7 +462,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
var steel = steels.FirstOrDefault(x => x.STE_Code == tempData.Value6); var steel = steels.FirstOrDefault(x => x.STE_Code == tempData.Value6);
if (steel == null) if (steel == null)
{ {
errInfo += "材质2[" + tempData.Value6 + "]不存在;"; // errInfo += "材质2[" + tempData.Value6 + "]不存在;";
} }
else else
{ {
@@ -473,7 +473,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
{ {
if (tempData.Value9 != "安装" && tempData.Value9 != "预制") if (tempData.Value9 != "安装" && tempData.Value9 != "预制")
{ {
errInfo += "焊接区域[" + tempData.Value9 + "]不存在;"; // errInfo += "焊接区域[" + tempData.Value9 + "]不存在;";
} }
else else
{ {
@@ -489,13 +489,13 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
else else
{ {
errInfo += "焊接区域为必填项;"; // errInfo += "焊接区域为必填项;";
} }
if (!string.IsNullOrEmpty(tempData.Value10)) if (!string.IsNullOrEmpty(tempData.Value10))
{ {
if (tempData.Value10 != "固定" && tempData.Value10 != "活动") if (tempData.Value10 != "固定" && tempData.Value10 != "活动")
{ {
errInfo += "焊口属性[" + tempData.Value10 + "]不存在;"; // errInfo += "焊口属性[" + tempData.Value10 + "]不存在;";
} }
else else
{ {
@@ -504,7 +504,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
else else
{ {
errInfo += "焊口属性为必填项;"; // errInfo += "焊口属性为必填项;";
} }
if (!string.IsNullOrEmpty(tempData.Value11)) if (!string.IsNullOrEmpty(tempData.Value11))
{ {
@@ -516,16 +516,16 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
catch (Exception) catch (Exception)
{ {
errInfo += "寸径数[" + tempData.Value11 + "]错误;"; // errInfo += "寸径数[" + tempData.Value11 + "]错误;";
} }
} }
else else
{ {
errInfo += "寸径数为必填项;"; //errInfo += "寸径数为必填项;";
} }
if (string.IsNullOrEmpty(tempData.Value12)) if (string.IsNullOrEmpty(tempData.Value12))
{ {
errInfo += "规格此项为必填项!"; // errInfo += "规格此项为必填项!";
} }
else else
{ {
@@ -536,7 +536,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
var method = methods.FirstOrDefault(x => x.WME_Code == tempData.Value14); var method = methods.FirstOrDefault(x => x.WME_Code == tempData.Value14);
if (method == null) if (method == null)
{ {
errInfo += "焊接方法代号[" + tempData.Value14 + "]不存在;"; // errInfo += "焊接方法代号[" + tempData.Value14 + "]不存在;";
} }
else else
{ {
@@ -545,14 +545,14 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
else else
{ {
errInfo += "焊接方法代号为必填项;"; // errInfo += "焊接方法代号为必填项;";
} }
if (!string.IsNullOrEmpty(tempData.Value16)) if (!string.IsNullOrEmpty(tempData.Value16))
{ {
var material = materials.FirstOrDefault(x => x.WMT_MatCode == tempData.Value16 && x.WMT_MatType == "2"); var material = materials.FirstOrDefault(x => x.WMT_MatCode == tempData.Value16 && x.WMT_MatType == "2");
if (material == null) if (material == null)
{ {
errInfo += "焊条代号[" + tempData.Value16 + "]不存在;"; // errInfo += "焊条代号[" + tempData.Value16 + "]不存在;";
} }
else else
{ {
@@ -564,7 +564,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
var material = materials.FirstOrDefault(x => x.WMT_MatCode == tempData.Value17 && x.WMT_MatType == "1"); var material = materials.FirstOrDefault(x => x.WMT_MatCode == tempData.Value17 && x.WMT_MatType == "1");
if (material == null) if (material == null)
{ {
errInfo += "焊丝代号[" + tempData.Value17 + "]不存在;"; // errInfo += "焊丝代号[" + tempData.Value17 + "]不存在;";
} }
else else
{ {
@@ -576,7 +576,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
var slopeType = slopeTypes.FirstOrDefault(x => x.JST_Code == tempData.Value22); var slopeType = slopeTypes.FirstOrDefault(x => x.JST_Code == tempData.Value22);
if (slopeType == null) if (slopeType == null)
{ {
errInfo += "坡口代号[" + tempData.Value22 + "]不存在;"; // errInfo += "坡口代号[" + tempData.Value22 + "]不存在;";
} }
else else
{ {
@@ -585,14 +585,14 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
else else
{ {
errInfo += "坡口代号必填项;"; // errInfo += "坡口代号必填项;";
} }
if (!string.IsNullOrEmpty(tempData.Value25)) if (!string.IsNullOrEmpty(tempData.Value25))
{ {
var component = components.FirstOrDefault(x => x.COM_Code == tempData.Value25); var component = components.FirstOrDefault(x => x.COM_Code == tempData.Value25);
if (component == null) if (component == null)
{ {
errInfo += "组件二代号[" + tempData.Value25 + "]不存在;"; // errInfo += "组件二代号[" + tempData.Value25 + "]不存在;";
} }
else else
{ {
@@ -608,14 +608,14 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
catch (Exception) catch (Exception)
{ {
errInfo += "预热温度[" + tempData.Value29 + "]错误;"; // errInfo += "预热温度[" + tempData.Value29 + "]错误;";
} }
} }
if (!string.IsNullOrEmpty(tempData.Value30)) if (!string.IsNullOrEmpty(tempData.Value30))
{ {
if (tempData.Value30 != "是" && tempData.Value30 != "否") if (tempData.Value30 != "是" && tempData.Value30 != "否")
{ {
errInfo += "是否热处理[" + tempData.Value30 + "]错误;"; // errInfo += "是否热处理[" + tempData.Value30 + "]错误;";
} }
else else
{ {
@@ -636,7 +636,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
&& tempData.Value31 != "1F" && tempData.Value31 != "2F" && tempData.Value31 != "2FR" && tempData.Value31 != "1F" && tempData.Value31 != "2F" && tempData.Value31 != "2FR"
&& tempData.Value31 != "4F" && tempData.Value31 != "5F") && tempData.Value31 != "4F" && tempData.Value31 != "5F")
{ {
errInfo += "焊接位置[" + tempData.Value31 + "]不存在;"; //errInfo += "焊接位置[" + tempData.Value31 + "]不存在;";
} }
else else
{ {
@@ -645,7 +645,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
else else
{ {
errInfo += "焊接位置必填项;"; //errInfo += "焊接位置必填项;";
} }
if (!string.IsNullOrEmpty(tempData.Value32)) if (!string.IsNullOrEmpty(tempData.Value32))
{ {
@@ -656,7 +656,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
catch (Exception) catch (Exception)
{ {
errInfo += "外径[" + tempData.Value32 + "]错误;"; // errInfo += "外径[" + tempData.Value32 + "]错误;";
} }
} }
#endregion #endregion
@@ -734,7 +734,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking
var dn = dns.FirstOrDefault(x => x.BST_DN == tempData.Value35); var dn = dns.FirstOrDefault(x => x.BST_DN == tempData.Value35);
if (dn == null) if (dn == null)
{ {
errInfo += "公称直径[" + tempData.Value35 + "]基础表中不存在错误;"; // errInfo += "公称直径[" + tempData.Value35 + "]基础表中不存在错误;";
} }
else else
{ {
@@ -744,14 +744,14 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
catch (Exception) catch (Exception)
{ {
errInfo += "公称直径[" + tempData.Value35 + "]错误;"; // errInfo += "公称直径[" + tempData.Value35 + "]错误;";
} }
} }
} }
#endregion #endregion
} }
if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 这插入管线焊口 // if (string.IsNullOrEmpty(errInfo)) ////所有信息正确的话 这插入管线焊口
{ {
isoInfo.ProjectId = this.CurrUser.LoginProjectId; isoInfo.ProjectId = this.CurrUser.LoginProjectId;
jointInfo.ProjectId = this.CurrUser.LoginProjectId; jointInfo.ProjectId = this.CurrUser.LoginProjectId;
@@ -790,13 +790,13 @@ namespace FineUIPro.Web.HJGL.JoinMarking
} }
if (!string.IsNullOrEmpty(errInfo)) //if (!string.IsNullOrEmpty(errInfo))
{ //{
tempData.ToopValue = errInfo; // tempData.ToopValue = errInfo;
BLL.DataInTempService.UpdateDataInTemp(tempData); // BLL.DataInTempService.UpdateDataInTemp(tempData);
erreMessage += errInfo + ";"; // erreMessage += errInfo + ";";
} //}
} }
} }