From 699c40f3062ef63fe556c9fd45c57027744a29a1 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Wed, 19 Jun 2024 18:52:56 +0800 Subject: [PATCH 1/3] 2024-06-19 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 266240 -> 266240 bytes DataBase/版本日志/SGGLDB_V2024-06-19.sql | 232 ++++++++++++ .../HJGL/WeldingManage/WeldJointService.cs | 7 +- .../HJGL/InfoQuery/JointQuery.aspx | 12 +- .../HJGL/InfoQuery/JointQuery.aspx.cs | 4 +- .../HJGL/WeldingManage/WeldReport.aspx | 12 +- .../HJGL/WeldingManage/WeldReport.aspx.cs | 2 +- .../HJGL/WeldingManage/WeldReportEdit.aspx.cs | 6 + .../HJGL/WeldingManage/WeldingConDate.aspx | 9 +- .../HJGL/WeldingManage/WeldingConDate.aspx.cs | 76 ++++ .../WeldingConDate.aspx.designer.cs | 79 ++-- SGGL/Model/Model.cs | 350 +++++++++++------- 12 files changed, 611 insertions(+), 178 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2024-06-19.sql diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 92ce933b3ee27170edc34d31292f81e39355a085..80c39ad9c8ed0c1643eca07c61c6f09515415402 100644 GIT binary patch delta 1652 zcmcgsO>7%Q6wX^unzdOwZtOZCcH<;C)Jbj0YddZtfmyYN(w5ed__-!dZ6lyGA+k#q z3R%&rjnoK5eiG(Tp~j%xdT3TvPL&Ml36NSY9N@$aA-LIx92)ap;!T`LAhd)X7_haqwMm4nMx#Mf8xY)tZbA>C7YAhT{nqdx$*u-LI+|A1WY5qMY;M0e&eS)9bfOLjYw63wl~*L+1VUyn`@qxX3q08cd=ZY60&heJOM|)7W^-Q)mFhKot4@$4NEcy zZ$l8gMA!WyZ-65#*hT0da0PFMtJpR{X2VDRPQpIHct`ZZ5#ynJ4sgQl7K@aC{kAvS zxx?1|%q=L{V;RP&men%)S@HV(0CW`wL~8fg;09`L+A1 z+jN{I2ivc4Aadjy(f5qcHJu;QTqIl}Ty6Ty!jEWujqowy6T$*P$ESx+EBvu6gk2?t zE*)-Sy(_H*nr<@$H?Zhhfa_Ryef9roJboGPS(u$L$4Ya6+b65=D zE{)V+7VDl1cHm3G_jyLf7n6gCLFOxfIY!0PC-uDR#&n}_*&I3I9_IZ@@N!0w+ zQYiJW$;;o^gx{EqtN>1(*Ghx0%6uVBek=@5D7*-^IE~uiV+l7T)u;_A5(eZR!xf`EZ zR(m9=GAlmsmA-o}o*x~H#A4wSYCaQ=XA`;bbaXl!&SxW|*~E!yawOLO?3E5#(5Kof zSH!1_tBbH)nU|XOd@(<*hU2+xK0KDm=E4aznu}+1naF4?YuwYl zma=RUV>kPx)jrGbSiP>{uJWYYc^4Z@`_bxWmOj5@-J2~v_9z&E9A5bfB9Fd J@b9g)zW`+Ig1`U( delta 1673 zcmcgsO>7%Q6!u$BnsqwsxQRoYq={+jwxPt*+HsP#6h+%M1xtw>A1LBRogWK9)uv#V zVimkVRRZy$*^yXoHCEM2#DVO=Cs0HxxB+J*1eG|UB5`n#DiO?kiMOmFf*VizG&ApK z_WRzeW+z~s{ytv<^!m22E(_*_Pro4*LS11LI3t+uk0B87tJ!`|cf;fa2LJT9~2nu%N zc(^$~iQ{@UI6};J|Avlc4%Lty!L?mxKZ0N1_z#LD)lF}|ywQ+x1NsPk%rPQO1lO~n z48xJgbs^djM6L(nkatK@t(z>ZgP2F7V?$XpUJbp-lcV>D`-8*-~~J1u?l8~ ze2~|_Ew-hYsQV3g$}V)y11DNUk+v4=;mCeW6gt<;;0%vogu47VnhzTAp4bV_b1%A` zL!m;rB?>*IwwvhoibqH8@KZP=Q3P?f>v}Nda?Cd8LhZi6F5v>{hsIxPdJ8ySLtIC^ z(eyc6-N5ymh_?_WgkkTV`3g8`piAX2g)8>XKpGSvf#f9H6PONL`z_XgV|pf z^|Rk{((FDI-xYLBBdCMVa%v#8#v#zszyv3EOMj`GYwmVg4-^)*e&}S!Ebe1rJ3Ra` zm?{%25oEo%F+Mv#!NEzRcHs1{u)Y$oN7aX3*5_oK8vY{s+w>lZ{FyRI?8KN`qNqPFF8W;_TJ99l!at zSLnr!+D1sa0M!-tVZZc#WFeMI#3y6%=$M+Eh$fa6m!iq#`(9v)`Ots&{&koV`BF0(DLD(y_MDjm#k4RChC+8UJf+M3L|LHs^EVWr#I W>ouKI;^PCh9^fheRae8hFX2xVbaTc4 diff --git a/DataBase/版本日志/SGGLDB_V2024-06-19.sql b/DataBase/版本日志/SGGLDB_V2024-06-19.sql new file mode 100644 index 00000000..818ec7c0 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2024-06-19.sql @@ -0,0 +1,232 @@ +alter view dbo.View_HJGL_WeldJoint as + SELECT jot.[ProjectId] --ĿId + , pipe.[UnitWorkId] --λId + , uw.UnitWorkName --λ + , pipe.[UnitId] --λId + , unit.UnitName --λ + , jot.[PipelineCode] --ߺ + , pipe.[SingleNumber] --ͼ + , pipe.[SingleName] --ͼֽ + , pipe.[MediumId] --Id + , medium.MediumCode + , medium.MediumName -- + , pipe.[PipingClassId] --ܵȼId + , pipingClass.PipingClassCode --ܵȼ + , pipe.[DetectionRateId] --̽˱Id + , dr.DetectionRateCode --̽˱51020 + , pipe.DetectionType --̽Id(ܶм|ָ) + , STUFF((SELECT ',' + DetectionTypeCode + FROM Base_DetectionType + WHERE CHARINDEX('|' + LTRIM(DetectionTypeId) + '|', '|' + pipe.DetectionType + '|') > 0 + FOR XML PATH('')), 1, 1, '') AS DetectionTypeStr --̽ͣܶм,ָ + , pipe.DesignTemperature --¶ȡ + , pipe.DesignPress --ѹMpa(g) + , pipe.TestMedium --ѹId + , tm.MediumName AS TestMediumName --ѹ + , pipe.TestPressure --ѹѹMpa(g) + , pipe.PressurePipingClassId --ѹܵId + , ppc.PressurePipingClassCode --ѹܵ + , pipe.PipeLenth --߳(m) + , pipe.LeakMedium --й¶Id + , tm2.MediumName AS LeakMediumName --й¶ + , pipe.LeakPressure --й¶ѹMpa(g) + , pipe.PCMedium --ϴҪId + , pm.PurgeMethodCode --ϴҪ + , pipe.VacuumPressure --ѹKpa(a) + , pipe.MaterialId --Id + , mat.MaterialCode AS PipeMaterialCode -- + , pipe.Remark AS PipeRemark --ע + , pipe.FlowingSection as FlowingSection --ˮ + , jot.[WeldJointId] --Id + , jot.[WeldJointCode] --ں + , jot.[Material1Id] --1Id + , mat1.MaterialCode AS Material1Code --1 + , jot.[Material2Id] --2Id + , mat2.MaterialCode AS Material2Code --2 + , jot.[Dia] --⾶ + , jot.DNDia --DNֱ + , jot.[Size] -- + , jot.[Thickness] --ں + , jot.[Specification] -- + , jot.[WeldTypeId] --Id + , WeldType.WeldTypeCode -- + , jot.[DetectionTypeId] --Id + , ndt.DetectionTypeCode -- + , jot.[Components1Id] --1Id + , com1.ComponentsCode AS ComponentsCode1 --1 + , jot.[Components2Id] --2Id + , com2.ComponentsCode AS ComponentsCode2 --2 + , jot.DesignIsHotProess --Ƿȴ + , CASE jot.DesignIsHotProess WHEN 1 THEN '' ELSE '' END AS DesignIsHotProessStr --Ƿȴ + , jot.[WeldingMethodId] --ӷId + , WeldingMethod.WeldingMethodCode --ӷ + , jot.WPQId --WPSId + , wps.WPQCode --WPS + , jot.MatchableWPQ --ƥWPQ + , jot.[GrooveTypeId] --¿Id + , GrooveType.GrooveTypeCode --¿ + , jot.[WeldingRod] --Id + , rod.ConsumablesCode AS WeldingRodCode -- + , jot.[WeldingWire] --˿Id + , wire.ConsumablesCode AS WeldingWireCode --˿ + , jot.PreTemperature --Ԥ¶ + , jot.[JointAttribute] -- + , jot.TwoJointType --κ + , pipe.PipeArea --Ԥ/ֳװ + , daily.WeldingDate as WeldingDateD + , CONVERT(VARCHAR(100), daily.WeldingDate, 23) AS WeldingDate -- + , BackingWelder.WelderCode AS BackingWelderCode --׺ + , CoverWelder.WelderCode AS CoverWelderCode --溸 + , CoverWelderTeamGroup.TeamGroupName as CoverWelderTeamGroupName ----溸 + , BackingWelderTeamGroup.TeamGroupName as BackingWelderTeamGroupName --׺ + , (CASE (SELECT COUNT(*) + FROM [dbo].[HJGL_HotProess_TrustItem] hpti + WHERE hpti.WeldJointId = jot.WeldJointId) + WHEN 0 THEN '' + ELSE (SELECT TOP 1 ISNULL(ReportNo, '') + FROM [dbo].[HJGL_HotProess_Trust] hpt + LEFT JOIN [dbo].[HJGL_HotProess_TrustItem] hpti + ON hpti.HotProessTrustId = hpt.HotProessTrustId + WHERE hpti.WeldJointId = jot.WeldJointId) END) AS HotProessReportNo --ȴ + , (CASE (SELECT TOP 1 IsCompleted + FROM [dbo].[HJGL_HotProess_TrustItem] hpti + WHERE hpti.WeldJointId = jot.WeldJointId) + WHEN 1 THEN '' + WHEN 0 THEN 'δ' + ELSE 'δȴ' END) AS HotProessResult --ȴ + , (CASE (SELECT COUNT(*) + FROM [dbo].HJGL_Hard_TrustItem hti + WHERE hti.WeldJointId = jot.WeldJointId) + WHEN 0 THEN '' + ELSE (SELECT TOP 1 ISNULL(InspectionNum, '') + FROM [dbo].HJGL_Hard_Trust ht + LEFT JOIN [dbo].HJGL_Hard_TrustItem hti ON hti.HardTrustID = ht.HardTrustID + WHERE hti.WeldJointId = jot.WeldJointId) END) AS HardReportNo --Ӳȱ + , (CASE (SELECT TOP 1 IsPass + FROM [dbo].HJGL_Hard_TrustItem hti + WHERE hti.WeldJointId = jot.WeldJointId) + WHEN 1 THEN 'ϸ' + WHEN 0 THEN 'ϸ' + ELSE '' END) AS HardResult --Ӳȼ + , (CASE (SELECT COUNT(*) + FROM [dbo].HJGL_Batch_BatchTrustItem bti + WHERE bti.WeldJointId = jot.WeldJointId) + WHEN 0 THEN '' + ELSE (SELECT TOP 1 TrustBatchCode + FROM [dbo].HJGL_Batch_BatchTrust bt + LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchId = bt.TrustBatchId + WHERE bti.WeldJointId = jot.WeldJointId) END) AS TrustBatchCode --ίе + , (CASE (SELECT COUNT(*) + FROM [dbo].HJGL_Batch_NDEItem ndei + LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId = ndei.TrustBatchItemId + WHERE bti.WeldJointId = jot.WeldJointId) + WHEN 0 THEN '' + ELSE (SELECT TOP 1 ISNULL(NDECode, '') + FROM [dbo].HJGL_Batch_NDE nde + LEFT JOIN [dbo].HJGL_Batch_NDEItem ndei ON ndei.NDEID = nde.NDEID + LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti + ON bti.TrustBatchItemId = ndei.TrustBatchItemId + WHERE bti.WeldJointId = jot.WeldJointId) END) AS NDECode --ⵥ + , (CASE (SELECT TOP 1 CheckResult + FROM [dbo].HJGL_Batch_NDEItem ndei + LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId = ndei.TrustBatchItemId + WHERE bti.WeldJointId = jot.WeldJointId) + WHEN '1' THEN 'ϸ' + WHEN '2' THEN 'ϸ' + ELSE '' END) AS CheckResult -- + , jot.PipelineId + , jot.[JointArea] + , jot.[WeldingLocationId] + , jot.[HeartNo1] + , jot.[HeartNo2] + , jot.[IsHotProess] + , jot.[WeldingDailyId] + , jot.[BackingWelderId] + , jot.[CoverWelderId] + , jot.WeldingMode + , jot.Remark + , jot.IsTwoJoint + , jot.SubmitMan + , jot.AuditMan + , jot.AuditMan2 + , jot.AuditDate + , jot.AuditDate2 + , WeldingLocation.WeldingLocationCode + , CASE WHEN jot.WeldingDailyId IS NULL THEN '' ELSE '' END AS IsWelding + , CASE WHEN jot.WeldingDailyId IS NULL THEN 'δ' ELSE '' END AS IsWeldOK + , CASE WHEN jot.IsHotProess = 1 THEN '' ELSE '' END AS IsHotProessStr + , BackingWelder.PersonName AS BackingWelderName + , CoverWelder.PersonName AS CoverWelderName + , (CASE + WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL + THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode + ELSE (ISNULL(CoverWelder.WelderCode, '') + ISNULL(BackingWelder.WelderCode, '')) END) AS WelderCode + , -- + (CASE + WHEN mat1.MaterialCode IS NOT NULL AND mat2.MaterialCode IS NOT NULL + THEN mat1.MaterialCode + '/' + mat2.MaterialCode + ELSE (ISNULL(mat1.MaterialCode, '') + ISNULL(mat2.MaterialCode, '')) END) AS MaterialCode + , -- + + daily.WeldingDailyCode + , pointItem.PointBatchId + , point.PointBatchCode + , (CASE + WHEN pointItem.PointState = '1' THEN 'ѵ' + WHEN pointItem.PointState = '2' THEN '͸' + ELSE '' END) AS IsPoint + FROM [dbo].[HJGL_WeldJoint] jot + LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId + LEFT JOIN dbo.WBS_UnitWork uw ON uw.UnitWorkId = pipe.UnitWorkId + LEFT JOIN dbo.HJGL_WeldingDaily AS daily ON daily.WeldingDailyId = jot.WeldingDailyId + LEFT JOIN dbo.Base_Unit unit ON unit.UnitId = daily.UnitId + LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId = jot.WeldTypeId + LEFT JOIN dbo.Base_DetectionRate dr ON dr.DetectionRateId = pipe.DetectionRateId + LEFT JOIN Base_TestMedium tm ON tm.TestMediumId = pipe.TestMedium + LEFT JOIN Base_TestMedium tm2 ON tm2.TestMediumId = pipe.LeakMedium + LEFT JOIN Base_PurgeMethod pm ON pm.PurgeMethodId = pipe.PCMedium + LEFT JOIN Base_PressurePipingClass ppc ON ppc.PressurePipingClassId = pipe.PressurePipingClassId + LEFT JOIN Base_Material AS mat ON mat.MaterialId = pipe.MaterialId + LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id + LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id + LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId = jot.WeldingMethodId + LEFT JOIN Base_WeldingLocation AS WeldingLocation + ON WeldingLocation.WeldingLocationId = jot.WeldingLocationId + LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId = jot.WeldingWire + LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId = jot.WeldingRod + LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId = jot.GrooveTypeId + LEFT JOIN Base_Components AS com1 ON com1.ComponentsId = jot.Components1Id + LEFT JOIN Base_Components AS com2 ON com2.ComponentsId = jot.Components2Id + LEFT JOIN SitePerson_Person AS BackingWelder + ON BackingWelder.PersonId = jot.BackingWelderId and BackingWelder.ProjectId = jot.ProjectId + LEFT JOIN SitePerson_Person AS CoverWelder + ON CoverWelder.PersonId = jot.CoverWelderId and CoverWelder.ProjectId = jot.ProjectId + LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId = pipe.PipingClassId + LEFT JOIN dbo.Base_Medium medium ON medium.MediumId = pipe.MediumId + LEFT JOIN dbo.Base_DetectionType ndt ON ndt.DetectionTypeId = jot.DetectionTypeId + LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = jot.WPQId + LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.WeldJointId = jot.WeldJointId + LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId + LEFT JOIN dbo.ProjectData_TeamGroup AS CoverWelderTeamGroup + on CoverWelderTeamGroup.TeamGroupId = jot.CoverWelderTeamGroupId and + CoverWelderTeamGroup.ProjectId = jot.ProjectId + LEFT JOIN dbo.ProjectData_TeamGroup AS BackingWelderTeamGroup + on BackingWelderTeamGroup.TeamGroupId = jot.BackingWelderTeamGroupId and + BackingWelderTeamGroup.ProjectId = jot.ProjectId +go + +alter table dbo.HJGL_WeldJoint + add BackingWelderTeamGroupId nvarchar(50) +alter table dbo.HJGL_WeldJoint + add CoverWelderTeamGroupId nvarchar(50) +go +exec sp_addextendedproperty 'MS_Description', N'׺', 'SCHEMA', 'dbo', 'TABLE', 'HJGL_WeldJoint', 'COLUMN', + 'BackingWelderTeamGroupId' +exec sp_addextendedproperty 'MS_Description', N'溸', 'SCHEMA', 'dbo', 'TABLE', 'HJGL_WeldJoint', 'COLUMN', + 'CoverWelderTeamGroupId' +go +select *from HJGL_WeldJoint where BackingWelderTeamGroupId !='' +select *from SitePerson_Person +update HJGL_WeldJoint set BackingWelderTeamGroupId=(select TOP 1 TeamGroupId from SitePerson_Person where PersonId= BackingWelderId) +update HJGL_WeldJoint set CoverWelderTeamGroupId=(select TOP 1 TeamGroupId from SitePerson_Person where PersonId= CoverWelderId) + diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs index 03a74df0..1f6b5ed3 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs @@ -119,7 +119,9 @@ namespace BLL Remark = weldJoint.Remark, IsTwoJoint = weldJoint.IsTwoJoint, SubmitMan = weldJoint.SubmitMan, - TwoJointType = weldJoint.TwoJointType + TwoJointType = weldJoint.TwoJointType, + CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId, + BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId }; if (!string.IsNullOrEmpty(weldJoint.WeldJointId)) { @@ -188,7 +190,8 @@ namespace BLL newWeldJoint.AttachUrl = weldJoint.AttachUrl; newWeldJoint.SubmitMan = weldJoint.SubmitMan; newWeldJoint.TwoJointType = weldJoint.TwoJointType; - + newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId; + newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx index 3ddbb677..332cabde 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx @@ -184,13 +184,21 @@ Width="100px"> - + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 1e4388ec..9e0a48bd 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -511,7 +511,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery 焊口属性 = x.JointAttribute, 焊接日期 = x.WeldingDate, 打底焊工号 = x.BackingWelderCode, - 盖面焊工号 = x.WelderCode, + 打底焊工班组=x.BackingWelderTeamGroupName, + 盖面焊工号 = x.CoverWelderCode, + 盖面焊工班组 = x.CoverWelderTeamGroupName, 热处理报告编号 = x.HotProessReportNo, 热处理检测结果 = x.HotProessResult, 硬度报告编号 = x.HardReportNo, diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx index c265e4a3..24b7ea0d 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx @@ -113,9 +113,17 @@ DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="90px"> + + + DataField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center" + TextAlign="Center" Width="90px"> + +