11

HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user

@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectView>ProjectFiles</ProjectView>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

HJGL/FineUIPro.Web/Web.config

@@ -51,7 +51,7 @@
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
       <add path="Reserved.ReportViewerWebControl.axd" verb="*" type="Microsoft.Reporting.WebForms.HttpHandler, Microsoft.ReportViewer.WebForms, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845DCD8080CC91" validate="false"/>
     </httpHandlers>
-    <compilation debug="true" targetFramework="4.8">
+    <compilation debug="false" targetFramework="4.8">
       <assemblies>
         <!--<add assembly="Microsoft.Build.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />-->
         <add assembly="System.Management, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>

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 backingWelder = tb.AsEnumerable().Where(row => row.Field<string>("BackingWelderCode")!=null).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 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

@@ -29,6 +29,10 @@ namespace Model
 		
     #region 可扩展性方法定义
     partial void OnCreated();
+		partial void OnCreated()
+		{
+			this.CommandTimeout = 600;
+		}
     partial void InsertAttachFile(AttachFile instance);
     partial void UpdateAttachFile(AttachFile instance);
     partial void DeleteAttachFile(AttachFile instance);

HJGL/WebApi/WebApi.csproj.user

@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
   </PropertyGroup>
   <ProjectExtensions>

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

@@ -0,0 +1,289 @@
+-- 管线焊工 增加是否 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委托明细视图***********/ 
+
+ALTER VIEW [dbo].[View_PMI_DelegationDetails]
+AS
+/********热处理明细********/
+SELECT 
+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,
+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
+
+
+
+
+
+
+