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

1

This commit is contained in:
高飞 2025-12-19 10:29:14 +08:00
parent 64f32709e2
commit 5295eff5c6
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
View File

@ -605,9 +605,12 @@ namespace FineUIPro.Web.HJGL.DataIn
{ {
result += "第" + (i + 2).ToString() + "行," + "该焊口的焊工资质不符合" + "\n"; result += "第" + (i + 2).ToString() + "行," + "该焊口的焊工资质不符合" + "\n";
} }
else //D类口暂时不提示 else
{ {
if (floorWelderQualifys.Count() == 0 && cellWelderQualifys.Count() == 0) //D类口强制提交时，应至少有焊工证，否则也不可强制提交
{
result += "第" + (i + 2).ToString() + "行," + "该焊口的焊工资质不符合" + "\n";
}
} }
} }
} }

7
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -465,6 +465,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
isAllD = false; isAllD = false;
} }
else
{
if (floorWelderQualifys.Count() == 0 && cellWelderQualifys.Count() == 0) //D类口强制提交时，应至少有焊工证，否则也不可强制提交
{
isAllD = false;
}
}
} }
} }
if (eventArg != string.Empty) if (eventArg != string.Empty)

9
HJGL_DS/WebAPI/Controllers/JointInfoController.cs
View File

@ -214,6 +214,15 @@ namespace WebAPI.Controllers
responeData.message = "该焊口的焊工资质不符合！"; responeData.message = "该焊口的焊工资质不符合！";
return responeData; return responeData;
} }
else
{
if (floorWelderQualifys.Count() == 0 && cellWelderQualifys.Count() == 0) //D类口强制提交时，应至少有焊工证，否则也不可强制提交
{
responeData.code = 0;
responeData.message = "该焊口的焊工资质不符合！";
return responeData;
}
}
} }
} }
BLL.APIJointInfoService.SaveJointInfoForWeldReport(addItem); BLL.APIJointInfoService.SaveJointInfoForWeldReport(addItem);