lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(hjgl): 完善焊接任务与质量管理流程

Browse Source
This commit is contained in:
李鹏飞
2026-08-19 17:13:33 +08:00
parent 08792e0dc8
commit 679e9f6cec
68 changed files with 2481 additions and 1170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+40 -5
View File
@@ -215,8 +215,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
OUTER APPLY (
SELECT TOP 1 temp.TempDetailId
FROM dbo.HJGL_WeldingDailyTempDetail AS temp
WHERE temp.WeldJointId = jot.WeldJointId AND temp.AuditState = 1
ORDER BY temp.AuditDate DESC, temp.SubmitDate DESC
WHERE temp.WeldJointId = jot.WeldJointId AND temp.AuditState = 2
ORDER BY temp.ProfessionalAuditDate DESC, temp.SubmitDate DESC
) AS reportTemp
LEFT JOIN dbo.AttachFile AS beforeAtt ON beforeAtt.MenuId = @WeldReportMenuId
AND beforeAtt.ToKeyId = reportTemp.TempDetailId + '#Before'
@@ -728,10 +728,45 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
/// <summary>
/// 待审核记录审核通过
/// 班组审核
/// </summary>
protected void btnPendingAudit_Click(object sender, EventArgs e)
protected void btnPendingTeamAudit_Click(object sender, EventArgs e)
{
if (!CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId,
Const.HJGL_WeldReportMenuId, Const.BtnAuditing))
{
ShowNotify("您没有审核权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
if (GridPending.SelectedRowIDArray.Length == 0)
{
ShowNotify("请选择要审核的记录", MessageBoxIcon.Warning);
return;
}
string errlog = BLL.WeldingDailyService.TeamAuditWeldingDailyTempDetails(GridPending.SelectedRowIDArray, this.CurrUser.PersonId);
this.BindPendingGrid();
if (string.IsNullOrEmpty(errlog))
{
ShowNotify("班组审核完成！", MessageBoxIcon.Success);
}
else
{
Alert.ShowInTop("部分记录处理失败：" + errlog, MessageBoxIcon.Warning);
}
}
/// <summary>
/// 专工审核
/// </summary>
protected void btnPendingProfessionalAudit_Click(object sender, EventArgs e)
{
if (!CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId,
Const.HJGL_WeldReportMenuId, Const.BtnAuditing))
{
ShowNotify("您没有审核权限，请与管理员联系！", MessageBoxIcon.Warning);
return;
}
if (GridPending.SelectedRowIDArray.Length == 0)
{
ShowNotify("请选择要审核的记录", MessageBoxIcon.Warning);
@@ -743,7 +778,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.BindPendingGrid();
if (string.IsNullOrEmpty(errlog))
{
ShowNotify("审核通过！", MessageBoxIcon.Success);
ShowNotify("专工审核完成！", MessageBoxIcon.Success);
}
else
{