diff --git a/DataBase/版本日志/HJGLDB_DS_2025-04-07_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-04-07_gf.sql new file mode 100644 index 0000000..f98b1b0 --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-04-07_gf.sql @@ -0,0 +1,132 @@ + +ALTER PROC [dbo].[HJGL_sp_rpt_welderPerformance] + @unitcode VARCHAR(50) = NULL, + @steel VARCHAR(50) = NULL, + @WED_ID NVARCHAR(50) = NULL, + @date1 DATETIME = NULL, + @date2 DATETIME = NULL, + @projectId NVARCHAR(500) = NULL, + @installationId NVARCHAR(50)=NULL +AS +/*º¸¹¤Òµ¼¨·ÖÎö*/ +SELECT + NEWID() AS Id, + total.ProjectId, + project.ProjectCode,--Ê©¹¤ºÅ + total.Welder, + wld.wed_code,-- º¸¹¤´úÂë + wld.wed_name,--º¸¹¤Ãû³Æ + 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(JointNoPassNum1.JointNoPassFilmNum1,0)) AS totalPassfilm, --Ò»´ÎÅÄƬºÏ¸ñÊý + ISNULL(JointNoPassNum1.JointNoPassFilmNum1,0) AS repairFilm1, --Ò»´Î·µÐÞƬ×ÓÊý + + ISNULL(RepairJoint2.repairFilm2,0) AS repairFilm2, --¶þ´Î·µÐÞƬ×ÓÊý + ISNULL(RepairJoint3.repairFilm3,0) AS repairFilm3, --Èý´Î·µÐÞƬ×ÓÊý + + CAST((CASE (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum1.JointNoPassFilmNum1,0)) WHEN 0 THEN 0 + ELSE (CASE(ISNULL(JointNum1.totalfilm,0)) WHEN 0 THEN 0 + ELSE 1.0 * (ISNULL(JointNum1.totalfilm,0)- ISNULL(JointNoPassNum1.JointNoPassFilmNum1,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.ProjectId,joint.InstallationId,joint.BSU_ID,joint.Welder + FROM View_JointWelder joint + LEFT JOIN HJGL_BO_WeldReportMain report ON joint.DReportID = report.DReportID + WHERE joint.DReportID IS NOT NULL + AND (report.JOT_WeldDate >= @date1 OR @date1 IS NULL) AND (report.JOT_WeldDate <= @date2 OR @date2 IS NULL) + AND (joint.ste_id=@steel OR @steel IS NULL) + GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, joint.Welder) AS total + + +--Ò»´ÎÅÄƬº¸¿ÚÊý , Ò»´ÎÅÄƬ×ÜÊý,Ò»´ÎÅÄƬºÏ¸ñ×ÜÊý + LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS JointNum1, SUM(joint.RT_FilmNum) AS totalfilm, + joint.ProjectId,joint.InstallationId,joint.BSU_ID,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 where JOT_ID=joint.JOT_ID and FilmNum is not null)>0 + AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL + AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_BO_QualityRating WHERE JOT_ID=joint.JOT_ID)>= @date1 OR @date1 IS NULL) + AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_BO_QualityRating WHERE JOT_ID=joint.JOT_ID)<= @date2 OR @date2 IS NULL) + GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, joint.Welder) AS JointNum1 + ON JointNum1.ProjectId=total.ProjectId AND JointNum1.InstallationId = total.InstallationId + AND JointNum1.BSU_ID = total.BSU_ID AND JointNum1.Welder = total.Welder + + --Ò»´ÎÅÄƬ²»ºÏ¸ñº¸¿ÚÊý + LEFT JOIN (SELECT COUNT(distinct joint.JOT_ID) AS JointNoPassNum1,count(rr.RepairItemRecordId) as JointNoPassFilmNum1, + joint.ProjectId,joint.InstallationId,joint.BSU_ID,joint.Welder + FROM dbo.View_JointWelder joint + left join dbo.HJGL_CH_RepairItemRecord rr on rr.JOT_ID=joint.JOT_ID + WHERE joint.PointType='µã¿Ú' 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.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL and rr.RepairMark='R1' + AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')>= @date1 OR @date1 IS NULL) + AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R1')<= @date2 OR @date2 IS NULL) + GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, joint.Welder) AS JointNoPassNum1 + ON JointNoPassNum1.ProjectId=total.ProjectId AND JointNoPassNum1.InstallationId = total.InstallationId + AND JointNoPassNum1.BSU_ID = total.BSU_ID AND JointNoPassNum1.Welder = total.Welder + + --¶þ´Î·µÐÞÅÄƬº¸¿ÚÊý,¶þ´Î·µÐÞÅÄƬ×ÜÊý + LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint2, SUM(ISNULL(joint.RT2_RepairFilmNum,0)) AS RepairFilm2, + joint.ProjectId,joint.InstallationId,joint.BSU_ID,joint.Welder + FROM dbo.View_JointWelder joint + WHERE joint.PointType='µã¿Ú' AND joint.RT2_RepairFilm IS NOT NULL + AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL + AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R2')>= @date1 OR @date1 IS NULL) + AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R2')<= @date2 OR @date2 IS NULL) + GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, joint.Welder) AS RepairJoint2 + ON RepairJoint2.ProjectId=total.ProjectId AND RepairJoint2.InstallationId = total.InstallationId + AND RepairJoint2.BSU_ID = total.BSU_ID AND RepairJoint2.Welder = total.Welder + + + + --Èý´Î·µÐÞÅÄƬº¸¿ÚÊý,Èý´Î·µÐÞÅÄƬ×ÜÊý + LEFT JOIN (SELECT COUNT(joint.JOT_ID) AS RepairJoint3, SUM(ISNULL(joint.RT3_RepairFilmNum,0)) AS RepairFilm3, + joint.ProjectId,joint.InstallationId,joint.BSU_ID,joint.Welder + FROM dbo.View_JointWelder joint + WHERE joint.PointType='µã¿Ú' AND joint.RT3_RepairFilm IS NOT NULL + AND (joint.ste_id=@steel OR @steel IS NULL) AND joint.dreportid IS NOT NULL + AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R3')>= @date1 OR @date1 IS NULL) + AND ((SELECT TOP 1 SignDate FROM dbo.HJGL_CH_RepairItemRecord WHERE JOT_ID=joint.JOT_ID AND RepairMark='R3')<= @date2 OR @date2 IS NULL) + GROUP BY joint.ProjectId,joint.InstallationId,joint.BSU_ID, joint.Welder) AS RepairJoint3 + ON RepairJoint3.ProjectId=total.ProjectId AND RepairJoint3.InstallationId = total.InstallationId + AND RepairJoint3.BSU_ID = total.BSU_ID AND RepairJoint3.Welder = total.Welder + +LEFT JOIN Base_Project project ON total.ProjectId=project.ProjectId +LEFT JOIN dbo.HJGL_BS_Welder wld ON wld.WED_ID=total.Welder + +WHERE + (CHARINDEX(total.ProjectId,@projectId)>0 OR @projectId IS NULL) + AND (total.InstallationId = @installationId OR @installationId IS NULL) + AND (wld.WED_Unit=@unitcode OR @unitcode IS NULL) + AND (total.Welder = @WED_ID OR @WED_ID IS NULL) + + + + + + + + + + + + +GO + + diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo index 4252223..5703328 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/.suo and b/HJGL_DS/.vs/SGGL/v15/.suo differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm index 4e295ce..90a8038 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal index 37b1822..37c1b4c 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 8aa7c11..bf54086 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index bf404b8..ede14f6 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -50,7 +50,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 28be9c4..a48b337 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true