diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs index b2773cb..258a7c5 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx.cs @@ -200,14 +200,15 @@ this.ddlCheckFlag.Text = "未检测"; if (!string.IsNullOrEmpty(this.JOT_ID)) { - var hotItems = from x in BLL.Funs.DB.HJGL_CH_HotProessTrustItem where x.JOT_ID == JOT_ID select x; + //var hotItems = from x in BLL.Funs.DB.HJGL_CH_HotProessTrustItem where x.JOT_ID == JOT_ID select x; var batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByJotId(JOT_ID); var batch = (from x in Funs.DB.HJGL_BO_Batch join y in Funs.DB.HJGL_BO_BatchDetail on x.BatchId equals y.BatchId where y.JOT_ID == this.JOT_ID select x).FirstOrDefault(); - if ((batchDetail != null || hotItems.Count() > 0) && this.CurrUser.UserId != BLL.Const.GlyId) + //if ((batchDetail != null || hotItems.Count() > 0) && this.CurrUser.UserId != BLL.Const.GlyId) + if ((batchDetail != null) && this.CurrUser.UserId != BLL.Const.GlyId) { this.TextIsReadOnly(true); var trustItem = (from x in Funs.DB.HJGL_CH_TrustItem @@ -262,16 +263,16 @@ } } - if (hotItems.Count() > 0) - { - drpIS_Proess.Enabled = false; - //drpProessTypes.Enabled = false; - } - else - { - drpIS_Proess.Enabled = true; - //drpProessTypes.Enabled = true; - } + //if (hotItems.Count() > 0) + //{ + // drpIS_Proess.Enabled = false; + // //drpProessTypes.Enabled = false; + //} + //else + //{ + // drpIS_Proess.Enabled = true; + // //drpProessTypes.Enabled = true; + //} //热处理后只能增加热处理类型,或者去除还未委托的热处理类型 }