shecs/ZHJA_HJGL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

111

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/MTReportEdit.aspx.cs
+11 -10
View File
@@ -310,14 +310,15 @@ namespace FineUIPro.Web.HJGL.CheckManage
if (mtReport != null)
{
this.TestingReportPrintId = mtReport.TestingReportPrintId;
if (!string.IsNullOrEmpty(mtReport.ReportCode) && mtReport.ReportCode.Length > 3)
{
this.txtMTReportCode.Text = mtReport.ReportCode.Substring(3);//报告编号
}
else
{
this.txtMTReportCode.Text = mtReport.ReportCode;
}
//if (!string.IsNullOrEmpty(mtReport.ReportCode) && mtReport.ReportCode.Length > 3)
//{
// this.txtMTReportCode.Text = mtReport.ReportCode.Substring(3);//报告编号
//}
//else
//{
// this.txtMTReportCode.Text = mtReport.ReportCode;
//}
this.txtMTReportCode.Text = mtReport.ReportCode;
this.hdReportCode.Text = mtReport.ReportCode;
this.txtSurfaceState.Text = mtReport.MT_SurfaceState;//表面状态
@@ -342,8 +343,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
}
else
{
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "MT-" + pro.TestEngineeringCode + "-");
this.txtMTReportCode.Text = this.hdReportCode.Text.Substring(3);
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-MT-");
this.txtMTReportCode.Text = this.hdReportCode.Text;
}
BindGrid();
}
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/PTReportEdit.aspx.cs
+11 -10
View File
@@ -267,14 +267,15 @@ namespace FineUIPro.Web.HJGL.CheckManage
if (ptReport != null)
{
this.TestingReportPrintId = ptReport.TestingReportPrintId;
if (!string.IsNullOrEmpty(ptReport.ReportCode) && ptReport.ReportCode.Length > 3)
{
this.txtPTReportCode.Text = ptReport.ReportCode.Substring(3);//报告编号
}
else
{
this.txtPTReportCode.Text = ptReport.ReportCode;
}
//if (!string.IsNullOrEmpty(ptReport.ReportCode) && ptReport.ReportCode.Length > 3)
//{
// this.txtPTReportCode.Text = ptReport.ReportCode.Substring(3);//报告编号
//}
//else
//{
// this.txtPTReportCode.Text = ptReport.ReportCode;
//}
this.txtPTReportCode.Text = ptReport.ReportCode;
this.hdReportCode.Text = ptReport.ReportCode;
//this.txtContractUnit.Text = ptReport.ContractUnitId;//承包单位
@@ -299,8 +300,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
}
else
{
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "PT-" + pro.TestEngineeringCode + "-");
this.txtPTReportCode.Text = this.hdReportCode.Text.Substring(3);
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-PT-");
this.txtPTReportCode.Text = this.hdReportCode.Text;
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
}
BindGrid();
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/RTReportEdit.aspx.cs
+13 -12
View File
@@ -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();
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/TestingReportPrint.aspx.cs
+15 -14
View File
@@ -500,7 +500,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
string reportCode = string.Empty;
if (!string.IsNullOrEmpty(rtReport.ReportCode) && rtReport.ReportCode.Length > 3)
{
reportCode = rtReport.ReportCode.Substring(3);
//reportCode = rtReport.ReportCode.Substring(3);
reportCode = rtReport.ReportCode;
}
string unitName = string.Empty;
if (iso != null)
@@ -540,24 +541,24 @@ namespace FineUIPro.Web.HJGL.CheckManage
}
if (ndtType.NDT_Code == "RT")
{
code = dateStr + "-RT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + (tb.Rows.Count - 1).ToString();
code = dateStr + "-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + (tb.Rows.Count - 1).ToString() + "-" + userName;
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
}
else if (ndtType.NDT_Code == "PT")
else
{
code = dateStr + "-PT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName;
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
}
else if (ndtType.NDT_Code == "MT")
{
code = dateStr + "-MT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName;
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
}
else if (ndtType.NDT_Code == "UT")
{
code = dateStr + "-UT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName;
code = dateStr + "-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName + "-" + jointDesc + "-" + (tb.Rows.Count - 1).ToString();
PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
}
//else if (ndtType.NDT_Code == "MT")
//{
// code = dateStr + "-MT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName;
// PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
//}
//else if (ndtType.NDT_Code == "UT")
//{
// code = dateStr + "-UT-" + reportCode + "-" + unitName + "-" + projectCode + "-" + projectName + "(" + iso.ISO_IsoNo + ")-" + userName;
// PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("FileCode.aspx?code={0}", HttpUtility.UrlEncodeUnicode(code), "编辑 - ")));
//}
}
else
{
HJGL_ZH/FineUIPro.Web/HJGL/CheckManage/UTReportEdit.aspx.cs
+11 -10
View File
@@ -316,14 +316,15 @@ namespace FineUIPro.Web.HJGL.CheckManage
if (utReport != null)
{
this.TestingReportPrintId = utReport.TestingReportPrintId;
if (!string.IsNullOrEmpty(utReport.ReportCode) && utReport.ReportCode.Length > 3)
{
this.txtUTReportCode.Text = utReport.ReportCode.Substring(3);//报表编号
}
else
{
this.txtUTReportCode.Text = utReport.ReportCode;
}
//if (!string.IsNullOrEmpty(utReport.ReportCode) && utReport.ReportCode.Length > 3)
//{
// this.txtUTReportCode.Text = utReport.ReportCode.Substring(3);//报表编号
//}
//else
//{
// this.txtUTReportCode.Text = utReport.ReportCode;
//}
this.txtUTReportCode.Text = utReport.ReportCode;
this.hdReportCode.Text = utReport.ReportCode;
//this.txtContractUnit.Text = utReport.ContractUnitId;//承包单位
@@ -349,8 +350,8 @@ namespace FineUIPro.Web.HJGL.CheckManage
}
else
{
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, "UT-" + pro.TestEngineeringCode + "-");
this.txtUTReportCode.Text = this.hdReportCode.Text.Substring(3);
this.hdReportCode.Text = BLL.SQLHelper.RunProcNewIdByProjectId("SpGetNewCodeByProjectId3", "HJGL_CH_TestingReportPrint", "ReportCode", iso.ProjectId, pro.TestEngineeringCode + "-UT-");
this.txtUTReportCode.Text = this.hdReportCode.Text;
this.txtContractUnit.Text = "镇海石化建安工程有限公司";
this.txtSurfaceState.Text = "机械打磨";
this.txtProbeType.Text = "2.5MHZ10×10K2";