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

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
-                              LEFT JOIN dbo.HJGL_Pipeline p ON p.PipelineId = v.PipelineId
-                              LEFT JOIN dbo.Tw_PaintCodeDict paint ON paint.Id = p.PaintId
+                              FROM dbo.View_HJGL_Pipeline v 
+                              LEFT JOIN dbo.Tw_PaintCodeDict paint ON paint.Id = v.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
 		{