fix(hjgl)焊接基础数据导入界面报错解决

DataBase/版本日志/SGGLDB_V2026-07-07-lpf.sql

@@ -0,0 +1,89 @@
+USE [SGGLDB_SHJ]
+GO
+
+/****** Object:  View [dbo].[View_HJGL_Pipeline]    Script Date: 2026/7/7 14:13:47 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+ALTER view [dbo].[View_HJGL_Pipeline] as
+    SELECT pipeline.PipelineId,
+           pipeline.ProjectId,
+           pipeline.UnitId,
+           pipeline.UnitWorkId,
+           pipeline.PipelineCode,
+           pipeline.SingleName,
+           pipeline.SingleNumber,
+           pipeline.PipingClassId,
+           pipeline.MediumId,
+           pipingClass.PipingClassCode,
+           pipeline.DetectionRateId,
+           rate.DetectionRateCode,
+           pipeline.DetectionType,
+           pipeline.TestPressure,
+           pipeline.TestMedium,
+           pipeline.PressurePipingClassId,
+           pc.PressurePipingClassCode,
+           pipeline.PipeLenth,
+           pipeline.DesignPress,
+           pipeline.DesignTemperature,
+           pipeline.Remark,
+           pipeline.LeakPressure,
+           pipeline.LeakMedium,
+           pipeline.VacuumPressure,
+           pipeline.PCMedium,
+           pipeline.PCtype,
+           pipeline.MaterialId,
+           pipeline.PipeArea,
+		   pipeline.PaintId,
+           case pipeline.PipeArea when '1' then '工厂预制' when '2' then '现场施工' else '' end as PipeAreaStr,
+           pipeline.FlowingSection,
+           mat.MaterialCode,
+           dType.DetectionTypeCode,
+           lea.MediumName                                                                       AS LeakMediumName,
+           pur.PurgeMethodName                                                                  AS PCMediumName,
+           CAST((SELECT SUM(ISNULL(Size, 0))
+                 FROM dbo.HJGL_WeldJoint
+                 WHERE PipelineId = pipeline.PipelineId) AS DECIMAL(8, 3))                      AS TotalDin,
+           CAST((SELECT ISNULL(SUM(ISNULL(jot.Size, 0)), 0)
+                 FROM dbo.HJGL_WeldJoint jot
+                 WHERE jot.PipelineId = pipeline.PipelineId
+                   AND jot.WeldingDailyId IS NOT NULL) AS DECIMAL(8, 3))                        AS FinishSize,
+           (SELECT COUNT(WeldJointId)
+            FROM dbo.HJGL_WeldJoint
+            WHERE PipelineId = pipeline.PipelineId and IsTwoJoint is null)                      AS JointCount,
+           (SELECT COUNT(WeldJointId)
+            FROM dbo.HJGL_WeldJoint
+            WHERE PipelineId = pipeline.PipelineId
+              and IsTwoJoint is null
+              and JointAttribute = '预制口')                                                    AS ShopJointCount,
+           (SELECT COUNT(WeldJointId)
+            FROM dbo.HJGL_WeldJoint
+            WHERE PipelineId = pipeline.PipelineId
+              and IsTwoJoint is null
+              and WeldingDailyId IS NOT NULL)                                                   AS FinishJointCount,
+           unit.UnitName,
+           workArea.UnitWorkCode,
+           medium.MediumCode,
+           medium.MediumName                                                                    AS MediumName,
+           testMedium.MediumCode                                                                AS TestMediumCode,
+           pipeline.ActEndDate                                                                  AS FinishedDate,
+           pipeline.IsFinished
+    FROM dbo.HJGL_Pipeline AS pipeline
+             LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId = pipeline.PipingClassId
+             LEFT JOIN dbo.Base_Unit AS unit ON unit.UnitId = pipeline.UnitId
+             LEFT JOIN WBS_UnitWork AS workArea ON workArea.UnitWorkId = pipeline.UnitWorkId
+             LEFT JOIN Base_Medium AS medium ON medium.MediumId = pipeline.MediumId
+             LEFT JOIN dbo.Base_TestMedium AS testMedium ON testMedium.TestMediumId = pipeline.TestMedium
+             LEFT JOIN dbo.Base_DetectionRate rate ON rate.DetectionRateId = pipeline.DetectionRateId
+             LEFT JOIN dbo.Base_PressurePipingClass pc ON pc.PressurePipingClassId = pipeline.PressurePipingClassId
+             LEFT JOIN dbo.Base_TestMedium AS lea ON lea.TestMediumId = pipeline.LeakMedium
+             LEFT JOIN dbo.Base_PurgeMethod AS pur ON pur.PurgeMethodId = pipeline.PCMedium
+             LEFT JOIN dbo.Base_Material AS mat ON mat.MaterialId = pipeline.MaterialId
+             LEFT JOIN dbo.Base_DetectionType dType on dType.DetectionTypeId = pipeline.DetectionType
+
+GO
+
+

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs

@@ -270,13 +270,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                      v.TestPressure,v.SingleNumber,v.DetectionRateCode,v.DetectionType,v.Remark,v.FlowingSection,v.TestMediumCode,v.TotalDin,
                                      v.JointCount,v.PressurePipingClassCode,v.PipeLenth,v.DesignPress,v.DesignTemperature,v.LeakPressure,v.VacuumPressure,
                                      v.LeakMediumName,v.PCMediumName,v.MaterialCode,paint.PaintCode
-                              FROM dbo.View_HJGL_Pipeline v
+                              FROM dbo.View_HJGL_Pipeline v 
-                              LEFT JOIN dbo.HJGL_Pipeline p ON p.PipelineId = v.PipelineId
+                              LEFT JOIN dbo.Tw_PaintCodeDict paint ON paint.Id = v.PaintId
-                              LEFT JOIN dbo.Tw_PaintCodeDict paint ON paint.Id = p.PaintId
                               WHERE v.ProjectId= @ProjectId";
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
-            strSql += " AND PipelineId = @PipelineId";
+            strSql += " AND v.PipelineId = @PipelineId";
             listStr.Add(new SqlParameter("@PipelineId", pipelineId));
             //strSql += " AND UnitWorkId =@UnitWorkId";
             //listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));

SGGL/Model/Model.cs

@@ -301858,6 +301858,8 @@ namespace Model
 		
 		private string _PipeArea;
 		
+		private string _PaintId;
+		
 		private string _PipeAreaStr;
 		
 		private string _FlowingSection;
@@ -302346,6 +302348,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PaintId", DbType="NVarChar(20)")]
+		public string PaintId
+		{
+			get
+			{
+				return this._PaintId;
+			}
+			set
+			{
+				if ((this._PaintId != value))
+				{
+					this._PaintId = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeAreaStr", DbType="VarChar(8) NOT NULL", CanBeNull=false)]
 		public string PipeAreaStr
 		{