11

HJGL/.vs/HJGL/config/applicationhost.config

@@ -162,7 +162,7 @@
             </site>
             <site name="WebApi" id="2">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\WebApi" />
+                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\WebApi" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:3862:localhost" />

HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs

@@ -1020,7 +1020,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         else
                         {
                             if ((!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id)
-                                || (!string.IsNullOrEmpty(d.Material2Id) && steel.MaterialId != d.Material2Id))
+                                && (!string.IsNullOrEmpty(d.Material2Id) && steel.MaterialId != d.Material2Id))
                             {
                                 errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]验证不一至；";
                             }
@@ -1041,7 +1041,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         else
                         {
                             if ((!string.IsNullOrEmpty(d.Material2Id) &&  steel.MaterialId!=d.Material2Id)
-                                || (!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id))
+                                && (!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id))
                             {
                                 errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]验证不一至；";
                             }
@@ -1063,7 +1063,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         else
                         {
                             if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id)
-                                || (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
+                                && (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
 
                             {
                                 errorInfos += (i + 2) + "行,组件1[" + ds.Tables[0].Rows[i]["组件1"].ToString() + "]验证不一至；";
@@ -1085,7 +1085,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         else
                         {
                             if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id)
-                                || (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
+                                && (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
                             {
                                 errorInfos += (i + 2) + "行,组件2[" + ds.Tables[0].Rows[i]["组件2"].ToString() + "]验证不一至；";
                             }
@@ -1099,7 +1099,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     if (ds.Tables[0].Rows[i]["炉批号1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号1"].ToString()))
                     {
                         if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo1)
-                            || (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo2))
+                            && (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo2))
                         {
                             errorInfos += (i + 2) + "行,炉批号1[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]验证不一至；";
                         }
@@ -1112,7 +1112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     if (ds.Tables[0].Rows[i]["炉批号2"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号2"].ToString()))
                     {
                         if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo1)
-                           || (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo2))
+                           && (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo2))
                         {
                             errorInfos += (i + 2) + "行,炉批号2[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]验证不一至；";
                         }

HJGL/Model/Model.cs

@@ -22480,12 +22480,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);
@@ -22504,12 +22504,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()
@@ -22577,7 +22577,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
@@ -22657,6 +22657,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
 		{
@@ -22697,26 +22717,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;
@@ -22756,10 +22756,10 @@ namespace Model
 		
 		private int _Status;
 		
-		private string _ReportNo;
-		
 		private System.Nullable<System.DateTime> _CheckTime;
 		
+		private string _ReportNo;
+		
 		private System.Nullable<System.DateTime> _ReportTime;
 		
     #region 可扩展性方法定义
@@ -22778,10 +22778,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();
     #endregion
@@ -22891,7 +22891,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
@@ -22911,26 +22911,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
 		{
@@ -22951,6 +22931,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
 		{
@@ -38591,8 +38591,6 @@ namespace Model
 		
 		private string _ProjectId;
 		
-		private System.Nullable<bool> _IsPMI;
-		
 		private string _PipelineCode;
 		
 		private string _PipelineId;
@@ -38723,22 +38721,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
 		{
@@ -40747,6 +40729,8 @@ namespace Model
 		
 		private string _PipingClassCode;
 		
+		private string _PIPClassCode;
+		
 		private string _WeldingDate;
 		
 		private System.Nullable<bool> _IsCancel;
@@ -41855,6 +41839,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
 		{
@@ -46251,7 +46251,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