diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 1963de0..e47cfd0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 8bec10e..5883d9e 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql b/HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql deleted file mode 100644 index 983f586..0000000 --- a/HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql +++ /dev/null @@ -1,306 +0,0 @@ --- ¹ÜÏߺ¸¹¤ Ôö¼ÓÊÇ·ñ PMI´¦Àí -alter table Pipeline_WeldJoint add isPMI bit NULL -GO -update Pipeline_WeldJoint set isPMI=0 -GO - -ALTER VIEW [dbo].[View_Pipeline_WeldJoint] -AS -/************º¸¿ÚÐÅÏ¢ÊÓͼ*****************/ -SELECT WeldJoint.WeldJointId, -WeldJoint.ProjectId, -WeldJoint.PipelineId, -WeldJoint.WeldJointCode, -dbo.Fun_GetParseInt(WeldJoint.WeldJointCode) AS ConvertWeldJoint, -WeldJoint.WeldTypeId, -WeldJoint.Material1Id, -WeldJoint.Material2Id, -WeldJoint.ANSISCH, -WeldJoint.Thickness, -WeldJoint.Dia, -WeldJoint.Size, -WeldJoint.JointAttribute, -WeldJoint.JointArea, -WeldJoint.WeldingMethodId, -WeldJoint.IsHotProess, -WeldJoint.WeldingLocationId, -WeldJoint.WeldMatId, -WeldJoint.WeldSilkId, -WeldJoint.GrooveTypeId, -WeldJoint.PipeSegment, -WeldJoint.PipeAssembly1Id, -WeldJoint.PipeAssembly2Id, -WeldJoint.PipeAssemblyCount, -WeldJoint.HeartNo1, -WeldJoint.HeartNo2, -WeldJoint.LastTemp, -WeldJoint.CellTemp, -WeldJoint.PrepareTemp, -WeldJoint.Electricity, -WeldJoint.SystemNumber, -WeldJoint.Remark, -WeldJoint.DoneDin, -WeldJoint.Voltage, -WeldJoint.TestPackageNo, -WeldJoint.WeldingDailyCode, -WeldJoint.WeldingDailyId, -WeldJoint.BackingWelderId, -WeldJoint.CoverWelderId, -WeldJoint.PipingClassId, -WeldJoint.Specification, -WeldJoint.CancelResult, -Project.ProjectCode, -Project.ProjectName, -Pipeline.PipelineCode, -Pipeline.InstallationId, -Pipeline.UnitId, -Pipeline.SingleNumber, -Pipeline.WorkAreaId, -WeldType.WeldTypeCode, -Material1.MaterialCode AS Material1Code, -Material2.MaterialCode AS Material2Code, -WeldingMethod.WeldingMethodCode, -WeldingLocation.WeldingLocationCode, -WeldMat.ConsumablesCode AS WeldMatCode, ---WeldSilk.ConsumablesCode AS WeldSilkCode, -'' AS WeldSilkCode, -GrooveType.GrooveTypeCode, -CASE WHEN WeldJoint.WeldingDailyId IS NULL THEN '·ñ' ELSE 'ÊÇ' END AS Is_hjName, -CASE WHEN WeldJoint.IsHotProess=1 THEN 'ÊÇ' ELSE '·ñ' END AS IsHotProessStr, -Components1.ComponentsCode AS ComponentsCode1, -Components2.ComponentsCode AS ComponentsCode2, -BackingWelder.WelderCode AS BackingWelderCode, -BackingWelder.WelderName AS BackingWelderName, -CoverWelder.WelderCode AS CoverWelderCode, -CoverWelder.WelderName AS CoverWelderName, -(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL - THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode - ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, --º¸¹¤ - (CASE WHEN Material1.MaterialCode IS NOT NULL AND Material2.MaterialCode IS NOT NULL - THEN Material1.MaterialCode + '/' + Material2.MaterialCode - ELSE (ISNULL(Material1.MaterialCode,'') + ISNULL(Material2.MaterialCode,'')) END) AS MaterialCode, --²ÄÖÊ -pipingClass.PipingClassCode,pip.PIPClassCode, -CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate, -WeldJoint.IsCancel, -WeldJoint.IsPMI, -WeldJoint.IsGoldJoint, -WeldJoint.WPQId,wps.WPQCode, -WeldJoint.DetectionType, -WeldJoint.PageNum -FROM Pipeline_WeldJoint AS WeldJoint -LEFT JOIN Base_Project AS Project ON Project.ProjectId=WeldJoint.ProjectId -LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId = WeldJoint.PipelineId -LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId -LEFT JOIN Base_Material AS Material1 ON Material1.MaterialId = WeldJoint.Material1Id -LEFT JOIN Base_Material AS Material2 ON Material2.MaterialId = WeldJoint.Material2Id -LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=WeldJoint.WeldingMethodId -LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=WeldJoint.WeldingLocationId -LEFT JOIN Base_Consumables AS WeldMat ON WeldMat.ConsumablesId=WeldJoint.WeldMatId ---LEFT JOIN Base_Consumables AS WeldSilk ON WeldSilk.ConsumablesId=WeldJoint.WeldSilkId -LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=WeldJoint.GrooveTypeId -LEFT JOIN Base_Components AS Components1 ON Components1.ComponentsId = WeldJoint.PipeAssembly1Id -LEFT JOIN Base_Components AS Components2 ON Components2.ComponentsId = WeldJoint.PipeAssembly2Id -LEFT JOIN Welder_Welder AS BackingWelder ON BackingWelder.WelderId=WeldJoint.BackingWelderId -LEFT JOIN Welder_Welder AS CoverWelder ON CoverWelder.WelderId=WeldJoint.CoverWelderId -LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId -LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId -LEFT JOIN dbo.Base_PIPClass pip ON pip.PIPClassId = Pipeline.PIPClassId -LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId=WeldJoint.WPQId - - - -GO - - - - -ALTER PROC [dbo].[sp_rpt_JointComprehensive] - @projectId NVARCHAR(50), - @workAreaId NVARCHAR(50)=NULL, - @pipelineIds NVARCHAR(MAX) = NULL - -AS -/**********º¸¿Ú×ÛºÏÐÅÏ¢**********/ -SELECT - weldJoint.WeldJointId, - weldJoint.ProjectId, - WorkArea.WorkAreaId, - WorkArea.WorkAreaCode, - weldJoint.SystemNumber, - weldJoint.TestPackageNo, - pipeline.SingleNumber, - pipeline.PipelineCode, - pipeline.DrawingsNum, - pipingClass.PipingClassCode,pip.PIPClassCode, - weldJoint.PageNum, - weldJoint.PipeSegment,--ËùÊô¹Ü¶Î - weldJoint.WeldJointCode, - weldType.WeldTypeCode, - weldJoint.JointAttribute, - wl.WeldingLocationCode, - weldJoint.Dia, - weldJoint.Thickness,--±Úºñ - weldJoint.HeartNo1, - weldJoint.HeartNo2, - com1.ComponentsName AS PipeAssembly1, - com2.ComponentsName AS PipeAssembly2, - --material.MaterialCode, - mat1.MaterialCode AS MaterialCode1, - mat2.MaterialCode AS MaterialCode2, - cw.WelderCode AS CoverWelderCode, - fw.WelderCode AS BackingWelderCode, - WeldMethod.WeldingMethodName, - medium.MediumName, - weldingDaily.WeldingDate, - weldingDaily.WeldingDailyCode, - trust.TrustBatchCode, - --TrustBatchCode.DetectionRateCode, - --TrustBatchCode.AcceptLevel, - (CASE WHEN weldJoint.IsHotProess=1 THEN 'ÊÇ' ELSE '·ñ' END) AS IsHotProess, - null as TrustBatchCode, - null as DetectionRateCode, - null as AcceptLevel, - nde.NDEDate AS CHT_CHECKDATE, - ndeItem.NDEReportNo, - CAST(CAST(ISNULL(weldJoint.Size,0) AS REAL) AS NVARCHAR(8)) AS JOT_Size, - WeldMaterialMat.ConsumablesCode AS WMT_MatCode, - WeldMaterialMat.ConsumablesName AS WMT_Matname, - weldJoint.WeldSilkId, - --WeldMaterialSilk.ConsumablesCode AS hsCode, - --WeldMaterialSilk.ConsumablesName AS hsname, - --WeldMaterialSilk.UserFlux, - weldJoint.Specification, - wps.WPQCode,ndttype.DetectionTypeCode,NULL AS HotReportCode, - (CASE WHEN (PointBatchItem.PointState='1' OR PointBatchItem.PointState='2') - THEN (CASE WHEN PointBatchItem.IsWelderFirst=1 THEN 'ÊÇÊ×Èý¿Ú' ELSE 'ÊÇ' END) ELSE '·ñ' END) AS if_dk -FROM Pipeline_WeldJoint AS weldJoint - LEFT JOIN Pipeline_Pipeline AS pipeline ON pipeline.PipelineId = weldJoint.PipelineId - LEFT JOIN Project_WorkArea AS WorkArea ON WorkArea.WorkAreaId = pipeline.WorkAreaId - LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = weldJoint.Material1Id - LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = weldJoint.Material2Id - LEFT JOIN Base_WeldingMethod AS WeldMethod ON WeldMethod.WeldingMethodId = weldJoint.WeldingMethodId - LEFT JOIN dbo.Base_WeldType weldType ON weldType.WeldTypeId = weldJoint.WeldTypeId - LEFT JOIN dbo.Base_WeldingLocation wl ON wl.WeldingLocationId = weldJoint.WeldingLocationId - LEFT JOIN Base_Medium AS medium ON medium.MediumId = pipeline.MediumId - LEFT JOIN Base_Components com1 ON com1.ComponentsId=weldJoint.PipeAssembly1Id - LEFT JOIN Base_Components com2 ON com2.ComponentsId=weldJoint.PipeAssembly2Id - LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId - LEFT JOIN dbo.Base_PIPClass pip ON pip.PIPClassId = Pipeline.PIPClassId - LEFT JOIN Pipeline_WeldingDaily AS weldingDaily ON weldingDaily.WeldingDailyId = weldJoint.WeldingDailyId - LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = weldJoint.WPQId - left join Welder_Welder AS fw on weldJoint.BackingWelderId = fw.WelderId - left join Welder_Welder AS cw on weldJoint.CoverWelderId = cw.WelderId - LEFT JOIN Base_Consumables AS WeldMaterialMat ON WeldMaterialMat.ConsumablesId =weldJoint.WeldMatId - --LEFT JOIN Base_Consumables AS WeldMaterialSilk ON WeldMaterialSilk.ConsumablesId =weldJoint.WeldSilkId - LEFT JOIN Batch_PointBatchItem AS PointBatchItem ON PointBatchItem.WeldJointId =weldJoint.WeldJointId - LEFT JOIN dbo.Batch_PointBatch point ON point.PointBatchId = PointBatchItem.PointBatchId - LEFT JOIN dbo.Base_DetectionType ndttype ON ndttype.DetectionTypeId = point.DetectionTypeId - LEFT JOIN dbo.Batch_BatchTrustItem trustItem ON trustItem.PointBatchItemId = PointBatchItem.PointBatchItemId - LEFT JOIN dbo.Batch_BatchTrust trust ON trust.TrustBatchId = trustItem.TrustBatchId - LEFT JOIN dbo.Batch_NDEItem ndeItem ON ndeItem.TrustBatchItemId = trustItem.TrustBatchItemId - LEFT JOIN dbo.Batch_NDE nde ON nde.NDEID = ndeItem.NDEID - - WHERE weldJoint.ProjectId=@projectId - AND(pipeline.WorkAreaId=@workAreaId OR @workAreaId IS NULL) - AND (CHARINDEX(weldJoint.PipelineId,@pipelineIds)>0 or @pipelineIds IS NULl) - --AND(pipeline.PipelineCode=@pipelineCode OR @pipelineCode IS NULl) - - GO - -UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','') -GO - -UPDATE dbo.Template_Files SET SortIndex=SortIndex+1 where SortIndex>24 -GO - -INSERT INTO [dbo].[Template_Files]([id],[title],[filePath],[SortIndex]) -VALUES('95125974-3DD4-4E16-B4F0-A9D9C9A1406D','¹ÜµÀº¸½Ó½ÓÍ·PMI¼ì²â±ÈÀýÈ·Èϱí','',25) -GO - --- PMI´¦ÀíίÍÐ -create table PMI_Delegation -( - Id nvarchar(50) not null primary key, - DelegationNo nvarchar(50) not null, - DelegationDate datetime, - ProjectId nvarchar(50) not null, - InstallationId nvarchar(50), - UnitId nvarchar(50), - DetectionStandard nvarchar(50), - Tabler nvarchar(50), - Remark nvarchar(255), - CreatedTime datetime default getdate() -) -go ----- PMI´¦ÀíίÍÐ Ã÷ϸ -create table PMI_DelegationDetails -( - Id nvarchar(50) not null primary key, - PMIId nvarchar(50) not null, - JointId nvarchar(50) not null, - QualityNo nvarchar(255), - Acceptance nvarchar(255), - Status int not null, - CreatedTime datetime default getdate() -) -go - - --- ²åÈë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',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ίÍÐÃ÷ϸÊÓͼ***********/ - -USE [HJGLDB_ZJBSF] -GO - -/****** Object: View [dbo].[View_PMI_DelegationDetails] Script Date: 2024-5-13 9:06:44 ******/ -SET ANSI_NULLS ON -GO - -SET QUOTED_IDENTIFIER ON -GO - - - -alter table PMI_DelegationDetails add reportTime datetime - - - -ALTER VIEW [dbo].[View_PMI_DelegationDetails] -AS -/********PMI´¦ÀíÃ÷ϸ********/ -SELECT -TrustItem.Id, -TrustItem.Acceptance, -TrustItem.checkTime, -TrustItem.reportTime, -TrustItem.JointId as WeldJointId, -TrustItem.status, -TrustItem.QualityNo, -TrustItem.PMIId, -Trust.ProjectId, -Trust.DelegationNo, -Trust.DelegationDate, -WeldJoint.WeldJointCode, -Pipeline.PipelineCode, -WeldJoint.Specification, -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/HJGLPackFile_2024.05.12.rar b/HJGLPackFile_2024.05.12.rar deleted file mode 100644 index 00b6c52..0000000 Binary files a/HJGLPackFile_2024.05.12.rar and /dev/null differ