HJGL_DS/DataBase/版本日志/HJGLDB_DS_2024-12-31_bwj.sql

285 lines
16 KiB
Transact-SQL

ALTER PROCEDURE [dbo].[HJGL_spJointWorkRecordNew]
(
@IsoId varchar(50),
@Flag CHAR(1)
)
AS
/*밗돛보쌈묏鱗션쩌꿴璂(劤) 닸뇨법넋 */
IF(@Flag='1')
BEGIN
SELECT v.* FROM
(SELECT ROW_NUMBER() OVER(ORDER BY convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo))) AS Number,
(CASE WHEN j.JOT_CellWelder!=j.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code,--보묏뵀
isoInfo.ISO_IsoNo
,j.JOT_JointNo
,convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo)) AS ConvertJointNo
,j.JOT_JointDesc
,(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 --꼼醴
,isoInfo.ISO_IsoNo AS ISO_IsoNumber
,j.JOT_Location as weldLocal
,weldMethod.WME_Name,
CASE WHEN weldMaterial.WMT_MatCode IS NULL THEN ISNULL(weldMaterial1.WMT_MatCode,'')
ELSE (CASE WHEN weldMaterial1.WMT_MatCode IS NULL
THEN ISNULL(weldMaterial.WMT_MatCode,'')
ELSE (ISNULL(weldMaterial1.WMT_MatCode,'') +'/'+ ISNULL(weldMaterial.WMT_MatCode,'')) END) END AS WMT_MatName
,(CASE WHEN j.JOT_PrepareTemp IS NOT NULL THEN CONVERT(NVARCHAR(10),CONVERT(FLOAT,j.JOT_PrepareTemp)) ELSE '/' END) AS JOT_PrepareTemp
,CONVERT(FLOAT,j.JOT_LastTemp) as JOT_LastTemp
,(CASE WHEN j.Jot_WeldingDate IS NOT NULL THEN CONVERT(varchar(100), j.Jot_WeldingDate, 23)
ELSE CONVERT(varchar(100), reportDay.JOT_WeldDate, 23) END) AS WeldDate
,'' as NDTT_CheckCode
--,(select top 1 CHT_CheckCode from dbo.HJGL_CH_Check where CHT_CheckID in(select CHT_CheckID from dbo.HJGL_CH_CheckItem where dbo.HJGL_CH_CheckItem.JOT_ID=j.JOT_ID)) as NDTT_CheckCode
,(select top 1 RecordChartNo from dbo.HJGL_HotProessItem HotProessItem where HotProessItem.JOT_ID=j.JOT_ID) as JOT_HotRpt
,j.ISO_ID
,jointType.JOTY_Group,j.Sort1,j.Sort2,j.Sort3,j.Sort4,j.Sort5
from dbo.HJGL_pw_jointinfo j
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=j.JOT_CellWelder
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=j.JOT_FloorWelder
left join dbo.HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=j.ISO_ID
left join dbo.HJGL_BS_Steel steel on steel.STE_ID=j.STE_ID
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=j.STE_ID2
left join dbo.HJGL_BS_WeldMethod weldMethod on weldMethod.WME_ID=j.WME_ID
left join dbo.HJGL_BS_WeldMaterial weldMaterial on weldMaterial.WMT_ID=j.JOT_WeldMat
left join dbo.HJGL_BS_WeldMaterial weldMaterial1 on weldMaterial1.WMT_ID=j.JOT_WeldSilk
left join dbo.HJGL_BO_WeldReportMain reportDay on reportDay.DReportID=j.DReportID
left join HJGL_BS_JointType jointType on jointType.JOTY_ID = j.JOTY_ID
where (j.DReportID is not null and j.DReportID !='')
and j.ISO_ID=@IsoId) v
WHERE v.Number<=11
END
else IF(@Flag='2')
BEGIN
SELECT v.* FROM
(SELECT ROW_NUMBER() OVER(ORDER BY convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo))) AS Number,
(CASE WHEN j.JOT_CellWelder!=j.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code,--보묏뵀
isoInfo.ISO_IsoNo
,j.JOT_JointNo
,convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo)) AS ConvertJointNo
,j.JOT_JointDesc
,(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 --꼼醴
,isoInfo.ISO_IsoNo AS ISO_IsoNumber
,j.JOT_Location as weldLocal
,weldMethod.WME_Name,
CASE WHEN weldMaterial.WMT_MatCode IS NULL THEN ISNULL(weldMaterial1.WMT_MatCode,'')
ELSE (CASE WHEN weldMaterial1.WMT_MatCode IS NULL
THEN ISNULL(weldMaterial.WMT_MatCode,'')
ELSE (ISNULL(weldMaterial1.WMT_MatCode,'') +'/'+ ISNULL(weldMaterial.WMT_MatCode,'')) END) END AS WMT_MatName
,(CASE WHEN j.JOT_PrepareTemp IS NOT NULL THEN CONVERT(NVARCHAR(10),CONVERT(FLOAT,j.JOT_PrepareTemp)) ELSE '/' END) AS JOT_PrepareTemp
,CONVERT(FLOAT,j.JOT_LastTemp) as JOT_LastTemp
,(CASE WHEN j.Jot_WeldingDate IS NOT NULL THEN CONVERT(varchar(100), j.Jot_WeldingDate, 23)
ELSE CONVERT(varchar(100), reportDay.JOT_WeldDate, 23) END) AS WeldDate
,'' as NDTT_CheckCode
--,(select top 1 CHT_CheckCode from dbo.HJGL_CH_Check where CHT_CheckID in(select CHT_CheckID from dbo.HJGL_CH_CheckItem where dbo.HJGL_CH_CheckItem.JOT_ID=j.JOT_ID)) as NDTT_CheckCode
,(select top 1 RecordChartNo from dbo.HJGL_HotProessItem HotProessItem where HotProessItem.JOT_ID=j.JOT_ID) as JOT_HotRpt
,j.ISO_ID
,jointType.JOTY_Group,j.Sort1,j.Sort2,j.Sort3,j.Sort4,j.Sort5
from dbo.HJGL_pw_jointinfo j
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=j.JOT_CellWelder
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=j.JOT_FloorWelder
left join dbo.HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=j.ISO_ID
left join dbo.HJGL_BS_Steel steel on steel.STE_ID=j.STE_ID
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=j.STE_ID2
left join dbo.HJGL_BS_WeldMethod weldMethod on weldMethod.WME_ID=j.WME_ID
left join dbo.HJGL_BS_WeldMaterial weldMaterial on weldMaterial.WMT_ID=j.JOT_WeldMat
left join dbo.HJGL_BS_WeldMaterial weldMaterial1 on weldMaterial1.WMT_ID=j.JOT_WeldSilk
left join dbo.HJGL_BO_WeldReportMain reportDay on reportDay.DReportID=j.DReportID
left join HJGL_BS_JointType jointType on jointType.JOTY_ID = j.JOTY_ID
where (j.DReportID is not null and j.DReportID !='')
and j.ISO_ID=@IsoId) v
WHERE v.Number>11
END
ELSE
BEGIN
SELECT v.* FROM
(SELECT ROW_NUMBER() OVER(ORDER BY convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo))) AS Number,
(CASE WHEN j.JOT_CellWelder!=j.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code,--보묏뵀
isoInfo.ISO_IsoNo
,j.JOT_JointNo
,convert(int,dbo.Fun_GetParseInt(j.JOT_JointNo)) AS ConvertJointNo
,j.JOT_JointDesc
,(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 --꼼醴
,isoInfo.ISO_IsoNo AS ISO_IsoNumber
,j.JOT_Location as weldLocal
,weldMethod.WME_Name,
CASE WHEN weldMaterial.WMT_MatCode IS NULL THEN ISNULL(weldMaterial1.WMT_MatCode,'')
ELSE (CASE WHEN weldMaterial1.WMT_MatCode IS NULL
THEN ISNULL(weldMaterial.WMT_MatCode,'')
ELSE (ISNULL(weldMaterial1.WMT_MatCode,'') +'/'+ ISNULL(weldMaterial.WMT_MatCode,'')) END) END AS WMT_MatName
,(CASE WHEN j.JOT_PrepareTemp IS NOT NULL THEN CONVERT(NVARCHAR(10),CONVERT(FLOAT,j.JOT_PrepareTemp)) ELSE '/' END) AS JOT_PrepareTemp
,CONVERT(FLOAT,j.JOT_LastTemp) as JOT_LastTemp
,(CASE WHEN j.Jot_WeldingDate IS NOT NULL THEN CONVERT(varchar(100), j.Jot_WeldingDate, 23)
ELSE CONVERT(varchar(100), reportDay.JOT_WeldDate, 23) END) AS WeldDate
,'' as NDTT_CheckCode
--,(select top 1 CHT_CheckCode from dbo.HJGL_CH_Check where CHT_CheckID in(select CHT_CheckID from dbo.HJGL_CH_CheckItem where dbo.HJGL_CH_CheckItem.JOT_ID=j.JOT_ID)) as NDTT_CheckCode
,(select top 1 RecordChartNo from dbo.HJGL_HotProessItem HotProessItem where HotProessItem.JOT_ID=j.JOT_ID) as JOT_HotRpt
,j.ISO_ID
,jointType.JOTY_Group,j.Sort1,j.Sort2,j.Sort3,j.Sort4,j.Sort5
from dbo.HJGL_pw_jointinfo j
LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=j.JOT_CellWelder
LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=j.JOT_FloorWelder
left join dbo.HJGL_PW_IsoInfo isoInfo on isoInfo.ISO_ID=j.ISO_ID
left join dbo.HJGL_BS_Steel steel on steel.STE_ID=j.STE_ID
LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=j.STE_ID2
left join dbo.HJGL_BS_WeldMethod weldMethod on weldMethod.WME_ID=j.WME_ID
left join dbo.HJGL_BS_WeldMaterial weldMaterial on weldMaterial.WMT_ID=j.JOT_WeldMat
left join dbo.HJGL_BS_WeldMaterial weldMaterial1 on weldMaterial1.WMT_ID=j.JOT_WeldSilk
left join dbo.HJGL_BO_WeldReportMain reportDay on reportDay.DReportID=j.DReportID
left join HJGL_BS_JointType jointType on jointType.JOTY_ID = j.JOTY_ID
where (j.DReportID is not null and j.DReportID !='')
and j.ISO_ID=@IsoId) v
order by v.Sort1,v.Sort2,v.Sort3,v.Sort4,v.Sort5
END
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.WMT_MatCode IS NULL THEN ISNULL(WeldSilk.WMT_MatCode,'')
ELSE (CASE WHEN WeldSilk.WMT_MatCode IS NULL
THEN ISNULL(WeldMat.WMT_MatCode,'')
ELSE (ISNULL(WeldSilk.WMT_MatCode,'') +'/'+ ISNULL(WeldMat.WMT_MatCode,'')) 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 HJGL_BS_WeldMaterial AS WeldSilk ON WeldSilk.WMT_ID=joint.JOT_WeldSilk
LEFT JOIN HJGL_BS_WeldMaterial AS WeldMat ON WeldMat.WMT_ID=joint.JOT_WeldMat
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=@WeldingDate or @WeldingDate is null)
order by joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
GO
ALTER PROCEDURE [dbo].[HJGL_sp_WeldInspectionCheckRecord]
(
@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)%18 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,
(CASE WHEN v.CH_TrustItemID IS NOT NULL THEN '' ELSE NULL END) AS IsTrust,
(CASE v.States WHEN '2' THEN '' ELSE NULL END ) AS TrustState,
(SELECT TOP 1 ReportCode FROM dbo.HJGL_CH_TestingReportPrint report
WHERE report.BatchId=batchDetail.BatchId
AND report.ISO_ID=batchDetail.ISO_ID AND report.NDT_ID=v.NDT_ID
AND report.Specifications=joint.JOT_JointDesc) AS ReportCode,
joint.JOT_Location --보쌈貫零
,WeldMethod.WME_Name --보쌈렘랬
,CASE WHEN WeldMat.WMT_MatCode IS NULL THEN ISNULL(WeldSilk.WMT_MatCode,'')
ELSE (CASE WHEN WeldSilk.WMT_MatCode IS NULL
THEN ISNULL(WeldMat.WMT_MatCode,'')
ELSE (ISNULL(WeldSilk.WMT_MatCode,'') +'/'+ ISNULL(WeldMat.WMT_MatCode,'')) END) END AS WMT_MatName --보꼼탬뵀
,joint.JOT_PrepareTemp --渡훑侊똑
,batchDetail.Remark
,jointType.JOTY_Group,joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
,weldReport.JOT_WeldDate
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 (SELECT top 1 trustItem.CH_TrustItemID,trust.CH_NDTMethod AS NDT_ID, trustItem.JOT_ID, trustItem.States
FROM dbo.HJGL_CH_TrustItem trustItem
LEFT JOIN dbo.HJGL_CH_Trust trust ON trust.CH_TrustID = trustItem.CH_TrustID
LEFT JOIN dbo.HJGL_BS_NDTType ndtType on ndtType.NDT_ID=trust.CH_NDTMethod
WHERE ndtType.NDT_Code LIKE '%RT%') v ON v.JOT_ID=batchDetail.JOT_ID
LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=joint.WME_ID
LEFT JOIN HJGL_BS_WeldMaterial AS WeldSilk ON WeldSilk.WMT_ID=joint.JOT_WeldSilk
LEFT JOIN HJGL_BS_WeldMaterial AS WeldMat ON WeldMat.WMT_ID=joint.JOT_WeldMat
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=@WeldingDate or @WeldingDate is null)
order by joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5
GO