20220915

DataBase/版本日志/SGGLDB_V2022-09-15.sql

@@ -1,37 +1,65 @@
 
-	INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
-	VALUES('854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','焊工功效分析','HJGL/WeldingReport/WelderEfficacy.aspx',90,'F3B157B7-9BEE-4150-80CB-087828F1C51D','Menu_HJGL',0,1,1)
-	GO
-	INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('47A49DB1-4689-421A-A93E-DCBD7C34D917','854C79DF-A1C0-4E3C-BCB4-7D5CD044F72B','查看',1)
-	GO
-
-
-CREATE  PROC [dbo].[sp_rpt_WelderEfficacy]    
-		  @unitcode NVARCHAR(50) = NULL,   --单位名称
-          @projectId NVARCHAR(50) = NULL,
-		  @JointAttribute NVARCHAR(50) = NULL
-          
+ALTER VIEW [dbo].[View_Welder_WelderQualify]
 AS
-/*焊工功效分析*/
-select 
-Welder.PersonId,
+/*******焊工资质***********/ 
+SELECT WelderQualify.WelderQualifyId, 
+WelderQualify.WelderId, 
+WelderQualify.QualificationItem, 
+WelderQualify.LimitDate, 
+WelderQualify.CheckDate,
+WelderQualify.ThicknessMin,
+WelderQualify.ThicknessMax,
+WelderQualify.SizesMin,
+WelderQualify.SizesMax,
+WelderQualify.ThicknessMin2,
+WelderQualify.IsAudit,
+WelderQualify.AuditMan,
+WelderQualify.AuditDate,
+WelderQualify.ThicknessMax2,
+WelderQualify.SizesMin2,  
+WelderQualify.SizesMax2,
+(CASE WHEN WelderQualify.ThicknessMin is null THEN '不可焊'
+      else ((CASE WHEN WelderQualify.ThicknessMin>0 THEN CONVERT(VARCHAR(5),CAST(WelderQualify.ThicknessMin AS REAL))
+	        else '不限' end)+' ~ '+
+			(CASE WHEN WelderQualify.ThicknessMax>0 THEN CONVERT(VARCHAR(5),CAST(WelderQualify.ThicknessMax AS REAL))
+	        else '不限' end)
+			) end) as Thickness,
+(CASE WHEN WelderQualify.SizesMin is null THEN '不可焊'
+      else ((CASE WHEN WelderQualify.SizesMin>0 THEN CONVERT(VARCHAR(5),CAST(WelderQualify.SizesMin AS REAL))
+	        else '不限' end)+' ~ '+
+			(CASE WHEN WelderQualify.SizesMax>0 THEN CONVERT(VARCHAR(5),CAST(WelderQualify.SizesMax AS REAL))
+	        else '不限' end)
+			) end) as Sizes,     
+(CASE WHEN WelderQualify.ThicknessMin2 is null THEN '不可焊'
+      else ((CASE WHEN WelderQualify.ThicknessMin2>0 THEN CONVERT(VARCHAR(5),CAST(WelderQualify.ThicknessMin2 AS REAL))
+	        else '不限' end)+' ~ '+
+			(CASE WHEN WelderQualify.ThicknessMax2>0 THEN CONVERT(VARCHAR(5),CAST(WelderQualify.ThicknessMax2 AS REAL))
+	        else '不限' end)
+			) end) as Thickness2,
+(CASE WHEN WelderQualify.SizesMin2 is null THEN '不可焊'
+      else ((CASE WHEN WelderQualify.SizesMin2>0 THEN CONVERT(VARCHAR(5),CAST(WelderQualify.SizesMin2 AS REAL))
+	        else '不限' end)+' ~ '+
+			(CASE WHEN WelderQualify.SizesMax2>0 THEN CONVERT(VARCHAR(5),CAST(WelderQualify.SizesMax2 AS REAL))
+	        else '不限' end)
+			) end) as Sizes2, 
+									   
+WelderQualify.Remark,
 Welder.WelderCode,
 Welder.PersonName,
-cast( SUM(ISNULL(jot.Size,0))AS DECIMAL(8,0) ) as TotalDin,
-count(distinct daily.WeldingDailyId) as  worktime,
-cast(cast( SUM(ISNULL(jot.Size,0))AS DECIMAL(8,3) ) /count(distinct daily.WeldingDailyId) as  DECIMAL(8,0)) as  Effect
-from SitePerson_Person Welder 
-left join HJGL_WeldJoint jot on  jot.CoverWelderId=Welder.PersonId
-left join HJGL_WeldingDaily  daily on jot.WeldingDailyId=daily.WeldingDailyId
-where Welder.WorkPostId='19B8F2A9-28D3-4F20-867A-1B2237C2E228' 
-AND (welder.ProjectId = @projectId OR @projectId IS NULL)
-AND (welder.UnitId=@unitcode OR @unitcode IS NULL)
-And (jot.JointAttribute=@JointAttribute OR @JointAttribute IS NULL)
-group by Welder.PersonName,Welder.PersonId,Welder.WelderCode
-having count(distinct daily.WeldingDailyId) !=0
- 
+WelderQualify.WeldingMethod,
+WelderQualify.WeldingLocation,
+WelderQualify.MaterialType,
+WelderQualify.IsPrintShow,
+WelderQualify.WeldType,
+WelderQualify.WelderMode,
+WelderQualify.IsCanWeldG
+FROM Welder_WelderQualify AS WelderQualify
+LEFT JOIN SitePerson_Person AS Welder ON Welder.PersonId=WelderQualify.WelderId
+
+
+
 
 
 GO
 
- 
+

DataBase/版本日志/SGGLDB_V2022-09-15修改明细.txt

@@ -1,4 +1,5 @@
---ADD BY lipengfei  2022-09-15
-1,焊接增加焊工功效分析
+--ADD BY gaofei  2022-09-15
+1,修改焊工合格项目视图
+2,修改质量移动端人员管理接口
 --END
- 
+