1121

CreateModel.bat

@@ -25,9 +25,9 @@ REM --------------
 
 @echo 设置.net控制台环境
 @echo.
-@call "%VS100COMNTOOLS%"vsvars32.bat
+@call "%VS150%"
 
-SqlMetal /views  /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause

HJGL/BLL/BLL.csproj

@@ -178,6 +178,7 @@
     <Compile Include="WeldingProcess\TrustManage\Batch_BatchTrustService.cs" />
     <Compile Include="WeldingProcess\TrustManage\Batch_PointBatchItemService.cs" />
     <Compile Include="WeldingProcess\TrustManage\Batch_PointBatchService.cs" />
+    <Compile Include="WeldingProcess\WelderTest\WelderTestService.cs" />
     <Compile Include="WeldingProcess\WeldingManage\Pipeline_PipelineDetectionTypeService.cs" />
     <Compile Include="WeldingProcess\WeldingManage\Pipeline_PipelineService.cs" />
     <Compile Include="WeldingProcess\WeldingManage\Pipeline_WeldingDailyService.cs" />

HJGL/BLL/WeldingProcess/WelderTest/WelderTestService.cs

@@ -0,0 +1,67 @@
+using Model;
+using NPOI.HSSF.EventUserModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+    public class WelderTestService
+    {
+        public bool Add(Model.Welder_TestInfo input)
+        {
+            try
+            {
+                var model = new Model.Welder_TestInfo();
+                model.Id = SQLHelper.GetNewID(typeof(Welder_TestInfo));
+                model.WeldMethod = input.WeldMethod;
+                model.MaterialId = input.MaterialId;
+                model.Remark = input.Remark;
+                model.CreatedDate = input.CreatedDate;
+                model.IsPass = input.IsPass;
+                Funs.DB.Welder_TestInfo.InsertOnSubmit(model);
+                Funs.DB.SubmitChanges();
+                return true;
+            }
+            catch (Exception ex)
+            {
+                ErrLogInfo.WriteLog(ex, "添加焊工考试错误");
+                return false;
+            }
+        }
+        public bool Edit(Model.Welder_TestInfo input)
+        {
+            var result=Funs.DB.Welder_TestInfo.FirstOrDefault(t=>t.Id== input.Id);
+            if (result == null)
+            {
+                return false;
+            }
+            result.WeldMethod = input.WeldMethod;
+            result.MaterialId = input.MaterialId;
+            result.Remark = input.Remark;
+            result.CreatedDate = input.CreatedDate;
+            result.IsPass = input.IsPass;
+            Funs.DB.SubmitChanges();
+            return true;
+        }
+        public Model.Welder_TestInfo Get(string Id)
+        {
+            var result = Funs.DB.Welder_TestInfo.FirstOrDefault(t => t.Id == Id);
+            return result;
+        }
+
+        public bool Delete(string Id)
+        {
+            var result = Funs.DB.Welder_TestInfo.FirstOrDefault(t => t.Id == Id);
+            if (result == null)
+                return false;
+
+            Funs.DB.Welder_TestInfo.DeleteOnSubmit(result);
+            Funs.DB.SubmitChanges();
+            return true;
+        }
+
+    }
+}

HJGL/FineUIPro.Web/Web.config

@@ -9,7 +9,7 @@
     <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
   <connectionStrings>
-    <add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
+    <add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
     <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
       providerName="System.Data.SqlClient" />-->
   </connectionStrings>

HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx.cs

@@ -745,7 +745,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             ws.GetRow(rowIndex + 11).Height = 11 * 20;
 
             ws.GetRow(rowIndex + 10).GetCell(1).SetCellValue("试压包号\r\nTest Package No.");
-            ws.GetRow(rowIndex + 10).GetCell(4).SetCellValue("UG-130-FW-HT-0001");
+            ws.GetRow(rowIndex + 10).GetCell(4).SetCellValue(info?.testpackageNo);
 
             ws.AddMergedRegion(new CellRangeAddress(rowIndex + 12, rowIndex + 13, 2, 4));
             ws.AddMergedRegion(new CellRangeAddress(rowIndex + 12, rowIndex + 13, 6, 7));
@@ -756,7 +756,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             ws.GetRow(rowIndex + 12).GetCell(2).SetCellValue("ACTIVITY");
             ws.GetRow(rowIndex + 12).GetCell(2).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None,
                  BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 14, true, true, "Arial");
-            ws.GetRow(rowIndex + 12).GetCell(6).SetCellValue("CC7");
+            ws.GetRow(rowIndex + 12).GetCell(6).SetCellValue(info?.workAreaCode);
             ws.GetRow(rowIndex + 12).GetCell(6).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None,
                BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 14, true, true, "Arial");
             ws.GetRow(rowIndex + 12).GetCell(9).SetCellValue("JIANLI");
@@ -1138,12 +1138,6 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             //垂直水平居中
             ws.VerticallyCenter = true;
             ws.HorizontallyCenter = true;
-            //打印边距设置 厘米/3
-            ws.SetMargin(MarginType.RightMargin, (double)2.4 / 3);
-            ws.SetMargin(MarginType.LeftMargin, (double)2.9 / 3);
-            ws.SetMargin(MarginType.TopMargin, (double)2.4 / 3);
-            ws.SetMargin(MarginType.BottomMargin, (double)2.4 / 3);
-
             //页眉页脚间距
             ws.SetMargin(MarginType.HeaderMargin, 0);
             ws.SetMargin(MarginType.FooterMargin, 0);
@@ -6842,22 +6836,27 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
             
             //操作目录模版sheet是否存在,不存在就把对应的sheet删除掉（特殊处理）
             int index = 0;
+            if (!templateFileIds.Contains("2BEFB0F4-A466-4C59-963F-9092BACF2E52"))
+            {
+                hssfworkbook.RemoveAt(0);
+                index++;
+            }
             //'2-TP-02-试压包封面UG-FW-001
             if (!templateFileIds.Contains("D4B4DD64-8361-4A75-AA3E-E484934B9B06"))
             {
-                hssfworkbook.RemoveAt(0);
+                hssfworkbook.RemoveAt(1);
                 index++;
             }
             //3-TP-03-试压包目录UG-FW-001
             if (!templateFileIds.Contains("6CD2710C-2AD6-4E7D-BED7-C8BEDAD300DE"))
             {
-                hssfworkbook.RemoveAt(1 - index);
+                hssfworkbook.RemoveAt(2 - index);
                 index++;
             }
             //4-TP-04-试压标识
             if (!templateFileIds.Contains("87A66CAA-CA30-4A1E-8382-E8503059A0D0"))
             {
-                hssfworkbook.RemoveAt(2 - index);
+                hssfworkbook.RemoveAt(3 - index);
                 index++;
             }
 
@@ -6869,11 +6868,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage
                     continue;
                 switch (templateFileId)
                 {
-                    //1-TP-01-试压包路径表UG-FW-001
+                    
-                    case "2BEFB0F4-A466-4C59-963F-9092BACF2E52":
-                        XSSFSheet sheet1 = (XSSFSheet)hssfworkbook.CreateSheet(oneTemp.Title);
-                        template1(hssfworkbook, sheet1);
-                        break;
                     //6-TP-05-P&ID清单UG-FW-001 模版
                     case "811EF650-7686-447F-BEE8-776D50041CD0":
                         XSSFSheet sheet6 = (XSSFSheet)hssfworkbook.CreateSheet(oneTemp.Title);

HJGL/HJGL.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+# Visual Studio Version 17
-VisualStudioVersion = 15.0.28307.1231
+VisualStudioVersion = 17.7.34221.43
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FineUIPro.Web", "FineUIPro.Web\FineUIPro.Web.csproj", "{C88D3156-2D56-4DB0-922E-1995FB61C9BD}"
 EndProject

HJGL/Model/Model.cs

@@ -272,6 +272,9 @@ namespace Model
     partial void InsertWelder_TeamGroup(Welder_TeamGroup instance);
     partial void UpdateWelder_TeamGroup(Welder_TeamGroup instance);
     partial void DeleteWelder_TeamGroup(Welder_TeamGroup instance);
+    partial void InsertWelder_TestInfo(Welder_TestInfo instance);
+    partial void UpdateWelder_TestInfo(Welder_TestInfo instance);
+    partial void DeleteWelder_TestInfo(Welder_TestInfo instance);
     partial void InsertWelder_Welder(Welder_Welder instance);
     partial void UpdateWelder_Welder(Welder_Welder instance);
     partial void DeleteWelder_Welder(Welder_Welder instance);
@@ -1235,6 +1238,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<Welder_TestInfo> Welder_TestInfo
+		{
+			get
+			{
+				return this.GetTable<Welder_TestInfo>();
+			}
+		}
+		
 		public System.Data.Linq.Table<Welder_Welder> Welder_Welder
 		{
 			get
@@ -22518,12 +22529,12 @@ namespace Model
 		
 		private string _DetectionStandard;
 		
+		private string _Tabler;
+		
 		private string _Remark;
 		
 		private System.Nullable<System.DateTime> _CreatedTime;
 		
-		private string _Tabler;
-		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -22542,12 +22553,12 @@ namespace Model
     partial void OnUnitIdChanged();
     partial void OnDetectionStandardChanging(string value);
     partial void OnDetectionStandardChanged();
+    partial void OnTablerChanging(string value);
+    partial void OnTablerChanged();
     partial void OnRemarkChanging(string value);
     partial void OnRemarkChanged();
     partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCreatedTimeChanged();
-    partial void OnTablerChanging(string value);
-    partial void OnTablerChanged();
     #endregion
 		
 		public PMI_Delegation()
@@ -22615,7 +22626,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
 		public string ProjectId
 		{
 			get
@@ -22695,6 +22706,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")]
+		public string Tabler
+		{
+			get
+			{
+				return this._Tabler;
+			}
+			set
+			{
+				if ((this._Tabler != value))
+				{
+					this.OnTablerChanging(value);
+					this.SendPropertyChanging();
+					this._Tabler = value;
+					this.SendPropertyChanged("Tabler");
+					this.OnTablerChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")]
 		public string Remark
 		{
@@ -22735,26 +22766,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")]
-		public string Tabler
-		{
-			get
-			{
-				return this._Tabler;
-			}
-			set
-			{
-				if ((this._Tabler != value))
-				{
-					this.OnTablerChanging(value);
-					this.SendPropertyChanging();
-					this._Tabler = value;
-					this.SendPropertyChanged("Tabler");
-					this.OnTablerChanged();
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -22794,10 +22805,10 @@ namespace Model
 		
 		private int _Status;
 		
-		private string _ReportNo;
-		
 		private System.Nullable<System.DateTime> _CheckTime;
 		
+		private string _ReportNo;
+		
 		private System.Nullable<System.DateTime> _ReportTime;
 		
 		private string _WorkAreaId;
@@ -22818,10 +22829,10 @@ namespace Model
     partial void OnAcceptanceChanged();
     partial void OnStatusChanging(int value);
     partial void OnStatusChanged();
-    partial void OnReportNoChanging(string value);
-    partial void OnReportNoChanged();
     partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCheckTimeChanged();
+    partial void OnReportNoChanging(string value);
+    partial void OnReportNoChanged();
     partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnReportTimeChanged();
     partial void OnWorkAreaIdChanging(string value);
@@ -22933,7 +22944,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")]
 		public int Status
 		{
 			get
@@ -22953,26 +22964,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
-		public string ReportNo
-		{
-			get
-			{
-				return this._ReportNo;
-			}
-			set
-			{
-				if ((this._ReportNo != value))
-				{
-					this.OnReportNoChanging(value);
-					this.SendPropertyChanging();
-					this._ReportNo = value;
-					this.SendPropertyChanged("ReportNo");
-					this.OnReportNoChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> CheckTime
 		{
@@ -22993,6 +22984,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
+		public string ReportNo
+		{
+			get
+			{
+				return this._ReportNo;
+			}
+			set
+			{
+				if ((this._ReportNo != value))
+				{
+					this.OnReportNoChanging(value);
+					this.SendPropertyChanging();
+					this._ReportNo = value;
+					this.SendPropertyChanged("ReportNo");
+					this.OnReportNoChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ReportTime
 		{
@@ -37307,6 +37318,8 @@ namespace Model
 		
 		private string _PipelineId;
 		
+		private string _WeldJointId;
+		
 		private string _PipelineCode;
 		
 		private string _WeldJointCode;
@@ -37345,6 +37358,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointId", DbType="NVarChar(50)")]
+		public string WeldJointId
+		{
+			get
+			{
+				return this._WeldJointId;
+			}
+			set
+			{
+				if ((this._WeldJointId != value))
+				{
+					this._WeldJointId = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")]
 		public string PipelineCode
 		{
@@ -39587,8 +39616,6 @@ namespace Model
 		
 		private string _ProjectId;
 		
-		private System.Nullable<bool> _IsPMI;
-		
 		private string _PipelineCode;
 		
 		private string _PipelineId;
@@ -39719,22 +39746,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")]
-		public System.Nullable<bool> IsPMI
-		{
-			get
-			{
-				return this._IsPMI;
-			}
-			set
-			{
-				if ((this._IsPMI != value))
-				{
-					this._IsPMI = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")]
 		public string PipelineCode
 		{
@@ -41743,6 +41754,8 @@ namespace Model
 		
 		private string _PipingClassCode;
 		
+		private string _PIPClassCode;
+		
 		private string _WeldingDate;
 		
 		private System.Nullable<bool> _IsCancel;
@@ -41757,8 +41770,6 @@ namespace Model
 		
 		private string _DetectionType;
 		
-		private string _PIPClassCode;
-		
 		private string _PageNum;
 		
 		public View_Pipeline_WeldJoint()
@@ -42853,6 +42864,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")]
+		public string PIPClassCode
+		{
+			get
+			{
+				return this._PIPClassCode;
+			}
+			set
+			{
+				if ((this._PIPClassCode != value))
+				{
+					this._PIPClassCode = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")]
 		public string WeldingDate
 		{
@@ -42965,22 +42992,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")]
-		public string PIPClassCode
-		{
-			get
-			{
-				return this._PIPClassCode;
-			}
-			set
-			{
-				if ((this._PIPClassCode != value))
-				{
-					this._PIPClassCode = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PageNum", DbType="NVarChar(10)")]
 		public string PageNum
 		{
@@ -43560,10 +43571,6 @@ namespace Model
 	public partial class View_PTP_TestPackageAudit
 	{
 		
-		private string _PipelineId;
-		
-		private string _PT_PipeId;
-		
 		private string _PTP_ID;
 		
 		private string _ProjectId;
@@ -43572,59 +43579,29 @@ namespace Model
 		
 		private string _PipelineCode;
 		
-		private int _WeldJointCount;
+		private string _PipelineId;
 		
-		private int _WeldJointCountT;
+		private System.Nullable<bool> _IsAll;
 		
-		private int _CountS;
+		private System.Nullable<long> _WeldJointCount;
+		
+		private System.Nullable<int> _WeldJointCountT;
+		
+		private System.Nullable<int> _CountS;
 		
 		private System.Nullable<int> _CountU;
 		
-		private string _NDTR_Name;
+		private int _NDTR_Rate;
 		
 		private string _Ratio;
 		
-		private int _NDTR_Rate;
-		
 		private System.Nullable<decimal> _RatioC;
 		
 		public View_PTP_TestPackageAudit()
 		{
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PTP_ID", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
-		public string PipelineId
-		{
-			get
-			{
-				return this._PipelineId;
-			}
-			set
-			{
-				if ((this._PipelineId != value))
-				{
-					this._PipelineId = value;
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PT_PipeId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
-		public string PT_PipeId
-		{
-			get
-			{
-				return this._PT_PipeId;
-			}
-			set
-			{
-				if ((this._PT_PipeId != value))
-				{
-					this._PT_PipeId = value;
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PTP_ID", DbType="NVarChar(50)")]
 		public string PTP_ID
 		{
 			get
@@ -43688,8 +43665,40 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCount", DbType="Int NOT NULL")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", DbType="NVarChar(50)")]
-		public int WeldJointCount
+		public string PipelineId
+		{
+			get
+			{
+				return this._PipelineId;
+			}
+			set
+			{
+				if ((this._PipelineId != value))
+				{
+					this._PipelineId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="isAll", Storage="_IsAll", DbType="Bit")]
+		public System.Nullable<bool> IsAll
+		{
+			get
+			{
+				return this._IsAll;
+			}
+			set
+			{
+				if ((this._IsAll != value))
+				{
+					this._IsAll = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCount", DbType="BigInt")]
+		public System.Nullable<long> WeldJointCount
 		{
 			get
 			{
@@ -43704,8 +43713,8 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCountT", DbType="Int NOT NULL")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCountT", DbType="Int")]
-		public int WeldJointCountT
+		public System.Nullable<int> WeldJointCountT
 		{
 			get
 			{
@@ -43720,8 +43729,8 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CountS", DbType="Int NOT NULL")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="countS", Storage="_CountS", DbType="Int")]
-		public int CountS
+		public System.Nullable<int> CountS
 		{
 			get
 			{
@@ -43752,18 +43761,18 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NDTR_Name", DbType="VarChar(30)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NDTR_Rate", DbType="Int NOT NULL")]
-		public string NDTR_Name
+		public int NDTR_Rate
 		{
 			get
 			{
-				return this._NDTR_Name;
+				return this._NDTR_Rate;
 			}
 			set
 			{
-				if ((this._NDTR_Name != value))
+				if ((this._NDTR_Rate != value))
 				{
-					this._NDTR_Name = value;
+					this._NDTR_Rate = value;
 				}
 			}
 		}
@@ -43784,22 +43793,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NDTR_Rate", DbType="Int NOT NULL")]
-		public int NDTR_Rate
-		{
-			get
-			{
-				return this._NDTR_Rate;
-			}
-			set
-			{
-				if ((this._NDTR_Rate != value))
-				{
-					this._NDTR_Rate = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RatioC", DbType="Decimal(19,2)")]
 		public System.Nullable<decimal> RatioC
 		{
@@ -45895,6 +45888,212 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Welder_TestInfo")]
+	public partial class Welder_TestInfo : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		
+		private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty);
+		
+		private string _Id;
+		
+		private string _ProjectId;
+		
+		private bool _IsPass;
+		
+		private string _WeldMethod;
+		
+		private string _MaterialId;
+		
+		private System.Nullable<System.DateTime> _CreatedDate;
+		
+		private string _Remark;
+		
+    #region 可扩展性方法定义
+    partial void OnLoaded();
+    partial void OnValidate(System.Data.Linq.ChangeAction action);
+    partial void OnCreated();
+    partial void OnIdChanging(string value);
+    partial void OnIdChanged();
+    partial void OnProjectIdChanging(string value);
+    partial void OnProjectIdChanged();
+    partial void OnIsPassChanging(bool value);
+    partial void OnIsPassChanged();
+    partial void OnWeldMethodChanging(string value);
+    partial void OnWeldMethodChanged();
+    partial void OnMaterialIdChanging(string value);
+    partial void OnMaterialIdChanged();
+    partial void OnCreatedDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreatedDateChanged();
+    partial void OnRemarkChanging(string value);
+    partial void OnRemarkChanged();
+    #endregion
+		
+		public Welder_TestInfo()
+		{
+			OnCreated();
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)]
+		public string Id
+		{
+			get
+			{
+				return this._Id;
+			}
+			set
+			{
+				if ((this._Id != value))
+				{
+					this.OnIdChanging(value);
+					this.SendPropertyChanging();
+					this._Id = value;
+					this.SendPropertyChanged("Id");
+					this.OnIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this.OnProjectIdChanging(value);
+					this.SendPropertyChanging();
+					this._ProjectId = value;
+					this.SendPropertyChanged("ProjectId");
+					this.OnProjectIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPass", DbType="Bit NOT NULL")]
+		public bool IsPass
+		{
+			get
+			{
+				return this._IsPass;
+			}
+			set
+			{
+				if ((this._IsPass != value))
+				{
+					this.OnIsPassChanging(value);
+					this.SendPropertyChanging();
+					this._IsPass = value;
+					this.SendPropertyChanged("IsPass");
+					this.OnIsPassChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMethod", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string WeldMethod
+		{
+			get
+			{
+				return this._WeldMethod;
+			}
+			set
+			{
+				if ((this._WeldMethod != value))
+				{
+					this.OnWeldMethodChanging(value);
+					this.SendPropertyChanging();
+					this._WeldMethod = value;
+					this.SendPropertyChanged("WeldMethod");
+					this.OnWeldMethodChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string MaterialId
+		{
+			get
+			{
+				return this._MaterialId;
+			}
+			set
+			{
+				if ((this._MaterialId != value))
+				{
+					this.OnMaterialIdChanging(value);
+					this.SendPropertyChanging();
+					this._MaterialId = value;
+					this.SendPropertyChanged("MaterialId");
+					this.OnMaterialIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedDate", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreatedDate
+		{
+			get
+			{
+				return this._CreatedDate;
+			}
+			set
+			{
+				if ((this._CreatedDate != value))
+				{
+					this.OnCreatedDateChanging(value);
+					this.SendPropertyChanging();
+					this._CreatedDate = value;
+					this.SendPropertyChanged("CreatedDate");
+					this.OnCreatedDateChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")]
+		public string Remark
+		{
+			get
+			{
+				return this._Remark;
+			}
+			set
+			{
+				if ((this._Remark != value))
+				{
+					this.OnRemarkChanging(value);
+					this.SendPropertyChanging();
+					this._Remark = value;
+					this.SendPropertyChanged("Remark");
+					this.OnRemarkChanged();
+				}
+			}
+		}
+		
+		public event PropertyChangingEventHandler PropertyChanging;
+		
+		public event PropertyChangedEventHandler PropertyChanged;
+		
+		protected virtual void SendPropertyChanging()
+		{
+			if ((this.PropertyChanging != null))
+			{
+				this.PropertyChanging(this, emptyChangingEventArgs);
+			}
+		}
+		
+		protected virtual void SendPropertyChanged(String propertyName)
+		{
+			if ((this.PropertyChanged != null))
+			{
+				this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Welder_Welder")]
 	public partial class Welder_Welder : INotifyPropertyChanging, INotifyPropertyChanged
 	{
@@ -47811,7 +48010,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="VarChar(1000)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string WelderIds
 		{
 			get