This commit is contained in:
parent
80f8cecc56
commit
2b2856beee
|
|
@ -208,7 +208,7 @@ namespace BLL
|
||||||
//小于500的焊口按比例及规则点口
|
//小于500的焊口按比例及规则点口
|
||||||
var batchItems500Down = from x in db.HJGL_Batch_PointBatchItem
|
var batchItems500Down = from x in db.HJGL_Batch_PointBatchItem
|
||||||
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
|
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
|
||||||
where y.Dia < 500 && x.PointBatchId == pointBatchId
|
where (y.Dia < 500 || y.Dia == null) && x.PointBatchId == pointBatchId
|
||||||
select x;
|
select x;
|
||||||
if (batch.DetectionRateId != null && batchItems500Down.Count() > 0)
|
if (batch.DetectionRateId != null && batchItems500Down.Count() > 0)
|
||||||
{
|
{
|
||||||
|
|
@ -219,11 +219,11 @@ namespace BLL
|
||||||
|
|
||||||
var weldG = from x in db.HJGL_Batch_PointBatchItem
|
var weldG = from x in db.HJGL_Batch_PointBatchItem
|
||||||
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
|
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
|
||||||
where y.JointAttribute == "安装口" && y.Dia < 500 && x.PointBatchId == pointBatchId
|
where y.JointAttribute == "安装口" && (y.Dia < 500 || y.Dia == null) && x.PointBatchId == pointBatchId
|
||||||
select x;
|
select x;
|
||||||
var weldA = from x in db.HJGL_Batch_PointBatchItem
|
var weldA = from x in db.HJGL_Batch_PointBatchItem
|
||||||
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
|
join y in db.HJGL_WeldJoint on x.WeldJointId equals y.WeldJointId
|
||||||
where y.JointAttribute == "预制口" && y.Dia < 500 && x.PointBatchId == pointBatchId
|
where y.JointAttribute == "预制口" && (y.Dia < 500 || y.Dia == null) && x.PointBatchId == pointBatchId
|
||||||
select x;
|
select x;
|
||||||
if (weldG.Count() > 0)
|
if (weldG.Count() > 0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue