12345

.gitignore

@@ -5732,4 +5732,4 @@ HJGLPackFile/版本日志/HJGLDB_2024.05.02.sql
 /HJGLPackFile/PackFile
 /HJGL/.vs/HJGL/v17/.suo
 /CreateModel2017.bat
-/CreateModel.bat
+/DataBase/版本日志/HJGLDB_2024.05.12.sql

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" />
@@ -250,7 +250,7 @@
             </site>
             <site name="FineUIPro.Web(10)" id="13">
                 <application path="/" applicationPool="Clr4IntegratedAppPool">
-                    <virtualDirectory path="/" physicalPath="E:\湛江巴斯夫\Basf_TCC7\HJGL\FineUIPro.Web" />
+                    <virtualDirectory path="/" physicalPath="E:\MyProject\ZJ_BSF\Basf_TCC7\HJGL\FineUIPro.Web" />
                 </application>
                 <bindings>
                     <binding protocol="http" bindingInformation="*:13960:localhost" />

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=.;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=Sh@nghai9;"/>
+    <add name="HJGLDBConnectionString" connectionString="Data Source=.\sql2016;Initial Catalog=HJGLDB_ZJBSF;uid=sa;pwd=1111;"/>
     <!--<add name="HJGLDBConnectionString" connectionString="Data Source=.;Initial Catalog=HJGLDB;Integrated Security=True"
       providerName="System.Data.SqlClient" />-->
   </connectionStrings>

HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/JointComprehensive.aspx.cs

@@ -74,8 +74,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
             Grid1.DataBind();
 
             var distinctPipelineCode = tb.AsEnumerable().GroupBy(row => row.Field<string>("PipelineCode")).Select(group => group.First());
-            var backingWelder = tb.AsEnumerable().GroupBy(row => row.Field<string>("BackingWelderCode")).Select(group => group.First());
-            var coverWelder = tb.AsEnumerable().GroupBy(row => row.Field<string>("CoverWelderCode")).Select(group => group.First());
+            var backingWelder = tb.AsEnumerable().Where(row => row.Field<string>("BackingWelderCode")!=null).GroupBy(row => row.Field<string>("BackingWelderCode")).Select(group => group.First());
+            var coverWelder = tb.AsEnumerable().Where(row => row.Field<string>("CoverWelderCode")!= null).GroupBy(row => row.Field<string>("CoverWelderCode")).Select(group => group.First());
             var jotNum = from x in tb.AsEnumerable()
                          group x by new { pipe = x.Field<string>("PipelineCode"), jot = x.Field<string>("WeldJointCode"), Size = x.Field<string>("JOT_Size") }
                          into g

HJGL/FineUIPro.Web/default.aspx

@@ -344,7 +344,7 @@
 
         // 点击标题栏工具图标 - 查看源代码
         function onToolSourceCodeClick(event) {
-            window.open('Doc/操作说明书.rar', '_blank');
+            window.open('Doc/操作说明书.docx', '_blank');
         }
 
         // 点击标题栏工具图标 - 刷新

HJGL/Model/Model.cs

@@ -21300,7 +21300,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
@@ -21479,12 +21479,10 @@ namespace Model
 		
 		private int _Status;
 		
+		private System.Nullable<System.DateTime> _CreatedTime;
+		
 		private string _ReportNo;
 		
-		private System.Nullable<System.DateTime> _CheckTime;
-		
-		private System.Nullable<System.DateTime> _ReportTime;
-		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21501,12 +21499,10 @@ namespace Model
     partial void OnAcceptanceChanged();
     partial void OnStatusChanging(int value);
     partial void OnStatusChanged();
+    partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreatedTimeChanged();
     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();
     #endregion
 		
 		public PMI_DelegationDetails()
@@ -21614,7 +21610,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
@@ -21634,6 +21630,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreatedTime
+		{
+			get
+			{
+				return this._CreatedTime;
+			}
+			set
+			{
+				if ((this._CreatedTime != value))
+				{
+					this.OnCreatedTimeChanging(value);
+					this.SendPropertyChanging();
+					this._CreatedTime = value;
+					this.SendPropertyChanged("CreatedTime");
+					this.OnCreatedTimeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
 		public string ReportNo
 		{
@@ -21654,46 +21670,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="reportTime", Storage="_ReportTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ReportTime
-		{
-			get
-			{
-				return this._ReportTime;
-			}
-			set
-			{
-				if ((this._ReportTime != value))
-				{
-					this.OnReportTimeChanging(value);
-					this.SendPropertyChanging();
-					this._ReportTime = value;
-					this.SendPropertyChanged("ReportTime");
-					this.OnReportTimeChanged();
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -37314,8 +37290,6 @@ namespace Model
 		
 		private string _ProjectId;
 		
-		private System.Nullable<bool> _IsPMI;
-		
 		private string _PipelineCode;
 		
 		private string _PipelineId;
@@ -37446,22 +37420,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
 		{
@@ -39470,6 +39428,8 @@ namespace Model
 		
 		private string _PipingClassCode;
 		
+		private string _PIPClassCode;
+		
 		private string _WeldingDate;
 		
 		private System.Nullable<bool> _IsCancel;
@@ -40578,6 +40538,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
 		{
@@ -40715,9 +40691,7 @@ namespace Model
 		
 		private string _Acceptance;
 		
-		private System.Nullable<System.DateTime> _CheckTime;
-		
-		private System.Nullable<System.DateTime> _ReportTime;
+		private System.Nullable<System.DateTime> _CreatedTime;
 		
 		private string _WeldJointId;
 		
@@ -40781,34 +40755,18 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> CheckTime
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
+		public System.Nullable<System.DateTime> CreatedTime
 		{
 			get
 			{
-				return this._CheckTime;
+				return this._CreatedTime;
 			}
 			set
 			{
-				if ((this._CheckTime != value))
+				if ((this._CreatedTime != value))
 				{
-					this._CheckTime = value;
-				}
-			}
-		}
-		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
-		public System.Nullable<System.DateTime> ReportTime
-		{
-			get
-			{
-				return this._ReportTime;
-			}
-			set
-			{
-				if ((this._ReportTime != value))
-				{
-					this._ReportTime = value;
+					this._CreatedTime = value;
 				}
 			}
 		}

HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql

@@ -286,7 +286,6 @@ TrustItem.PMIId,
 Trust.ProjectId,
 Trust.DelegationNo,
 Trust.DelegationDate,
-ISNULL(TrustItem.reportNo,Trust.DelegationNo) as reportNo,
 WeldJoint.WeldJointCode,
 Pipeline.PipelineCode,
 WeldJoint.Specification,