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
@@ -339,15 +339,16 @@ namespace FineUIPro.Web.HJGL.CheckManage
if (rtReport != null)
{
this.TestingReportPrintId = rtReport.TestingReportPrintId;
if (!string.IsNullOrEmpty(rtReport.ReportCode) && rtReport.ReportCode.Length > 3)
{
this.txtRTReportCode.Text = rtReport.ReportCode.Substring(3);
}
else
{
this.txtRTReportCode.Text = rtReport.ReportCode;
}
//if (!string.IsNullOrEmpty(rtReport.ReportCode) && rtReport.ReportCode.Length > 3)
//{
// this.txtRTReportCode.Text = rtReport.ReportCode.Substring(3);
//}
//else
//{
// this.txtRTReportCode.Text = rtReport.ReportCode;
//}
this.txtRTReportCode.Text = rtReport.ReportCode;
this.hdReportCode.Text = rtReport.ReportCode;
this.txtTechnicalGrade.Text = rtReport.RT_TechnicalGrade;
@@ -391,7 +392,7 @@ namespace FineUIPro.Web.HJGL.CheckManage
else
{
int maxCode = 0;
string prefix = "RT-" + pro.TestEngineeringCode + "-";
string prefix = pro.TestEngineeringCode + "-RT-";
int prefixLeng = prefix.Length + 1;
string sqlstr = "SELECT MAX(CONVERT(INT, SUBSTRING(ReportCode,@prefixLeng,LEN(ReportCode)))) FROM HJGL_CH_TestingReportPrint WHERE ProjectId=@ProjectId AND ReportCode LIKE @prefix";
List<SqlParameter> listStr = new List<SqlParameter>();
@@ -406,13 +407,13 @@ namespace FineUIPro.Web.HJGL.CheckManage
}
if (maxCode < 999)
{
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "RT-" + pro.TestEngineeringCode + "-");
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-RT-");
}
else
{
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeThreeToFour", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "RT-" + pro.TestEngineeringCode + "-");
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeThreeToFour", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-RT-");
}
this.txtRTReportCode.Text = this.hdReportCode.Text.Substring(3);
this.txtRTReportCode.Text = this.hdReportCode.Text;
this.txtTubeVoltage.Text = " kv";
}
BindGrid();