From e1e1d5394abc5c743afeb88d3ee79e98f142e113 Mon Sep 17 00:00:00 2001
From: fly-l <1420031550@qq.com>
Date: Mon, 4 Sep 2023 15:14:11 +0800
Subject: [PATCH] 2023-09-4

---
 SGGL/BLL/HJGL/PointTrust/PointBatchService.cs               | 6 +++---
 .../HJGL/WeldingManage/WeldJointBatchEdit.aspx.cs           | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs
index c1cb3789..0f10bd28 100644
--- a/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs
+++ b/SGGL/BLL/HJGL/PointTrust/PointBatchService.cs
@@ -140,7 +140,7 @@ namespace BLL
             var project = BLL.ProjectService.GetProjectByProjectId(pipeline.ProjectId);
             var unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(pipeline.UnitWorkId);
             var unit = BLL.UnitService.GetUnitByUnitId(pipeline.UnitId);
-            var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(newWeldJoint.DetectionTypeId);
+            var ndt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(pipeline.DetectionType);
             var ndtr = BLL.Base_DetectionRateService.GetDetectionRateByDetectionRateId(pipeline.DetectionRateId);
 
             if (newWeldJoint != null)
@@ -205,7 +205,7 @@ namespace BLL
                         new SqlParameter("@ProjectId", project.ProjectId),
                         new SqlParameter("@UnitWorkId", pipeline.UnitWorkId),
                         new SqlParameter("@UnitId", pipeline.UnitId),
-                        new SqlParameter("@DetectionTypeId", newWeldJoint.DetectionTypeId),
+                        new SqlParameter("@DetectionTypeId", pipeline.DetectionType),
                         new SqlParameter("@DetectionRateId", pipeline.DetectionRateId)
                     };
 
@@ -242,7 +242,7 @@ namespace BLL
                         batch.UnitWorkId = pipeline.UnitWorkId;
                         batch.BatchCondition = batchCondition;
                         batch.UnitId = pipeline.UnitId;
-                        batch.DetectionTypeId = newWeldJoint.DetectionTypeId;
+                        batch.DetectionTypeId = pipeline.DetectionType;
                         batch.DetectionRateId = pipeline.DetectionRateId;
                         if (condition.Contains("5"))
                         {
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.cs
index 00d3ec46..fcbb4978 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.cs
@@ -568,6 +568,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
+        /// `
+        /// `
         protected void drpWeldingRod_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (!string.IsNullOrEmpty(txtWpqId.Text))