diff --git a/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs b/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs index ddeb5ae3..d878af84 100644 --- a/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs +++ b/SGGL/BLL/HJGL/PointTrust/PointBatchDetailService.cs @@ -208,7 +208,7 @@ namespace BLL //小于500的焊口按比例及规则点口 var batchItems500Down = from x in db.HJGL_Batch_PointBatchItem 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; if (batch.DetectionRateId != null && batchItems500Down.Count() > 0) { @@ -219,11 +219,11 @@ namespace BLL var weldG = from x in db.HJGL_Batch_PointBatchItem 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; var weldA = from x in db.HJGL_Batch_PointBatchItem 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; if (weldG.Count() > 0) {