From e7786e3023701fc2bc131ea32f9a5d28f5b42eb3 Mon Sep 17 00:00:00 2001
From: wendy <408182087@qq.com>
Date: Tue, 5 Aug 2025 13:54:42 +0800
Subject: [PATCH] =?UTF-8?q?20250805=20=E4=BF=AE=E6=94=B9=E8=AF=95=E5=8E=8B?=
 =?UTF-8?q?=E5=89=8D=E6=9D=A1=E4=BB=B6=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HJGL/TestPackage/TestPackageAudit.aspx    |  2 +-
 .../HJGL/TestPackage/TestPackageAudit.aspx.cs | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx
index 29c294ca..4761ba65 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx
@@ -101,7 +101,7 @@
                                         <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 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 runat="server" ID="lab42" Label="具备试压条件管线数" LabelWidth="150px" Width="180px" LabelAlign="Right"></f:Label>
                                     </Items>
diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
index e8f6470f..737b7fd0 100644
--- a/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageAudit.aspx.cs
@@ -348,20 +348,30 @@ namespace FineUIPro.Web.HJGL.TestPackage
                     int totalJointNum = totalJoint.Count();   //总焊口
                     int totalWeldingJointNum = totalJoint.Count(x => x.WeldingDailyId != null);   //已焊总焊口
                     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
                                          select x).Count();   //未关闭批
                     int allPointJointNum = (from x in db.HJGL_Batch_PointBatchItem
                                             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
                                             select x).Count();   //全部点口（含扩透）
                     int allOKCheckNum = (from x in db.HJGL_Batch_NDEItem
                                          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
-                                         where z.UnitWorkId == pipeline.UnitWorkId && z.DetectionRateId == pipeline.DetectionRateId
-                                         && z.DetectionTypeId == pipeline.DetectionType && x.CheckResult == "1"
-                                         select x).Count();   //全部检测合格口
+                                         join t in db.HJGL_Batch_BatchTrustItem on x.TrustBatchItemId equals t.TrustBatchItemId
+                                         join z in db.HJGL_Batch_BatchTrust on t.TrustBatchId equals z.TrustBatchId
+                                         join j in db.HJGL_WeldJoint on t.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 
+                                         && z.DetectionRateId == pipeline.DetectionRateId
+                                         && x.DetectionTypeId == pipeline.DetectionType && x.CheckResult == "1"
+                                         select x).Count(); //全部检测合格口
+
                     if (totalJointNum > totalWeldingJointNum)  //未全部焊完
                     {
                         Count1 = totalJointNum - totalWeldingJointNum;