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
@@ -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
{