diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs index cfbac69..6f8138a 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs @@ -605,9 +605,12 @@ namespace FineUIPro.Web.HJGL.DataIn { result += "第" + (i + 2).ToString() + "行," + "该焊口的焊工资质不符合" + "\n"; } - else //D类口暂时不提示 + else { - + if (floorWelderQualifys.Count() == 0 && cellWelderQualifys.Count() == 0) //D类口强制提交时,应至少有焊工证,否则也不可强制提交 + { + result += "第" + (i + 2).ToString() + "行," + "该焊口的焊工资质不符合" + "\n"; + } } } } diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index e045e04..d59553d 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -465,6 +465,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage { isAllD = false; } + else + { + if (floorWelderQualifys.Count() == 0 && cellWelderQualifys.Count() == 0) //D类口强制提交时,应至少有焊工证,否则也不可强制提交 + { + isAllD = false; + } + } } } if (eventArg != string.Empty) diff --git a/HJGL_DS/WebAPI/Controllers/JointInfoController.cs b/HJGL_DS/WebAPI/Controllers/JointInfoController.cs index d4f2bb8..b9ca994 100644 --- a/HJGL_DS/WebAPI/Controllers/JointInfoController.cs +++ b/HJGL_DS/WebAPI/Controllers/JointInfoController.cs @@ -214,6 +214,15 @@ namespace WebAPI.Controllers responeData.message = "该焊口的焊工资质不符合!"; return responeData; } + else + { + if (floorWelderQualifys.Count() == 0 && cellWelderQualifys.Count() == 0) //D类口强制提交时,应至少有焊工证,否则也不可强制提交 + { + responeData.code = 0; + responeData.message = "该焊口的焊工资质不符合!"; + return responeData; + } + } } } BLL.APIJointInfoService.SaveJointInfoForWeldReport(addItem);