更改PMI代码

HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs

@@ -37,74 +37,28 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         /// </summary>
         private void BindGrid()
         {
-            string sql = @"select *from (
+            var query = Funs.DB.View_PMIDetections.Where(t => t.ProjectId == this.CurrUser.LoginProjectId).AsQueryable();
-                        select 
+
-                        projectId,
+            
-                        InstallationId,
-                        WorkAreaId,
-                        UnitId,
-                        PipelineId,
-                        InstallationCode,
-                        WorkAreaCode,
-                        PipelineCode,
-                        PMINum, 
-                       isnull((convert(float,PMIBySNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateBys,
-                        PMIBySNum,
-                       isnull( (convert(float,PMIByFNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateByf,
-                        PMIByFNum
-                        from (
-                        select 
-                        a.projectId,
-                        a.InstallationId,
-                        a.WorkAreaId,
-                        a.UnitId,
-                        a.PipelineId,
-                        b.InstallationCode,
-                        c.WorkAreaCode,
-                        a.PipelineCode,
-                        (select count(1) from Pipeline_WeldJoint as d where isPMI=1 and d.PipelineId=a.PipelineId) as PMINum,
-                        (
-	                        select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId
-	                        inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId
-	                        where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId
-	                        and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='活动S' and pwj.isPMI=1
-                        )  as PMIBySNum,
-                        (
-	                        select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId
-	                        inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId
-	                        where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId
-	                        and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='固定F' and pwj.isPMI=1
-                        )  as PMIByFNum
-                        from  Pipeline_Pipeline as a
-                        left join Project_Installation as b on a.InstallationId=b.InstallationId
-                        left join Project_WorkArea as c on a.WorkAreaId=c.WorkAreaId 
-                        ) as t 
-                        ) as H where projectId=@projectId  ";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
             if (this.drpUnitId.SelectedValue != BLL.Const._Null)
             {
-                sql += " and UnitId=@unitId";
+                query = query.Where(t => t.UnitId == this.drpUnitId.SelectedValue);
-                listStr.Add(new SqlParameter("@unitId", this.drpUnitId.SelectedValue));
             }
             if (this.drpWorkAreaId.SelectedValue != BLL.Const._Null)
             {
-                sql += " and WorkAreaId=@workAreaId ";
+                query = query.Where(t => t.WorkAreaId == this.drpWorkAreaId.SelectedValue);
-                listStr.Add(new SqlParameter("@workAreaId", this.drpWorkAreaId.SelectedValue));
             }
             if (this.drpIsALl.SelectedValue=="报警")
             {
-                sql += " and ((RateBys<=2 and PMIBySNum<=2) or RateByf<=2 and PMIByFNum<=2)";
+                query = query.Where(t=>(t.RateBys<=2 && t.PMIBySNum<=2) || (t.RateByf<=2 && t.PMIByFNum<=2));
             }
             if (!string.IsNullOrEmpty(this.txtPipelineCode.Text))
             {
-                sql += " and PipelineCode like '%'+@PipelineCode+'%'";
+                query = query.Where(t => t.PipelineCode.Contains(this.txtPipelineCode.Text));
-                listStr.Add(new SqlParameter("@PipelineCode", this.txtPipelineCode.Text.Trim()));
             }
-            SqlParameter[] parameter = listStr.ToArray();
+            var dataList=query.ToList();
-            DataTable tb = SQLHelper.GetDataTableRunText(sql, parameter);
+            this.Grid1.RecordCount = dataList.Count;
-            this.Grid1.RecordCount = tb.Rows.Count;
+            var table = this.GetPagedDataTable(Grid1, dataList);
-            var table = this.GetPagedDataTable(Grid1, tb);
             Grid1.DataSource = table;
             Grid1.DataBind();
         }

HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs

@@ -36,7 +36,6 @@ namespace FineUIPro.Web.WeldingProcess.PMI
             {
                 this.InitTreeMenu();//加载树
                 this.BindGrid();
-                this.TotalPMIReport();
             }
         }
         #endregion
@@ -55,6 +54,14 @@ namespace FineUIPro.Web.WeldingProcess.PMI
             rootNode.Expanded = true;
             this.tvControlItem.Nodes.Add(rootNode);
             var dictWorkArea = GetWorkAreaDict();
+            //查询出来未达到PMI检测比例的数据
+            var pmiNocheckList = Funs.DB.View_PMIDetections
+                .Where(t => t.ProjectId == this.ProjectId
+                && t.InstallationId == this.installId
+                && t.UnitId == this.UnitId 
+                && (t.RateBys <= 2 && t.PMIBySNum <= 2) || (t.RateByf <= 2 && t.PMIByFNum <= 2))
+                .AsQueryable();
+                 
             //排除已经委托过的
             var listData= (from a in Funs.DB.PMI_Delegation.AsQueryable() join 
                           b in Funs.DB.PMI_DelegationDetails.AsQueryable() on 
@@ -62,21 +69,33 @@ namespace FineUIPro.Web.WeldingProcess.PMI
                           select b.JointId
                           ).Distinct().ToList();
 
-            //查询带有PMI处理的管线数据
+            //查询带有PMI处理且已经焊接过的管线数据
             var iso = from a in Funs.DB.View_Pipeline_WeldJoint
                       where a.IsPMI==true && a.ProjectId==this.ProjectId && a.UnitId==this.UnitId
-                      && a.InstallationId==this.installId
+                      && a.InstallationId==this.installId && (a.WeldingDailyId != "" && a.WeldingDailyId!=null)
                       select new {a.PipelineId,a.PipelineCode,a.WorkAreaId,a.WeldJointCode,a.WeldJointId }
                       ;
-                      
+
+            iso = from a in iso join b in pmiNocheckList on a.PipelineId equals b.PipelineId
+                   select new {
+                       a.PipelineId,
+                       a.PipelineCode,
+                       a.WorkAreaId,
+                       a.WeldJointCode,
+                       a.WeldJointId
+                   };
+
             if (listData.Count > 0)
             {
                 iso = iso.Where(a => !listData.Contains(a.WeldJointId));
             }
+            
             if (!string.IsNullOrEmpty(this.txtIsono.Text))
             {
                 iso = iso.Where(a => a.PipelineCode.Contains(this.txtIsono.Text.Trim()));
             }
+          
+
             var isoList = iso.Select(x => new { x.PipelineId,x.PipelineCode,x.WorkAreaId}).OrderBy(x => x.PipelineCode).Distinct().ToList();
             if (isoList.Count > 0)
             {
@@ -140,6 +159,35 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         /// </summary>
         private void BindGrid()
         {
+            //未达标的活动S口
+            var pmiViewJointBy_S = (from a in Funs.DB.View_PMIDetections
+                                    join b in Funs.DB.Pipeline_WeldJoint
+                                    on a.PipelineId equals b.PipelineId
+                                    where a.ProjectId == this.ProjectId
+                                && a.InstallationId == this.installId
+                                && a.UnitId == this.UnitId
+                                  && b.JointAttribute == "活动S"
+                                && a.PipelineId == this.tvControlItem.SelectedNodeID
+                              
+                               && (b.WeldingDailyId != null && b.WeldingDailyId != "")
+                                && (a.RateBys > 2 || a.PMIBySNum > 2)
+                                    select b.WeldJointId)
+                                    .ToList();
+            //未达标的固定F口
+            var pmiViewJointBy_F = (from a in Funs.DB.View_PMIDetections
+                                    join b in Funs.DB.Pipeline_WeldJoint
+                                    on a.PipelineId equals b.PipelineId
+                                    where a.ProjectId == this.ProjectId
+                                && a.InstallationId == this.installId
+                                && a.UnitId == this.UnitId
+                                 && b.JointAttribute == "固定F"
+                                && a.PipelineId == this.tvControlItem.SelectedNodeID
+                                && (b.WeldingDailyId != null && b.WeldingDailyId != "")
+                                && (a.RateByf >2 && a.PMIByFNum > 2)
+                                    select b.WeldJointId)
+                                    .ToList();
+
+            //排除已经选择过的焊口
             var listData = (from a in Funs.DB.PMI_Delegation.AsQueryable()
                             join
                          b in Funs.DB.PMI_DelegationDetails.AsQueryable() on
@@ -149,10 +197,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
 
             string[] arr = this.weldJointIds.Split('|');
             var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.IsPMI == true &&  t.PipelineId == this.tvControlItem.SelectedNodeID);
-            if (arr.Length > 0)
+            
-            {
-                listData.Add(arr[0]);
-            }
             if (listData.Count > 0)
             {
                 query = query.Where(t => !listData.Contains(t.WeldJointId));
@@ -161,7 +206,14 @@ namespace FineUIPro.Web.WeldingProcess.PMI
             {
                 query = query.Where(t => t.WeldJointCode == this.txtJointNo.Text);
             }
-            
+            if (pmiViewJointBy_S.Count > 0)
+            {
+                query = query.Where(t => t.JointAttribute != "活动S");
+            }
+            if (pmiViewJointBy_F.Count > 0)
+            {
+                query = query.Where(t => t.JointAttribute != "固定F");
+            }
             var data= query.ToList() ;
             if (!string.IsNullOrEmpty(weldJointIds))
             {
@@ -232,75 +284,39 @@ namespace FineUIPro.Web.WeldingProcess.PMI
         #endregion
 
         #region 统计比例
+
         private void TotalPMIReport()
         {
-            string sql = @"select *from (
+            var query = Funs.DB.View_PMIDetections.AsQueryable();
-                        select 
+            if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
-                        projectId,
-                        InstallationId,
-                        WorkAreaId,
-                        UnitId,
-                        PipelineId,
-                        InstallationCode,
-                        WorkAreaCode,
-                        PipelineCode,
-                        PMINum, 
-                       isnull((convert(float,PMIBySNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateBys,
-                        PMIBySNum,
-                       isnull( (convert(float,PMIByFNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateByf,
-                        PMIByFNum
-                        from (
-                        select 
-                        a.projectId,
-                        a.InstallationId,
-                        a.WorkAreaId,
-                        a.UnitId,
-                        a.PipelineId,
-                        b.InstallationCode,
-                        c.WorkAreaCode,
-                        a.PipelineCode,
-                        (select count(1) from Pipeline_WeldJoint as d where isPMI=1 and d.PipelineId=a.PipelineId) as PMINum,
-                        (
-	                        select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId
-	                        inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId
-	                        where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId
-	                        and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='活动S' and pwj.isPMI=1
-                        )  as PMIBySNum,
-                        (
-	                        select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId
-	                        inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId
-	                        where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId
-	                        and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='固定F' and pwj.isPMI=1
-                        )  as PMIByFNum
-                        from  Pipeline_Pipeline as a
-                        left join Project_Installation as b on a.InstallationId=b.InstallationId
-                        left join Project_WorkArea as c on a.WorkAreaId=c.WorkAreaId 
-                        ) as t 
-                        ) as H where projectId=@projectId  and PipelineId=@PipelineId  ";
-            List<SqlParameter> listStr = new List<SqlParameter>();
-            listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
-            listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID));
-            SqlParameter[] parameter = listStr.ToArray();
-            DataTable dt = SQLHelper.GetDataTableRunText(sql, parameter);
-            if (dt.Rows.Count > 0)
             {
-                string PMIByFNum = dt.Rows[0]["PMIByFNum"].ToString();
+                query=query.Where(t=>t.ProjectId == this.CurrUser.LoginProjectId);
-                string PMIBySNum=dt.Rows[0]["PMIBySNum"].ToString();
+            }
-                string RateByF=dt.Rows[0]["RateByF"].ToString();
+            if (!string.IsNullOrEmpty(this.installId))
-                string RateByS = dt.Rows[0]["RateByS"].ToString();
+            {
-                lblnumbyf.Text = "预制检测数量：" + PMIByFNum;
+                query=query.Where(t=>t.InstallationId==this.installId);
-                lblnumbys.Text = "安装检测数量：" + PMIBySNum;
+            }
-                lblratebyf.Text = "预制检测比例：" + Math.Round(decimal.Parse(RateByF), 2)+"%";
+            if (!string.IsNullOrEmpty(this.UnitId))
-                lblratebys.Text = "安装检测比例：" + Math.Round(decimal.Parse(RateByS), 2) + "%";
+            {
+                query=query.Where(t=>t.UnitId==this.UnitId);    
+            }
+            if (!string.IsNullOrEmpty(txtIsono.Text))
+            {
+                query = query.Where(t => t.PipelineCode.Contains(txtIsono.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
+            {
+                query=query.Where(t=>t.PipelineId==this.tvControlItem.SelectedNodeID);
+            }
+            query = query.Where(t => (t.RateBys <= 2 && t.PMIBySNum <= 2) || (t.RateByf <= 2 && t.PMIByFNum <= 2));
+            var pmiInfo = query.FirstOrDefault();
+            if (pmiInfo!=null)
+            {
+                lblnumbyf.Text = "安装检测数量：" + pmiInfo.PMIByFNum;
+                lblnumbys.Text = "预制检测数量：" + pmiInfo.PMIBySNum;
+                lblratebyf.Text = "安装检测比例：" + Math.Round(pmiInfo.RateByf, 2)+"%";
+                lblratebys.Text = "预制检测比例：" + Math.Round(pmiInfo.RateBys, 2) + "%";
                 
-                //if(Math.Round(decimal.Parse(RateByF), 2)>0 && Math.Round(decimal.Parse(RateByF), 2) <= 2)
-                //{
-                //    lblratebyf.CssStyle = "{color:red}";
-                //}
-                //if (Math.Round(decimal.Parse(RateByS), 2) > 0 && Math.Round(decimal.Parse(RateByS), 2) <= 2)
-                //{
-                //    lblratebys.CssStyle = "{color:red}";
-                //}
             }
         }
         #endregion

HJGL/Model/Model.cs

@@ -1155,6 +1155,14 @@ namespace Model
 			}
 		}
 		
+		public System.Data.Linq.Table<View_PMIDetections> View_PMIDetections
+		{
+			get
+			{
+				return this.GetTable<View_PMIDetections>();
+			}
+		}
+		
 		public System.Data.Linq.Table<View_PTP_TestPackageAudit> View_PTP_TestPackageAudit
 		{
 			get
@@ -22510,12 +22518,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);
@@ -22534,12 +22542,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()
@@ -22607,7 +22615,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
 		public string ProjectId
 		{
 			get
@@ -22687,26 +22695,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();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")]
 		public string Remark
 		{
@@ -22747,6 +22735,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();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -22786,10 +22794,10 @@ namespace Model
 		
 		private int _Status;
 		
-		private System.Nullable<System.DateTime> _CheckTime;
-		
 		private string _ReportNo;
 		
+		private System.Nullable<System.DateTime> _CheckTime;
+		
 		private System.Nullable<System.DateTime> _ReportTime;
 		
 		private string _WorkAreaId;
@@ -22810,10 +22818,10 @@ namespace Model
     partial void OnAcceptanceChanged();
     partial void OnStatusChanging(int value);
     partial void OnStatusChanged();
-    partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnCheckTimeChanged();
     partial void OnReportNoChanging(string value);
     partial void OnReportNoChanged();
+    partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCheckTimeChanged();
     partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnReportTimeChanged();
     partial void OnWorkAreaIdChanging(string value);
@@ -22925,7 +22933,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
 		public int Status
 		{
 			get
@@ -22945,26 +22953,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> CheckTime
-		{
-			get
-			{
-				return this._CheckTime;
-			}
-			set
-			{
-				if ((this._CheckTime != value))
-				{
-					this.OnCheckTimeChanging(value);
-					this.SendPropertyChanging();
-					this._CheckTime = value;
-					this.SendPropertyChanged("CheckTime");
-					this.OnCheckTimeChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
 		public string ReportNo
 		{
@@ -22985,6 +22973,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CheckTime
+		{
+			get
+			{
+				return this._CheckTime;
+			}
+			set
+			{
+				if ((this._CheckTime != value))
+				{
+					this.OnCheckTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CheckTime = value;
+					this.SendPropertyChanged("CheckTime");
+					this.OnCheckTimeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ReportTime
 		{
@@ -39579,6 +39587,8 @@ namespace Model
 		
 		private string _ProjectId;
 		
+		private System.Nullable<bool> _IsPMI;
+		
 		private string _PipelineCode;
 		
 		private string _PipelineId;
@@ -39709,6 +39719,22 @@ 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
 		{
@@ -41717,8 +41743,6 @@ namespace Model
 		
 		private string _PipingClassCode;
 		
-		private string _PIPClassCode;
-		
 		private string _WeldingDate;
 		
 		private System.Nullable<bool> _IsCancel;
@@ -41733,6 +41757,8 @@ namespace Model
 		
 		private string _DetectionType;
 		
+		private string _PIPClassCode;
+		
 		private string _PageNum;
 		
 		public View_Pipeline_WeldJoint()
@@ -42827,22 +42853,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="_WeldingDate", DbType="VarChar(100)")]
 		public string WeldingDate
 		{
@@ -42955,6 +42965,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="_PageNum", DbType="NVarChar(10)")]
 		public string PageNum
 		{
@@ -43287,6 +43313,249 @@ namespace Model
 		}
 	}
 	
+	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_PMIDetections")]
+	public partial class View_PMIDetections
+	{
+		
+		private string _ProjectId;
+		
+		private string _InstallationId;
+		
+		private string _WorkAreaId;
+		
+		private string _UnitId;
+		
+		private string _PipelineId;
+		
+		private string _InstallationCode;
+		
+		private string _WorkAreaCode;
+		
+		private string _PipelineCode;
+		
+		private System.Nullable<int> _PMINum;
+		
+		private double _RateBys;
+		
+		private System.Nullable<int> _PMIBySNum;
+		
+		private double _RateByf;
+		
+		private System.Nullable<int> _PMIByFNum;
+		
+		public View_PMIDetections()
+		{
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectId", Storage="_ProjectId", DbType="NVarChar(50)")]
+		public string ProjectId
+		{
+			get
+			{
+				return this._ProjectId;
+			}
+			set
+			{
+				if ((this._ProjectId != value))
+				{
+					this._ProjectId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstallationId", DbType="NVarChar(50)")]
+		public string InstallationId
+		{
+			get
+			{
+				return this._InstallationId;
+			}
+			set
+			{
+				if ((this._InstallationId != value))
+				{
+					this._InstallationId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")]
+		public string WorkAreaId
+		{
+			get
+			{
+				return this._WorkAreaId;
+			}
+			set
+			{
+				if ((this._WorkAreaId != value))
+				{
+					this._WorkAreaId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitId", DbType="NVarChar(50)")]
+		public string UnitId
+		{
+			get
+			{
+				return this._UnitId;
+			}
+			set
+			{
+				if ((this._UnitId != value))
+				{
+					this._UnitId = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineId", 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="_InstallationCode", DbType="NVarChar(50)")]
+		public string InstallationCode
+		{
+			get
+			{
+				return this._InstallationCode;
+			}
+			set
+			{
+				if ((this._InstallationCode != value))
+				{
+					this._InstallationCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaCode", DbType="NVarChar(20)")]
+		public string WorkAreaCode
+		{
+			get
+			{
+				return this._WorkAreaCode;
+			}
+			set
+			{
+				if ((this._WorkAreaCode != value))
+				{
+					this._WorkAreaCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")]
+		public string PipelineCode
+		{
+			get
+			{
+				return this._PipelineCode;
+			}
+			set
+			{
+				if ((this._PipelineCode != value))
+				{
+					this._PipelineCode = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PMINum", DbType="Int")]
+		public System.Nullable<int> PMINum
+		{
+			get
+			{
+				return this._PMINum;
+			}
+			set
+			{
+				if ((this._PMINum != value))
+				{
+					this._PMINum = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RateBys", DbType="Float NOT NULL")]
+		public double RateBys
+		{
+			get
+			{
+				return this._RateBys;
+			}
+			set
+			{
+				if ((this._RateBys != value))
+				{
+					this._RateBys = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PMIBySNum", DbType="Int")]
+		public System.Nullable<int> PMIBySNum
+		{
+			get
+			{
+				return this._PMIBySNum;
+			}
+			set
+			{
+				if ((this._PMIBySNum != value))
+				{
+					this._PMIBySNum = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RateByf", DbType="Float NOT NULL")]
+		public double RateByf
+		{
+			get
+			{
+				return this._RateByf;
+			}
+			set
+			{
+				if ((this._RateByf != value))
+				{
+					this._RateByf = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PMIByFNum", DbType="Int")]
+		public System.Nullable<int> PMIByFNum
+		{
+			get
+			{
+				return this._PMIByFNum;
+			}
+			set
+			{
+				if ((this._PMIByFNum != value))
+				{
+					this._PMIByFNum = value;
+				}
+			}
+		}
+	}
+	
 	[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.View_PTP_TestPackageAudit")]
 	public partial class View_PTP_TestPackageAudit
 	{
@@ -47518,7 +47787,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="VarChar(1000)")]
 		public string WelderIds
 		{
 			get