diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index d63d4610..8326a29a 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ 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 判断是否可删除