This commit is contained in:
parent
264b9548b2
commit
39b1c75359
|
|
@ -200,14 +200,15 @@
|
||||||
this.ddlCheckFlag.Text = "未检测";
|
this.ddlCheckFlag.Text = "未检测";
|
||||||
if (!string.IsNullOrEmpty(this.JOT_ID))
|
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 batchDetail = BLL.HJGL_BO_BatchDetailService.GetBatchDetailByJotId(JOT_ID);
|
||||||
var batch = (from x in Funs.DB.HJGL_BO_Batch
|
var batch = (from x in Funs.DB.HJGL_BO_Batch
|
||||||
join y in Funs.DB.HJGL_BO_BatchDetail
|
join y in Funs.DB.HJGL_BO_BatchDetail
|
||||||
on x.BatchId equals y.BatchId
|
on x.BatchId equals y.BatchId
|
||||||
where y.JOT_ID == this.JOT_ID
|
where y.JOT_ID == this.JOT_ID
|
||||||
select x).FirstOrDefault();
|
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);
|
this.TextIsReadOnly(true);
|
||||||
var trustItem = (from x in Funs.DB.HJGL_CH_TrustItem
|
var trustItem = (from x in Funs.DB.HJGL_CH_TrustItem
|
||||||
|
|
@ -262,16 +263,16 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hotItems.Count() > 0)
|
//if (hotItems.Count() > 0)
|
||||||
{
|
//{
|
||||||
drpIS_Proess.Enabled = false;
|
// drpIS_Proess.Enabled = false;
|
||||||
//drpProessTypes.Enabled = false;
|
// //drpProessTypes.Enabled = false;
|
||||||
}
|
//}
|
||||||
else
|
//else
|
||||||
{
|
//{
|
||||||
drpIS_Proess.Enabled = true;
|
// drpIS_Proess.Enabled = true;
|
||||||
//drpProessTypes.Enabled = true;
|
// //drpProessTypes.Enabled = true;
|
||||||
}
|
//}
|
||||||
|
|
||||||
//热处理后只能增加热处理类型,或者去除还未委托的热处理类型
|
//热处理后只能增加热处理类型,或者去除还未委托的热处理类型
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue