diff --git a/DataBase/版本日志/HJGLDB_DS_2025-12-25_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-12-25_gf.sql new file mode 100644 index 0000000..f78f39b --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-12-25_gf.sql @@ -0,0 +1,108 @@ + +ALTER VIEW [dbo].[View_WelderPerformance] +AS +select v.* from +(SELECT + NEWID() AS Id, + --total.ProjectId, + --project.ProjectCode,--ʩ + '' as ProjectCode, + total.Welder, + wld.wed_code,-- + wld.wed_name,-- + unit.UnitName as DepartName, -- + wld.WED_Sex, --Ա + -------------start + CAST(ISNULL(total.totalSize,0) AS DECIMAL(19,2)) AS totalSize, --ܴ羶 + ISNULL(total.totalJoint,0) AS totalJoint, --ܺ + ISNULL(JointNum1.JointNum1,0) AS JointNum1, --һƬ + + ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS JointPassNum1, --һƬϸ񺸿 + ISNULL(JointNoPassNum1.JointNoPassNum1,0) AS RepairJoint1, --һη޺ + ISNULL(RepairJoint2.RepairJoint2,0) AS RepairJoint2, --η޺ + ISNULL(RepairJoint3.RepairJoint3,0) AS RepairJoint3, --η޺ + + CAST((CASE ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0) WHEN 0 THEN 0 + ELSE (CASE(ISNULL(JointNum1.JointNum1,0)) WHEN 0 THEN 0 + ELSE 1.0 * ISNULL((ISNULL(JointNum1.JointNum1,0)-ISNULL(JointNoPassNum1.JointNoPassNum1,0)),0)/(1.0 * JointNum1.JointNum1) + END)END) AS DECIMAL(19,3)) AS JointPassRate , ---һƬںϸ + + ISNULL(JointNum1.totalfilm,0) AS totalfilm, --һƬ + (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) AS totalPassfilm, --һƬϸ + ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0) AS repairFilm1, --һηƬ + + ISNULL(RepairJoint2.repairFilm2,0) AS repairFilm2, --ηƬ + ISNULL(RepairJoint3.repairFilm3,0) AS repairFilm3, --ηƬ + + CAST((CASE (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0)) WHEN 0 THEN 0 + ELSE (CASE(ISNULL(JointNum1.totalfilm,0)) WHEN 0 THEN 0 + ELSE 1.0 * (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum2.JointNoPassFilmNum2,0))/(1.0 * JointNum1.totalfilm) + END) END) AS DECIMAL(19,3)) AS JointFilmPassRate ---һƬϸ + +FROM + --ֵܴ --ܺ + (SELECT SUM(joint.JOT_Size) AS totalSize,COUNT(*) AS totalJoint + ,joint.Welder + FROM View_JointWelder joint + LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID + WHERE joint.DReportID IS NOT NULL + GROUP BY joint.Welder) AS total + + +--һƬ , һƬ,һƬϸ + LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS JointNum1, SUM(joint.RT_FilmNum) AS totalfilm, + joint.Welder + FROM dbo.View_JointWelder joint + WHERE joint.PointType='' AND joint.RT_FilmNum IS NOT NULL and joint.RT_FilmNum>0 and (select COUNT(*) from dbo.HJGL_BO_QualityRating a +left join HJGL_CH_TrustItem b on a.CH_TrustItemID=b.CH_TrustItemID +left join HJGL_CH_Trust c on b.CH_TrustID=c.CH_TrustID where a.JOT_ID=joint.JOT_ID and FilmNum is not null and c.CH_NDTMethod='20d2cbca-8b3d-434b-b1c1-181796986fa5')>0 + AND joint.dreportid IS NOT NULL + GROUP BY joint.Welder) AS JointNum1 + ON JointNum1.Welder = total.Welder + + --һƬϸ񺸿 + LEFT JOIN (SELECT COUNT(distinct joint.JOT_ID) AS JointNoPassNum1, + joint.Welder + FROM dbo.HJGL_CH_RepairItemRecord rr + left join dbo.View_JointWelder joint on rr.JOT_ID=joint.JOT_ID + WHERE joint.PointType='' and rr.NDT_ID='20d2cbca-8b3d-434b-b1c1-181796986fa5' + --AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null) + AND joint.dreportid IS NOT NULL and rr.RepairMark='R1' + GROUP BY joint.Welder) AS JointNoPassNum1 + ON JointNoPassNum1.Welder = total.Welder + --һƬϸƬ + LEFT JOIN (SELECT count(rr.RepairItemRecordId) as JointNoPassFilmNum2, + joint.Welder + FROM dbo.HJGL_CH_RepairItemRecord rr + left join dbo.View_JointWelder joint on rr.JOT_ID=joint.JOT_ID + WHERE joint.PointType='' and rr.NDT_ID='20d2cbca-8b3d-434b-b1c1-181796986fa5' + --AND (joint.RT1_RepairFilm IS NOT NULL or (select top 1 CH_TrustItemID from dbo.HJGL_CH_TrustItem ti where ti.JOT_ID=joint.JOT_ID and ti.States='4') is not null) + AND joint.dreportid IS NOT NULL and rr.RepairMark='R1' + GROUP BY joint.Welder) AS JointNoPassNum2 + ON JointNoPassNum2.Welder = total.Welder + --ηƬ,ηƬ + LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint2, SUM(ISNULL(joint.RT2_RepairFilmNum,0)) AS RepairFilm2, + joint.Welder + FROM dbo.View_JointWelder joint + WHERE joint.PointType='' AND joint.RT2_RepairFilm IS NOT NULL + AND joint.dreportid IS NOT NULL + GROUP BY joint.Welder) AS RepairJoint2 + ON RepairJoint2.Welder = total.Welder + + + + --ηƬ,ηƬ + LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint3, SUM(ISNULL(joint.RT3_RepairFilmNum,0)) AS RepairFilm3, + joint.Welder + FROM dbo.View_JointWelder joint + WHERE joint.PointType='' AND joint.RT3_RepairFilm IS NOT NULL + AND joint.dreportid IS NOT NULL + GROUP BY joint.Welder) AS RepairJoint3 + ON RepairJoint3.Welder = total.Welder +LEFT JOIN dbo.HJGL_BS_Welder wld ON wld.WED_ID=total.Welder +LEFT JOIN dbo.Base_Unit unit on unit.UnitId=wld.WED_Unit) v +where v.JointFilmPassRate>0 and v.JointFilmPassRate<0.965 + +GO + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoOut.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoOut.aspx index 61c3822..b97f68f 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoOut.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoOut.aspx @@ -14,7 +14,7 @@ diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index a48b337..28be9c4 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Debug|Any CPU + Release|Any CPU FolderProfile true