20260529 焊材关联数据处理

2026-05-29 14:39:26 +08:00
parent ba1124b932
commit 51ca66dab6
6 changed files with 140 additions and 47 deletions
@@ -661,14 +661,68 @@ GO



+ALTER PROCEDURE [dbo].[HJGL_sp_WeldInspectionCheckRecordNew]
+(
+   @ProjectId NVARCHAR(50)=null,
+   @ISO_ID VARCHAR(1000)=NULL,
+   @VICheckDate DATETIME=NULL,
+   @NDTR_ID VARCHAR(50)=NULL,
+   @JOTY_Group NCHAR(1)=NULL,
+   @WeldingDate datetime=null
+)
+AS
+--管道对接焊接接头报检/检查记录
+SELECT ROW_NUMBER() OVER(ORDER BY IsoInfo.ISO_IsoNo,joint.JOT_JointNo)%12 AS Num,
+   NEWID() as New_ID, Project.ProjectId,Project.ProjectCode,Project.ProjectName,
+   batchDetail.JOT_ID, joint.JOT_JointNo,joint.JOT_JointDesc,joint.ISO_ID,batch.NDTR_ID,
+    IsoInfo.ISO_IsoNo,batchDetail.VICheckDate,
+	(CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code,   --焊工号 
+    (CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Name+'/'+CellWelder.WED_Name ELSE FloorWelder.WED_Name END) AS WED_Name, --焊工姓名 
+	(CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code
+        THEN Steel.STE_Code + '/' + Steel2.STE_Code
+        WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code
+        ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code,   --材质
+       (CASE batchDetail.IsVI WHEN 1 THEN '√'  ELSE NULL END) AS PassVI,
+       (CASE batchDetail.IsVI WHEN 0 THEN '√'  ELSE NULL END) AS NoPassVI,		   
+joint.JOT_Location --焊接位置
+,WeldMethod.WME_Name --焊接方法
+,CASE WHEN WeldMat.WeldName IS NULL THEN ISNULL(WeldSilk.WeldName,'')
+	ELSE (CASE WHEN WeldSilk.WeldName IS NULL
+		 THEN ISNULL(WeldMat.WeldName,'')
+		ELSE (ISNULL(WeldSilk.WeldName,'') +'/'+ ISNULL(WeldMat.WeldName,'')) END) END AS WMT_MatName --焊材牌号
+,joint.JOT_PrepareTemp --预热温度
+,batchDetail.Remark  
+,jointType.JOTY_Group
+,weldReport.JOT_WeldDate
+,joint.Sort1
+,joint.Sort2
+,joint.Sort3
+,joint.Sort4
+,joint.Sort5
+FROM dbo.HJGL_BO_BatchDetail batchDetail
+LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId
+LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId
+LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = joint.ISO_ID
+LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=joint.JOT_CellWelder
+LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=joint.JOT_FloorWelder
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = joint.STE_ID
+LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=joint.STE_ID2
+LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID		   
+LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=joint.WME_ID
+LEFT JOIN View_WeldInfoDropDownLists as WeldMat on WeldMat.WeldId = joint.JOT_WeldMat and WeldMat.WeldTypeName like '%焊条%'
+LEFT JOIN View_WeldInfoDropDownLists as WeldSilk on WeldSilk.WeldId = joint.JOT_WeldSilk and WeldSilk.WeldTypeName like '%焊丝%'
+left join HJGL_BO_WeldReportMain as weldReport on weldReport.DReportID= joint.DReportID

+WHERE (jointType.JOTY_Group=@JOTY_Group OR @JOTY_Group IS NULL) AND 
+      (joint.ProjectId=@projectId OR @projectId IS NULL) AND	           
+      (joint.ISO_ID in(select Id from dbo.StrToTable(@ISO_ID)) OR @ISO_ID IS NULL)
+      AND (batchDetail.VICheckDate=@VICheckDate OR @VICheckDate IS NULL)
+      AND (batch.NDTR_ID=@NDTR_ID OR @NDTR_ID IS NULL)
+      --AND batchDetail.VICheckDate IS NOT NULL
+	  and weldReport.JOT_WeldDate is not null
+	  and (weldReport.JOT_WeldDate=@WeldingDate or @WeldingDate is null)
+      
+order by joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
+GO

--	SELECT * FROM View_WeldInfoDropDownLists WHERE WeldName='CHE422R'
-
-	
--select distinct JOT_WeldSilk,HJGL_BS_WeldMaterial.WMT_MatCode from HJGL_PW_JointInfo
--left join HJGL_BS_WeldMaterial on HJGL_PW_JointInfo.JOT_WeldSilk = HJGL_BS_WeldMaterial.WMT_ID
----where HJGL_BS_WeldMaterial.WMT_MatCode not in (select WeldName from Weld_WeldInfo)
-
--select distinct JOT_WeldMat,HJGL_BS_WeldMaterial.WMT_MatCode from HJGL_PW_JointInfo
--left join HJGL_BS_WeldMaterial on HJGL_PW_JointInfo.JOT_WeldMat = HJGL_BS_WeldMaterial.WMT_ID