This commit is contained in:
2025-02-14 16:48:50 +08:00
parent 86b1e8b3da
commit 6d4a7e82a7
51 changed files with 1888 additions and 339 deletions
@@ -101,6 +101,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
{
this.ProjectId = trust.ProjectId;
this.txtHardTestReportCode.Text = trust.HardTestReportCode;
string execStandard = string.Empty;
if (!string.IsNullOrEmpty(trust.TrustUnitId))
{
this.drpUnit.SelectedValue = trust.TrustUnitId;
@@ -124,6 +125,14 @@ namespace FineUIPro.Web.HJGL.HotHardManage
this.ddlSTE.SelectedValue = trust.STE_ID;
this.txtMaterialStandard.Text = steel2.HardQuaStandard;
}
if(!string.IsNullOrEmpty(isoInfo.ISO_Executive))
{
var exec = BLL.HJGL_ExecStandardService.GetExecStandardById(isoInfo.ISO_Executive);
if (exec != null)
{
execStandard = exec.ExecStandardName;
}
}
}
}
this.txtContractUnit.Text = trust.ContractUnit;
@@ -149,6 +158,15 @@ namespace FineUIPro.Web.HJGL.HotHardManage
{
this.txtTestCount.Text = trust.TestCount.ToString();
}
if (!string.IsNullOrEmpty(trust.ExecStandard))
{
txtExecStandard.Text = trust.ExecStandard;
}
else
{
txtExecStandard.Text = execStandard;
}
}
else
{
@@ -255,6 +273,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
}
newHardTestReport.TestRate = this.txtTestRate.Text.Trim();
newHardTestReport.TestCount = Funs.GetNewIntOrZero(this.txtTestCount.Text.Trim());
newHardTestReport.ExecStandard = this.txtExecStandard.Text.Trim();
BLL.HJGL_CH_HardTestReportService.UpdateCH_HardTestReport(newHardTestReport);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, newHardTestReport.ProjectId, this.CurrUser.UserId, "修改硬度检测报告信息");
}