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

Compare commits

base: gaofei:28634ed93b02642cc559c12af0155456df8aba82
Branches Tags
gaofei:master
..
compare: gaofei:4c9957d0863381b074ad917e9f634697f55d0e0f
Branches Tags
gaofei:master

No commits in common. "28634ed93b02642cc559c12af0155456df8aba82" and "4c9957d0863381b074ad917e9f634697f55d0e0f" have entirely different histories.
28634ed93b ... 4c9957d086

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

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

@ -605,12 +605,9 @@ namespace FineUIPro.Web.HJGL.DataIn
{ {
result += "第" + (i + 2).ToString() + "行," + "该焊口的焊工资质不符合" + "\n"; result += "第" + (i + 2).ToString() + "行," + "该焊口的焊工资质不符合" + "\n";
} }
else else //D类口暂时不提示
{ {
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,13 +465,6 @@ 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,15 +214,6 @@ 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);