提交代码

This commit is contained in:
2023-11-21 20:26:41 +08:00
parent bcc72eae50
commit 55b52e460a
10 changed files with 547 additions and 169 deletions
@@ -267,9 +267,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,
(CASE WHEN AuditDate IS NOT NULL THEN '已审核' ELSE '未审核' END) AS IsAudit,
subMan.PersonName AS SubmitMan,auditMan.PersonName AS AuditMan,AuditDate
subMan.PersonName AS SubmitMan,auditMan.PersonName AS AuditMan,AuditDate,auditMan2.PersonName AS AuditMan2,AuditDate2
FROM View_HJGL_WeldJoint
LEFT JOIN dbo.Person_Persons auditMan ON auditMan.PersonId=View_HJGL_WeldJoint.AuditMan
LEFT JOIN dbo.Person_Persons auditMan2 ON auditMan2.PersonId=View_HJGL_WeldJoint.AuditMan2
LEFT JOIN dbo.Person_Persons subMan ON subMan.PersonId=View_HJGL_WeldJoint.SubmitMan
WHERE IsTwoJoint = 1";
List<SqlParameter> listStr = new List<SqlParameter> { };
@@ -548,6 +549,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
protected void btnAudit2_Click(object sender, EventArgs e)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_JotTwoDesignMenuId, BLL.Const.BtnAuditing))
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
return;
}
string[] weldJointIdList = Grid1.SelectedRowIDArray;
foreach (string jot in weldJointIdList)
{
BLL.WeldJointService.UpdateJointAudit2(jot, CurrUser.PersonId, DateTime.Now);
}
ShowNotify("所选口审核成功!", MessageBoxIcon.Success);
BindGrid();
//string weldJointIdList = string.Join("|", Grid1.SelectedRowIDArray);
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TwoJointAudit.aspx?WeldJointIdList={0}", Grid1.SelectedRowID, "维护 - ")));
}
else
{
ShowNotify("您没有这个权限,请与管理员联系!", MessageBoxIcon.Warning);
}
}
protected void btnCancelAudit_Click(object sender, EventArgs e)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_JotTwoDesignMenuId, BLL.Const.BtnAuditing))
@@ -573,6 +599,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
}
protected void btnCancelAudit2_Click(object sender, EventArgs e)
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_JotTwoDesignMenuId, BLL.Const.BtnAuditing))
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
return;
}
string[] weldJointIdList = Grid1.SelectedRowIDArray;
foreach (string jot in weldJointIdList)
{
BLL.WeldJointService.UpdateJointAudit2(jot, null, null);
}
ShowNotify("已取消所选口的审核!", MessageBoxIcon.Success);
BindGrid();
//string weldJointIdList = string.Join("|", Grid1.SelectedRowIDArray);
//PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TwoJointAudit.aspx?WeldJointIdList={0}", Grid1.SelectedRowID, "维护 - ")));
}
else
{
ShowNotify("您没有这个权限,请与管理员联系!", MessageBoxIcon.Warning);
}
}
/// <summary>
/// 焊口信息插入
/// </summary>