From acff7f22d4d4da505a075de9fc78c7abff4aa5db Mon Sep 17 00:00:00 2001
From: shecs <408299694@qq.com>
Date: Sun, 12 May 2024 17:04:46 +0800
Subject: [PATCH] 11

---
 CreateModel.bat                               |   4 +-
 DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql   |  61 +++++++------
 HJGL/.vs/HJGL/v17/.suo                        | Bin 1100288 -> 895488 bytes
 HJGL/BLL/BLL.csproj.user                      |   2 +-
 .../Pipeline_WeldJointService.cs              |   6 ++
 HJGL/FineUIPro.Web/FineUIPro.Web.csproj       |   2 +-
 HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user  |   2 +-
 .../PMI/PMIDelegationEdit.aspx.cs             |   2 +-
 .../WeldingProcess/PMI/PMIDetectionEntry.aspx |  17 +++-
 .../common/mainFullViews.aspx.cs              |   4 +-
 HJGL/Model/Model.cs                           |  86 +++++++++---------
 HJGL/Model/Model.csproj.user                  |   2 +-
 12 files changed, 105 insertions(+), 83 deletions(-)

diff --git a/CreateModel.bat b/CreateModel.bat
index 27ceb4a..2f27853 100644
--- a/CreateModel.bat
+++ b/CreateModel.bat
@@ -25,9 +25,9 @@ REM --------------
 
 @echo 设置.net控制台环境
 @echo.
-@call "%VS150%"
+@call "%VS100COMNTOOLS%"vsvars32.bat
 
-SqlMetal /views  /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
+SqlMetal /views  /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model
 
 @ECHO 完成
 pause
diff --git a/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql b/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql
index 8974a86..f0570d5 100644
--- a/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql
+++ b/DataBase/鐗堟湰鏃ュ織/HJGLDB_2024.05.12.sql
@@ -1,3 +1,8 @@
+-- 管线焊工 增加是否 PMI处理
+alter table Pipeline_WeldJoint add isPMI bit NULL
+GO
+update Pipeline_WeldJoint set isPMI=0 
+GO
 
 ALTER VIEW [dbo].[View_Pipeline_WeldJoint]
 AS
@@ -202,7 +207,6 @@ FROM Pipeline_WeldJoint AS weldJoint
 
  GO
 
-
 UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','')
 GO
 
@@ -223,6 +227,7 @@ create table PMI_Delegation
 	InstallationId nvarchar(50),
 	UnitId  nvarchar(50),
 	DetectionStandard nvarchar(50),
+	Tabler nvarchar(50),
 	Remark nvarchar(255),
 	CreatedTime datetime default getdate()
 )
@@ -240,43 +245,45 @@ create table PMI_DelegationDetails
 )
 go
 
--- 管线焊工 增加是否 PMI处理
-alter table Pipeline_WeldJoint add isPMI bit null
-update Pipeline_WeldJoint set isPMI=0 
+
 -- 插入PMI委托菜单
 insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI检测管理','PMI detection management','',21,0,3,NUll,1)
-insert into Sys_Menu values(NEWID(),'PMI委托','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
-insert into Sys_Menu values(NEWID(),'PMI检测录入','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
+insert into Sys_Menu values(NEWID(),'PMI委托','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',1,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
+insert into Sys_Menu values(NEWID(),'PMI检测录入','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',2,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
+GO
 
 
 /*******PMI委托明细视图***********/ 
-CREATE VIEW [dbo].[View_PMI_DelegationDetails]
+
+ALTER VIEW [dbo].[View_PMI_DelegationDetails]
 AS
-
+/********热处理明细********/
 SELECT 
-B.PMIId,
-B.JointId,
-B.QualityNo,
-B.Acceptance,
-B.CreatedTime,
-B.status,
-Pipeline.PipelineCode, 
+TrustItem.Id,
+TrustItem.Acceptance, 
+TrustItem.CreatedTime, 
+TrustItem.JointId as WeldJointId, 
+TrustItem.status, 
+TrustItem.QualityNo, 
+TrustItem.PMIId, 
+Trust.ProjectId,
+Trust.DelegationNo,
+Trust.DelegationDate,
 WeldJoint.WeldJointCode,
+Pipeline.PipelineCode,
 WeldJoint.Specification,
-WeldJoint.Remark,
-Pipeline.SingleNumber,
-(CASE WHEN WeldJoint.CoverWelderCode IS NOT NULL AND WeldJoint.BackingWelderCode IS NOT NULL
-			THEN WeldJoint.CoverWelderCode + '/' + WeldJoint.BackingWelderCode
-			ELSE (ISNULL(WeldJoint.CoverWelderCode,'') + ISNULL(WeldJoint.BackingWelderCode,'')) END) AS WelderCode, --焊工
-		(CASE WHEN WeldJoint.Material1Code IS NOT NULL AND WeldJoint.Material2Code IS NOT NULL
-			THEN WeldJoint.Material1Code + '/' + WeldJoint.Material2Code
-			ELSE (ISNULL(WeldJoint.Material1Code,'') + ISNULL(WeldJoint.Material2Code,'')) END) AS MaterialCode --材质
-FROM PMI_Delegation AS A INNER JOIN
-PMI_DelegationDetails AS B ON A.Id=B.PMIId
-LEFT JOIN View_Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=B.JointId
+Material.MaterialCode,
+Pipeline.WorkAreaId
+FROM PMI_DelegationDetails AS TrustItem
+LEFT JOIN PMI_Delegation AS Trust ON Trust.Id=TrustItem.PMIId
+LEFT JOIN Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=TrustItem.JointId
 LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId
-
+LEFT JOIN Base_Material AS Material ON Material.MaterialId=WeldJoint.Material1Id
 GO
 
 
 
+
+
+
+
diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index bc3837019889fda9b8861ce819ec5e4f15cbb11c..c6b5c5fec05c4cc7812881134477ee8271ed9f7c 100644
GIT binary patch
delta 20675
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

delta 69300
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
G6!8DD>DD*^

diff --git a/HJGL/BLL/BLL.csproj.user b/HJGL/BLL/BLL.csproj.user
index 07dbd5b..55f44b9 100644
--- a/HJGL/BLL/BLL.csproj.user
+++ b/HJGL/BLL/BLL.csproj.user
@@ -1,6 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
index 7dd4fd5..9c2ad63 100644
--- a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
+++ b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs
@@ -252,6 +252,12 @@ namespace BLL
                 {
                     newWeldJoint.Electricity = weldJoint.Electricity;
                 }
+                if (weldJoint.IsPMI != null)
+                {
+                    newWeldJoint.IsPMI = weldJoint.IsPMI;
+                }
+                    
+
                 if (!string.IsNullOrEmpty(weldJoint.Voltage))
                 {
                     newWeldJoint.Voltage = weldJoint.Voltage;
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
index 8bbf08f..89e031f 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -4473,6 +4473,7 @@
     </Compile>
     <Compile Include="WeldingProcess\PMI\PMIDetectionEntry.aspx.cs">
       <DependentUpon>PMIDetectionEntry.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="WeldingProcess\PMI\PMIDetectionEntry.aspx.designer.cs">
       <DependentUpon>PMIDetectionEntry.aspx</DependentUpon>
@@ -4910,7 +4911,6 @@
     <Content Include="App_GlobalResources\Lan.resx">
       <Generator>GlobalResourceProxyGenerator</Generator>
       <LastGenOutput>Lan.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
     </Content>
   </ItemGroup>
   <ItemGroup>
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index f9b03fb..8d0cdf2 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -35,7 +35,7 @@
           <AutoAssignPort>True</AutoAssignPort>
           <DevelopmentServerPort>0</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:57613/</IISUrl>
+          <IISUrl>http://localhost:13960/</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
index f587eaf..74c1a36 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
@@ -197,7 +197,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
 
                 ShowNotify(Resources.Lan.SaveSuccessfully, MessageBoxIcon.Success);
                 PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PMIDelegationId)
-                + ActiveWindow.GetHideReference());
+                + ActiveWindow.GetHidePostBackReference());
             }
             else
             {
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
index 23776b0..de1f1f9 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
@@ -143,16 +143,25 @@
                                     DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
                                     TextAlign="Center" Width="120px">
                                 </f:RenderField>
-                                <f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="CreatedTime"
-                                    DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
-                                    HeaderTextAlign="Center" TextAlign="Left" Width="120px">
-                                </f:RenderField>
+                               
                                 <f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo"
                                     FieldType="String" TextAlign="Left" Width="150px">
                                 </f:RenderField>
                                 <f:RenderField HeaderText="<%$ Resources:Lan,Acceptance %>" ColumnID="Acceptance"
                                     DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
                                 </f:RenderField>
+                                <f:RenderField HeaderText="妫�娴嬫棩鏈�" ColumnID="CreatedTime"
+                                    DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
+                                    HeaderTextAlign="Center" TextAlign="Left" Width="120px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="鎶ュ憡鏃ユ湡"  FieldType="String" HeaderTextAlign="Center"
+                                    TextAlign="Left" Width="100px">
+                                </f:RenderField>
+                                <f:RenderField HeaderText="鎶ュ憡缂栧彿"   FieldType="String" HeaderTextAlign="Center"
+                                    TextAlign="Left" Width="100px">
+                                </f:RenderField>
+
+
                                 <f:RenderField HeaderText="<%$ Resources:Lan,IsPass %>" ColumnID="StatusText"
                                     DataField="StatusText" SortField="status" FieldType="String" HeaderTextAlign="Center"
                                     TextAlign="Left" Width="100px">
diff --git a/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs b/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs
index 9dcbb69..fba6709 100644
--- a/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs
+++ b/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs
@@ -85,12 +85,12 @@ namespace FineUIPro.Web.common
             string strSql = @"SELECT (WelderName+'锛�'+WelderCode+'锛� 鐒婂伐璇佽繃鏈燂紝鏈夋晥鏈熶负锛�'+CONVERT(VARCHAR(100),CertificateValidity,23))
                                     AS QualificationLimit
                               FROM dbo.Welder_Welder 
-                              WHERE CertificateValidity<=GETDATE()
+                              WHERE CertificateValidity<=GETDATE() AND IsOnDuty=1
                               UNION 
                               SELECT (WelderName+'锛�'+WelderCode+'锛� 鐒婂伐璇佽繕鏈夛細'+convert(nvarchar(6),DATEDIFF(day,getdate(),CertificateValidity))+ '澶╁埌鏈�')
                                     AS QualificationLimit
                               FROM dbo.Welder_Welder 
-                              where  DATEADD(m,-1,CertificateValidity)<GETDATE() and  CertificateValidity>GETDATE()";
+                              where  DATEADD(m,-1,CertificateValidity)<GETDATE() and  CertificateValidity>GETDATE() AND IsOnDuty=1";
             DataTable dt = SQLHelper.GetDataTableRunText(strSql, null);
             GridWelder.DataSource = dt;
             GridWelder.DataBind();
diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs
index c89fb8c..d7b7bc6 100644
--- a/HJGL/Model/Model.cs
+++ b/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
@@ -21477,10 +21477,10 @@ namespace Model
 		
 		private string _Acceptance;
 		
-		private System.Nullable<System.DateTime> _CreatedTime;
-		
 		private int _Status;
 		
+		private System.Nullable<System.DateTime> _CreatedTime;
+		
     #region 鍙墿灞曟�ф柟娉曞畾涔�
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21495,10 +21495,10 @@ namespace Model
     partial void OnQualityNoChanged();
     partial void OnAcceptanceChanging(string value);
     partial void OnAcceptanceChanged();
-    partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
-    partial void OnCreatedTimeChanged();
     partial void OnStatusChanging(int value);
     partial void OnStatusChanged();
+    partial void OnCreatedTimeChanging(System.Nullable<System.DateTime> value);
+    partial void OnCreatedTimeChanged();
     #endregion
 		
 		public PMI_DelegationDetails()
@@ -21606,6 +21606,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")]
+		public int Status
+		{
+			get
+			{
+				return this._Status;
+			}
+			set
+			{
+				if ((this._Status != value))
+				{
+					this.OnStatusChanging(value);
+					this.SendPropertyChanging();
+					this._Status = value;
+					this.SendPropertyChanged("Status");
+					this.OnStatusChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> CreatedTime
 		{
@@ -21626,26 +21646,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
-		public int Status
-		{
-			get
-			{
-				return this._Status;
-			}
-			set
-			{
-				if ((this._Status != value))
-				{
-					this.OnStatusChanging(value);
-					this.SendPropertyChanging();
-					this._Status = value;
-					this.SendPropertyChanged("Status");
-					this.OnStatusChanged();
-				}
-			}
-		}
-		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -37266,8 +37266,6 @@ namespace Model
 		
 		private string _ProjectId;
 		
-		private System.Nullable<bool> _IsPMI;
-		
 		private string _PipelineCode;
 		
 		private string _PipelineId;
@@ -37398,22 +37396,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
 		{
@@ -39422,6 +39404,8 @@ namespace Model
 		
 		private string _PipingClassCode;
 		
+		private string _PIPClassCode;
+		
 		private string _WeldingDate;
 		
 		private System.Nullable<bool> _IsCancel;
@@ -40530,6 +40514,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
 		{
diff --git a/HJGL/Model/Model.csproj.user b/HJGL/Model/Model.csproj.user
index 07dbd5b..55f44b9 100644
--- a/HJGL/Model/Model.csproj.user
+++ b/HJGL/Model/Model.csproj.user
@@ -1,6 +1,6 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
 </Project>
\ No newline at end of file