1221

HJGL/Model/Model.cs

@@ -20711,6 +20711,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsPMI;
 		
+		private System.Nullable<int> _AuditStatus;
+		
 		private EntitySet<Batch_BatchTrustItem> _Batch_BatchTrustItem;
 		
 		private EntitySet<Batch_PointBatchItem> _Batch_PointBatchItem;
@@ -20851,6 +20853,8 @@ namespace Model
     partial void OnANSISCHChanged();
     partial void OnIsPMIChanging(System.Nullable<bool> value);
     partial void OnIsPMIChanged();
+    partial void OnAuditStatusChanging(System.Nullable<int> value);
+    partial void OnAuditStatusChanged();
     #endregion
 		
 		public Pipeline_WeldJoint()
@@ -21905,6 +21909,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditStatus", DbType="Int")]
+		public System.Nullable<int> AuditStatus
+		{
+			get
+			{
+				return this._AuditStatus;
+			}
+			set
+			{
+				if ((this._AuditStatus != value))
+				{
+					this.OnAuditStatusChanging(value);
+					this.SendPropertyChanging();
+					this._AuditStatus = value;
+					this.SendPropertyChanged("AuditStatus");
+					this.OnAuditStatusChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Batch_BatchTrustItem_Pipeline_WeldJoint", Storage="_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")]
 		public EntitySet<Batch_BatchTrustItem> Batch_BatchTrustItem
 		{
@@ -45900,7 +45924,7 @@ namespace Model
 		
 		private bool _IsPass;
 		
-		private string _WeldMethod;
+		private string _WeldMethodId;
 		
 		private string _MaterialId;
 		
@@ -45908,6 +45932,8 @@ namespace Model
 		
 		private string _Remark;
 		
+		private string _WelderId;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -45918,14 +45944,16 @@ namespace Model
     partial void OnProjectIdChanged();
     partial void OnIsPassChanging(bool value);
     partial void OnIsPassChanged();
-    partial void OnWeldMethodChanging(string value);
-    partial void OnWeldMethodChanged();
+    partial void OnWeldMethodIdChanging(string value);
+    partial void OnWeldMethodIdChanged();
     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();
+    partial void OnWelderIdChanging(string value);
+    partial void OnWelderIdChanged();
     #endregion
 		
 		public Welder_TestInfo()
@@ -45993,22 +46021,22 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMethod", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
-		public string WeldMethod
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldMethodId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+		public string WeldMethodId
 		{
 			get
 			{
-				return this._WeldMethod;
+				return this._WeldMethodId;
 			}
 			set
 			{
-				if ((this._WeldMethod != value))
+				if ((this._WeldMethodId != value))
 				{
-					this.OnWeldMethodChanging(value);
+					this.OnWeldMethodIdChanging(value);
 					this.SendPropertyChanging();
-					this._WeldMethod = value;
-					this.SendPropertyChanged("WeldMethod");
-					this.OnWeldMethodChanged();
+					this._WeldMethodId = value;
+					this.SendPropertyChanged("WeldMethodId");
+					this.OnWeldMethodIdChanged();
 				}
 			}
 		}
@@ -46073,6 +46101,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderId", DbType="NVarChar(50)")]
+		public string WelderId
+		{
+			get
+			{
+				return this._WelderId;
+			}
+			set
+			{
+				if ((this._WelderId != value))
+				{
+					this.OnWelderIdChanging(value);
+					this.SendPropertyChanging();
+					this._WelderId = value;
+					this.SendPropertyChanged("WelderId");
+					this.OnWelderIdChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;

HJGL/Model/Model.csproj

@@ -75,6 +75,7 @@
     <Compile Include="SpSysMenuItem.cs" />
     <Compile Include="SpTDesktopItem.cs" />
     <Compile Include="SpWeldingDailyItem.cs" />
+    <Compile Include="ViewModels\ImportErrorViewModel.cs" />
     <Compile Include="ViewModels\TestPackageInfoViewModel.cs" />
   </ItemGroup>
   <ItemGroup>

HJGL/Model/ViewModels/ImportErrorViewModel.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.ViewModels
+{
+    public class ImportErrorViewModel
+    {
+        public int rowId {  get; set; }
+
+        public string columnName {  get; set; }
+
+        public string errMsg {  get; set; }
+
+        public bool isSuccess { get; set; } = true;
+
+        public DateTime createdTime {  get; set; }
+
+
+    }
+}