lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250805 修改试压前条件确认

Browse Source
This commit is contained in:
毕文静
2025-08-05 13:54:42 +08:00
parent 31910dfb5a
commit e7786e3023
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx
+1 -1
View File
@@ -101,7 +101,7 @@
<f:Label CssClass="Yellow" runat="server" ID="Label6" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label> <f:Label CssClass="Yellow" runat="server" ID="Label6" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab22" Label="未关闭的检测批数" LabelWidth="140px" Width="210px" LabelAlign="Right"></f:Label> <f:Label runat="server" ID="lab22" Label="未关闭的检测批数" LabelWidth="140px" Width="210px" LabelAlign="Right"></f:Label>
<f:Label CssClass="Purple" runat="server" ID="Label10" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label> <f:Label CssClass="Purple" runat="server" ID="Label10" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab32" Label="未检测或检测不合格的焊口数" LabelWidth="210px" Width="250px" LabelAlign="Right"></f:Label> <f:Label runat="server" ID="lab32" Label="未检测或检测不合格的焊口数" LabelWidth="210px" Width="300px" LabelAlign="Right"></f:Label>
<f:Label CssClass="Green" runat="server" ID="Label8" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label> <f:Label CssClass="Green" runat="server" ID="Label8" Text="&nbsp;&nbsp;&nbsp;&nbsp;" LabelAlign="Right"></f:Label>
<f:Label runat="server" ID="lab42" Label="具备试压条件管线数" LabelWidth="150px" Width="180px" LabelAlign="Right"></f:Label> <f:Label runat="server" ID="lab42" Label="具备试压条件管线数" LabelWidth="150px" Width="180px" LabelAlign="Right"></f:Label>
</Items> </Items>
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
+16 -6
View File
@@ -348,20 +348,30 @@ namespace FineUIPro.Web.HJGL.TestPackage
int totalJointNum = totalJoint.Count(); //总焊口 int totalJointNum = totalJoint.Count(); //总焊口
int totalWeldingJointNum = totalJoint.Count(x => x.WeldingDailyId != null); //已焊总焊口 int totalWeldingJointNum = totalJoint.Count(x => x.WeldingDailyId != null); //已焊总焊口
int notCloseBatch = (from x in db.HJGL_Batch_PointBatch int notCloseBatch = (from x in db.HJGL_Batch_PointBatch
where x.UnitWorkId == pipeline.UnitWorkId && x.DetectionRateId == pipeline.DetectionRateId join y in db.PTP_PipelineList on x.PipelineId equals y.PipelineId
where y.PTP_ID==this.PTP_ID //x.UnitWorkId == pipeline.UnitWorkId
&& x.DetectionRateId == pipeline.DetectionRateId
&& x.DetectionTypeId == pipeline.DetectionType && x.EndDate == null && x.DetectionTypeId == pipeline.DetectionType && x.EndDate == null
select x).Count(); //未关闭批 select x).Count(); //未关闭批
int allPointJointNum = (from x in db.HJGL_Batch_PointBatchItem int allPointJointNum = (from x in db.HJGL_Batch_PointBatchItem
join y in db.HJGL_Batch_PointBatch on x.PointBatchId equals y.PointBatchId join y in db.HJGL_Batch_PointBatch on x.PointBatchId equals y.PointBatchId
where y.UnitWorkId == pipeline.UnitWorkId && y.DetectionRateId == pipeline.DetectionRateId join j in db.HJGL_WeldJoint on x.WeldJointId equals j.WeldJointId
join p in db.PTP_PipelineList on j.PipelineId equals p.PipelineId
where p.PTP_ID == this.PTP_ID //x.UnitWorkId == pipeline.UnitWorkId
&& y.DetectionRateId == pipeline.DetectionRateId
&& y.DetectionTypeId == pipeline.DetectionType && x.PointState != null && y.DetectionTypeId == pipeline.DetectionType && x.PointState != null
select x).Count(); //全部点口（含扩透） select x).Count(); //全部点口（含扩透）
int allOKCheckNum = (from x in db.HJGL_Batch_NDEItem int allOKCheckNum = (from x in db.HJGL_Batch_NDEItem
join y in db.HJGL_Batch_NDE on x.NDEID equals y.NDEID join y in db.HJGL_Batch_NDE on x.NDEID equals y.NDEID
join z in db.HJGL_Batch_BatchTrust on y.TrustBatchId equals z.TrustBatchId join t in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals t.TrustBatchItemId
where z.UnitWorkId == pipeline.UnitWorkId && z.DetectionRateId == pipeline.DetectionRateId join z in db.HJGL_Batch_BatchTrust on t.TrustBatchId equals z.TrustBatchId
&& z.DetectionTypeId == pipeline.DetectionType && x.CheckResult == "1" join j in db.HJGL_WeldJoint on t.WeldJointId equals j.WeldJointId
select x).Count(); //全部检测合格口 join p in db.PTP_PipelineList on j.PipelineId equals p.PipelineId
where p.PTP_ID == this.PTP_ID //x.UnitWorkId == pipeline.UnitWorkId
&& z.DetectionRateId == pipeline.DetectionRateId
&& x.DetectionTypeId == pipeline.DetectionType && x.CheckResult == "1"
select x).Count(); //全部检测合格口
if (totalJointNum > totalWeldingJointNum) //未全部焊完 if (totalJointNum > totalWeldingJointNum) //未全部焊完
{ {
Count1 = totalJointNum - totalWeldingJointNum; Count1 = totalJointNum - totalWeldingJointNum;