From 595f6226f25cf5347e7aedf6599bb8ab8b69cd73 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 4 Sep 2023 18:07:10 +0800 Subject: [PATCH] 2023-09-04 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 264192 -> 263168 bytes SGGL/BLL/HJGL/PointTrust/PointBatchService.cs | 4 +- .../HJGL/RepairAndExpand/RepairTrust.aspx.cs | 51 +++++++++--------- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index d63d4610039736807c50f0bc7016461c15607c66..8326a29aeccd0e42f21860e96045767e42b24d2e 100644 GIT binary patch delta 2332 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 NZN8#-=)Rqg{0W1?IB@^~ diff --git a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs index 0f10bd28..b391b9d2 100644 --- a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs +++ b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs @@ -291,7 +291,7 @@ namespace BLL BLL.Funs.DB.HJGL_Batch_PointBatchItem.InsertOnSubmit(batchDetail); BLL.Funs.DB.SubmitChanges(); - // 焊工首道口RT必点 + /*// 焊工首道口RT必点 var joints = from x in Funs.DB.HJGL_Batch_PointBatchItem join y in Funs.DB.HJGL_Batch_PointBatch on x.PointBatchId equals y.PointBatchId join z in Funs.DB.Base_DetectionType on y.DetectionTypeId equals z.DetectionTypeId @@ -303,7 +303,7 @@ namespace BLL { BLL.PointBatchDetailService.UpdatePointBatchDetail(pointBatchItemId, "1", System.DateTime.Now); BLL.PointBatchDetailService.UpdateWelderFirst(pointBatchItemId, true); - } + }*/ } catch { diff --git a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs index 6ba7cdb4..7c963f7e 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairAndExpand/RepairTrust.aspx.cs @@ -447,37 +447,38 @@ namespace FineUIPro.Web.HJGL.RepairAndExpand protected void btnPrint_Click(object sender, EventArgs e) { - if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_RepairTrustMenuId, Const.BtnPrint)) + if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + string varValue = string.Empty; + string trustBatchId = this.tvControlItem.SelectedNodeID; + + Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewById(trustBatchId); + if (trust != null) { - string varValue = string.Empty; - string trustBatchId = this.tvControlItem.SelectedNodeID; - - Model.View_Batch_BatchTrust trust = BLL.Batch_BatchTrustService.GetBatchTrustViewById(trustBatchId); - if (trust != null) + varValue = trust.TrustBatchCode + "|" + trust.TrustDate.Value.Date + "|"; + var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); + if (project != null) { - varValue = trust.TrustBatchCode + "|" + trust.TrustDate.Value.Date + "|"; - var project = BLL.ProjectService.GetProjectByProjectId(this.CurrUser.LoginProjectId); - if (project != null) - { - varValue = varValue + project.ProjectName + "|" + project.ProjectCode + "|"; - } - //varValue = varValue + trust.InstallationName + "|" + trust.InstallationCode; - if (!string.IsNullOrEmpty(varValue)) - { - varValue = HttpUtility.UrlEncodeUnicode(varValue); - } - - //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", BLL.Const.CheckTrustReport, trustBatchId, varValue))); + varValue = varValue + project.ProjectName + "|" + project.ProjectCode + "|"; } + //varValue = varValue + trust.InstallationName + "|" + trust.InstallationCode; + if (!string.IsNullOrEmpty(varValue)) + { + varValue = HttpUtility.UrlEncodeUnicode(varValue); + } + + //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../../Common/ReportPrint/ExReportPrint.aspx?ispop=1&reportId={0}&replaceParameter={1}&varValue={2}&projectId=0", BLL.Const.CheckTrustReport, trustBatchId, varValue))); } } - else - { - ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - return; - } + //if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_RepairTrustMenuId, Const.BtnPrint)) + //{ + + //} + //else + //{ + // ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // return; + //} } #region 判断是否可删除