From ea22fad0372043302f2a3f4b52c1d7bd75acd209 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Sat, 2 Dec 2023 18:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-12-02.sql | 183 ++++++++++++++++++ .../WeldingManage/SelectTaskWeldJoint.aspx.cs | 34 ++-- SGGL/Model/Model.cs | 36 ++++ 3 files changed, 236 insertions(+), 17 deletions(-) diff --git a/DataBase/版本日志/SGGLDB_V2023-12-02.sql b/DataBase/版本日志/SGGLDB_V2023-12-02.sql index 475912be..02c934f5 100644 --- a/DataBase/版本日志/SGGLDB_V2023-12-02.sql +++ b/DataBase/版本日志/SGGLDB_V2023-12-02.sql @@ -23,8 +23,10 @@ method.WeldingMethodCode, rod.ConsumablesCode AS WeldingRodCode, wire.ConsumablesCode AS WeldingWireCode, mat1.MaterialCode AS Material1Code , +weldTask.WeldTaskId, mat2.MaterialCode AS Material2Code FROM dbo.HJGL_WeldJoint jot +LEFT JOIN dbo.HJGL_WeldTask weldTask ON weldTask.WeldJointId = jot.WeldJointId LEFT JOIN dbo.HJGL_PreWeldingDaily pre ON pre.WeldJointId = jot.WeldJointId LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.WeldTypeId LEFT JOIN Base_WeldingMethod AS method ON method.WeldingMethodId=jot.WeldingMethodId @@ -36,6 +38,187 @@ WHERE pre.PreWeldingDailyId IS NULL and jot.WeldJointId not in (select WeldJointId from HJGL_WeldJoint where IsTwoJoint = 1 and (AuditDate is null or AuditDate='')) + GO + + + +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 --溸 + ,(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 + + + + + + + +GO + + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs index cc5467cf..cf44bb6c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs @@ -318,25 +318,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage var toDoMatterList = (from x in Funs.DB.View_HJGL_NoWeldJointFind where x.PipelineId == pipelineId && x.WeldingDailyId == null && x.JointAttribute == drpJointAttribute.SelectedValue - && (string.IsNullOrEmpty(drpWeldTypeCode.SelectedValue) || x.WeldTypeCode.Contains(drpWeldTypeCode.SelectedValue)) + && (string.IsNullOrEmpty(drpWeldTypeCode.SelectedValue) || x.WeldTypeCode.Contains(drpWeldTypeCode.SelectedValue)) && x.WeldTaskId == null select x).ToList(); //去除任务表已存在的焊口 - if (!string.IsNullOrEmpty(TaskDate)) - { - var task = from x in Funs.DB.HJGL_WeldTask where x.UnitWorkId == UnitWorkId && x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd") select x; - if (task.Count() > 0) - { - foreach (var item in task) - { - Model.View_HJGL_NoWeldJointFind jot = toDoMatterList.FirstOrDefault(e => e.WeldJointId == item.WeldJointId); - if (jot != null) - { - toDoMatterList.Remove(jot); - } - } - } - } + //if (!string.IsNullOrEmpty(TaskDate)) + //{ + // var task = from x in Funs.DB.HJGL_WeldTask where x.UnitWorkId == UnitWorkId && x.TaskDate.Value.Date.ToString() == Convert.ToDateTime(txtTaskDate.Text.Trim()).ToString("yyyy-MM-dd") select x; + // if (task.Count() > 0) + // { + // foreach (var item in task) + // { + // Model.View_HJGL_NoWeldJointFind jot = toDoMatterList.FirstOrDefault(e => e.WeldJointId == item.WeldJointId); + // if (jot != null) + // { + // toDoMatterList.Remove(jot); + // } + // } + // } + //} DataTable tb = this.LINQToDataTable(toDoMatterList); // 2.获取当前分页数据 @@ -508,7 +508,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage var oldWeldTask = BLL.WeldTaskService.GetWeldTaskByWeldJointId(NewTask.WeldJointId); if (oldWeldTask != null) { - ShowNotify("所选焊口已存在任务单，无法保存！", MessageBoxIcon.Success); + ShowNotify("所选焊口已存在任务单，无法保存！", MessageBoxIcon.Warning); return; } Model.HJGL_WeldJoint weldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(NewTask.WeldJointId); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index f6e5e910..2ab6a8eb 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -271834,6 +271834,8 @@ namespace Model private string _Material1Code; + private string _WeldTaskId; + private string _Material2Code; public View_HJGL_NoWeldJointFind() @@ -272112,6 +272114,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldTaskId", DbType="NVarChar(50)")] + public string WeldTaskId + { + get + { + return this._WeldTaskId; + } + set + { + if ((this._WeldTaskId != value)) + { + this._WeldTaskId = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material2Code", DbType="NVarChar(50)")] public string Material2Code { @@ -273675,6 +273693,8 @@ namespace Model private string _WPQCode; + private string _MatchableWPQ; + private string _GrooveTypeId; private string _GrooveTypeCode; @@ -274739,6 +274759,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MatchableWPQ", DbType="NVarChar(300)")] + public string MatchableWPQ + { + get + { + return this._MatchableWPQ; + } + set + { + if ((this._MatchableWPQ != value)) + { + this._MatchableWPQ = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrooveTypeId", DbType="NVarChar(50)")] public string GrooveTypeId {