From 39a7bc2f6c2b261de511108964c3f3ce44716f25 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Mon, 2 Mar 2026 20:03:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=84=8A=E5=8F=A3=E5=AF=BC=E5=85=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=84=8A=E7=82=B9=E5=9D=90=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2026-03-02-001.sql | 222 ++++++++++ .../HJGL/WeldingManage/WeldJointService.cs | 4 +- .../DataIn/PDMS输出（设计）数据模板.xlsx | Bin 10021 -> 9768 bytes .../WeldingManage/PipelineListPDMSIn.aspx.cs | 12 +- .../HJGL/WeldingManage/WeldJointList.aspx | 4 + .../HJGL/WeldingManage/WeldJointList.aspx.cs | 2 +- SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs | 4 +- SGGL/Model/Model.cs | 410 ++++++++++-------- 8 files changed, 469 insertions(+), 189 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2026-03-02-001.sql diff --git a/DataBase/版本日志/SGGLDB_V2026-03-02-001.sql b/DataBase/版本日志/SGGLDB_V2026-03-02-001.sql new file mode 100644 index 00000000..695cc2d9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2026-03-02-001.sql @@ -0,0 +1,222 @@ +alter table dbo.HJGL_WeldJoint + add WeldJointPoint nvarchar(300) +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 --探伤比例（例如5，10，20） + , 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] --组件1号Id + , com1.ComponentsCode AS ComponentsCode1 --组件1号 + , jot.[Components2Id] --组件2号Id + , com2.ComponentsCode AS ComponentsCode2 --组件2号 + , jot.DesignIsHotProess --是否热处理 + , CASE jot.DesignIsHotProess WHEN 1 THEN '是' ELSE '否' END AS DesignIsHotProessStr --是否热处理 + , jot.[WeldingMethodId] --焊接方法Id + , WeldingMethod.WeldingMethodCode --焊接方法 + , jot.WPQId --WPS的Id + , 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 + , jot.WeldJointPoint + , 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 + diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs index 3f21f363..5c3ce0dd 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs @@ -118,7 +118,8 @@ namespace BLL SubmitMan = weldJoint.SubmitMan, TwoJointType = weldJoint.TwoJointType, CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId, - BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId + BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId, + WeldJointPoint = weldJoint.WeldJointPoint }; if (!string.IsNullOrEmpty(weldJoint.WeldJointId)) { @@ -189,6 +190,7 @@ namespace BLL newWeldJoint.TwoJointType = weldJoint.TwoJointType; newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId; newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId; + newWeldJoint.WeldJointPoint = weldJoint.WeldJointPoint; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出（设计）数据模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出（设计）数据模板.xlsx index d4711140f99ce9ae31c056c0a93eff9f0d313a79..67cfb9b7630f3642b7b030c181394aaca38a2a53 100644 GIT binary patch literal 9768 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 literal 10021 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 u2U(VK`06HMvC{Ojvum1yB=iv+h diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs index 7e52491b..0b72df78 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs @@ -730,6 +730,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } + // 读取焊点坐标（AE列） + string col29 = Convert.ToString(pds[i].AE); + if (!string.IsNullOrEmpty(col29)) + { + pipeline.WeldJointPoint = col29; + } + if (!string.IsNullOrEmpty(pipeline.PipelineCode) && !string.IsNullOrEmpty(pipeline.WeldJointCode)) { pipeline.ProjectId = this.CurrUser.LoginProjectId; @@ -1039,6 +1046,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage JointAttribute = x.JointAttribute, ProjectId = this.CurrUser.LoginProjectId, IsHotProess = x.IsHotProess, + WeldJointPoint = x.WeldJointPoint, }).DistinctBy(temp => new { temp.WeldJointCode, @@ -1054,7 +1062,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage temp.DetectionTypeId, temp.JointAttribute, temp.ProjectId, - temp.IsHotProess + temp.IsHotProess, + temp.WeldJointPoint }).ToList(); var pipelineCodes = weldJoints.Select(x => x.PipelineCode).Distinct().ToList(); @@ -1076,6 +1085,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage weldJoint.JointAttribute = weldJoints[i].JointAttribute; weldJoint.ProjectId = weldJoints[i].ProjectId; weldJoint.IsHotProess = weldJoints[i].IsHotProess; + weldJoint.WeldJointPoint = weldJoints[i].WeldJointPoint; var isExistJot = allWeldJoints.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == weldJoint.WeldJointCode); if (isExistJot != null) // 更新焊口 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx index 7c25b792..a497b446 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx @@ -294,6 +294,10 @@ FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="90px"> + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 310f02df..7940da7f 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -328,7 +328,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage IsWelding,IsHotProessStr,Material1Code,Material2Code,WeldTypeCode, Specification,HeartNo1,HeartNo2,Size,Dia,DNDia,Thickness,GrooveTypeCode, WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode, - BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark + BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,WeldJointPoint FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL "; List listStr = new List { }; diff --git a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs index f3f65ca8..237826fc 100644 --- a/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs @@ -629,10 +629,10 @@ namespace FineUIPro.Web.Person /// protected void drpRole_SelectedIndexChanged(object sender, EventArgs e) { - if (this.drpRole.SelectedItemArray.Count() > 4) + if (this.drpRole.SelectedItemArray.Count() > 5) { this.drpRole.SelectedValueArray = null; - Alert.ShowInParent("最多可选择4个角色！", MessageBoxIcon.Warning); + Alert.ShowInParent("最多可选择5个角色！", MessageBoxIcon.Warning); } else { diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index a5658a95..0f229b3c 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -12365,7 +12365,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")] public string ApproveIdea { get @@ -22544,6 +22544,8 @@ namespace Model private string _UnitId; + private string _ProjectId; + private string _MaterialId; private string _ColorName; @@ -22554,8 +22556,6 @@ namespace Model private string _Remark; - private string _ProjectId; - #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -22564,6 +22564,8 @@ namespace Model partial void OnMaterialColorIdChanged(); partial void OnUnitIdChanging(string value); partial void OnUnitIdChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); partial void OnMaterialIdChanging(string value); partial void OnMaterialIdChanged(); partial void OnColorNameChanging(string value); @@ -22574,8 +22576,6 @@ namespace Model partial void OnRGBChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); - partial void OnProjectIdChanging(string value); - partial void OnProjectIdChanged(); #endregion public Base_MaterialColor() @@ -22623,6 +22623,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialId", DbType="NVarChar(50)")] public string MaterialId { @@ -22723,26 +22743,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] - public string ProjectId - { - get - { - return this._ProjectId; - } - set - { - if ((this._ProjectId != value)) - { - this.OnProjectIdChanging(value); - this.SendPropertyChanging(); - this._ProjectId = value; - this.SendPropertyChanged("ProjectId"); - this.OnProjectIdChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -100096,10 +100096,10 @@ namespace Model private string _TrainNumber; - private System.Nullable _TypeInt; - private string _TrainNumberId; + private System.Nullable _TypeInt; + private string _CompileMan; private System.Nullable _CompileDate; @@ -100134,10 +100134,10 @@ namespace Model partial void OnReceiveDateChanged(); partial void OnTrainNumberChanging(string value); partial void OnTrainNumberChanged(); - partial void OnTypeIntChanging(System.Nullable value); - partial void OnTypeIntChanged(); partial void OnTrainNumberIdChanging(string value); partial void OnTrainNumberIdChanged(); + partial void OnTypeIntChanging(System.Nullable value); + partial void OnTypeIntChanged(); partial void OnCompileManChanging(string value); partial void OnCompileManChanged(); partial void OnCompileDateChanging(System.Nullable value); @@ -100391,26 +100391,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")] - public System.Nullable TypeInt - { - get - { - return this._TypeInt; - } - set - { - if ((this._TypeInt != value)) - { - this.OnTypeIntChanging(value); - this.SendPropertyChanging(); - this._TypeInt = value; - this.SendPropertyChanged("TypeInt"); - this.OnTypeIntChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")] public string TrainNumberId { @@ -100431,6 +100411,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")] + public System.Nullable TypeInt + { + get + { + return this._TypeInt; + } + set + { + if ((this._TypeInt != value)) + { + this.OnTypeIntChanging(value); + this.SendPropertyChanging(); + this._TypeInt = value; + this.SendPropertyChanged("TypeInt"); + this.OnTypeIntChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] public string CompileMan { @@ -107488,6 +107488,8 @@ namespace Model private string _CoverWelderTeamGroupId; + private string _WeldJointPoint; + private EntitySet _HJGL_Batch_BatchTrustItem; private EntitySet _HJGL_Batch_PointBatchItem; @@ -107634,6 +107636,8 @@ namespace Model partial void OnBackingWelderTeamGroupIdChanged(); partial void OnCoverWelderTeamGroupIdChanging(string value); partial void OnCoverWelderTeamGroupIdChanged(); + partial void OnWeldJointPointChanging(string value); + partial void OnWeldJointPointChanged(); #endregion public HJGL_WeldJoint() @@ -108703,6 +108707,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointPoint", DbType="NVarChar(300)")] + public string WeldJointPoint + { + get + { + return this._WeldJointPoint; + } + set + { + if ((this._WeldJointPoint != value)) + { + this.OnWeldJointPointChanging(value); + this.SendPropertyChanging(); + this._WeldJointPoint = value; + this.SendPropertyChanged("WeldJointPoint"); + this.OnWeldJointPointChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_BatchTrustItem_HJGL_WeldJoint", Storage="_HJGL_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")] public EntitySet HJGL_Batch_BatchTrustItem { @@ -111678,7 +111702,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")] public string Rectification { get @@ -111804,7 +111828,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(50)")] public string Measures { get @@ -164917,7 +164941,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")] public string AttentPerson { get @@ -195924,7 +195948,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")] public string ProjectDescription { get @@ -196044,7 +196068,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")] public string CalculationRule { get @@ -196104,7 +196128,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")] public string ConstructionSubcontractor { get @@ -196488,7 +196512,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")] public System.Nullable WorkPackageEstimate { get @@ -196793,16 +196817,6 @@ namespace Model private string _ProjectId; - private string _ContractId; - - private string _OrderCode; - - private System.Nullable _OrderInDate; - - private System.Nullable _OrderOutDate; - - private string _MaterialRequisitionUnit; - private System.Nullable _State; private string _InvoiceCode; @@ -196831,6 +196845,16 @@ namespace Model private string _CreateUser; + private string _ContractId; + + private System.Nullable _OrderInDate; + + private string _OrderCode; + + private System.Nullable _OrderOutDate; + + private string _MaterialRequisitionUnit; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -196839,16 +196863,6 @@ namespace Model partial void OnInvoiceIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); - partial void OnContractIdChanging(string value); - partial void OnContractIdChanged(); - partial void OnOrderCodeChanging(string value); - partial void OnOrderCodeChanged(); - partial void OnOrderInDateChanging(System.Nullable value); - partial void OnOrderInDateChanged(); - partial void OnOrderOutDateChanging(System.Nullable value); - partial void OnOrderOutDateChanged(); - partial void OnMaterialRequisitionUnitChanging(string value); - partial void OnMaterialRequisitionUnitChanged(); partial void OnStateChanging(System.Nullable value); partial void OnStateChanged(); partial void OnInvoiceCodeChanging(string value); @@ -196877,6 +196891,16 @@ namespace Model partial void OnCreateDateChanged(); partial void OnCreateUserChanging(string value); partial void OnCreateUserChanged(); + partial void OnContractIdChanging(string value); + partial void OnContractIdChanged(); + partial void OnOrderInDateChanging(System.Nullable value); + partial void OnOrderInDateChanged(); + partial void OnOrderCodeChanging(string value); + partial void OnOrderCodeChanged(); + partial void OnOrderOutDateChanging(System.Nullable value); + partial void OnOrderOutDateChanged(); + partial void OnMaterialRequisitionUnitChanging(string value); + partial void OnMaterialRequisitionUnitChanged(); #endregion public PHTGL_Invoice() @@ -196924,106 +196948,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] - public string ContractId - { - get - { - return this._ContractId; - } - set - { - if ((this._ContractId != value)) - { - this.OnContractIdChanging(value); - this.SendPropertyChanging(); - this._ContractId = value; - this.SendPropertyChanged("ContractId"); - this.OnContractIdChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] - public string OrderCode - { - get - { - return this._OrderCode; - } - set - { - if ((this._OrderCode != value)) - { - this.OnOrderCodeChanging(value); - this.SendPropertyChanging(); - this._OrderCode = value; - this.SendPropertyChanged("OrderCode"); - this.OnOrderCodeChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] - public System.Nullable OrderInDate - { - get - { - return this._OrderInDate; - } - set - { - if ((this._OrderInDate != value)) - { - this.OnOrderInDateChanging(value); - this.SendPropertyChanging(); - this._OrderInDate = value; - this.SendPropertyChanged("OrderInDate"); - this.OnOrderInDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] - public System.Nullable OrderOutDate - { - get - { - return this._OrderOutDate; - } - set - { - if ((this._OrderOutDate != value)) - { - this.OnOrderOutDateChanging(value); - this.SendPropertyChanging(); - this._OrderOutDate = value; - this.SendPropertyChanged("OrderOutDate"); - this.OnOrderOutDateChanged(); - } - } - } - - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] - public string MaterialRequisitionUnit - { - get - { - return this._MaterialRequisitionUnit; - } - set - { - if ((this._MaterialRequisitionUnit != value)) - { - this.OnMaterialRequisitionUnitChanging(value); - this.SendPropertyChanging(); - this._MaterialRequisitionUnit = value; - this.SendPropertyChanged("MaterialRequisitionUnit"); - this.OnMaterialRequisitionUnitChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")] public System.Nullable State { @@ -197304,6 +197228,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")] + public string ContractId + { + get + { + return this._ContractId; + } + set + { + if ((this._ContractId != value)) + { + this.OnContractIdChanging(value); + this.SendPropertyChanging(); + this._ContractId = value; + this.SendPropertyChanged("ContractId"); + this.OnContractIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")] + public System.Nullable OrderInDate + { + get + { + return this._OrderInDate; + } + set + { + if ((this._OrderInDate != value)) + { + this.OnOrderInDateChanging(value); + this.SendPropertyChanging(); + this._OrderInDate = value; + this.SendPropertyChanged("OrderInDate"); + this.OnOrderInDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")] + public string OrderCode + { + get + { + return this._OrderCode; + } + set + { + if ((this._OrderCode != value)) + { + this.OnOrderCodeChanging(value); + this.SendPropertyChanging(); + this._OrderCode = value; + this.SendPropertyChanged("OrderCode"); + this.OnOrderCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")] + public System.Nullable OrderOutDate + { + get + { + return this._OrderOutDate; + } + set + { + if ((this._OrderOutDate != value)) + { + this.OnOrderOutDateChanging(value); + this.SendPropertyChanging(); + this._OrderOutDate = value; + this.SendPropertyChanged("OrderOutDate"); + this.OnOrderOutDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")] + public string MaterialRequisitionUnit + { + get + { + return this._MaterialRequisitionUnit; + } + set + { + if ((this._MaterialRequisitionUnit != value)) + { + this.OnMaterialRequisitionUnitChanging(value); + this.SendPropertyChanging(); + this._MaterialRequisitionUnit = value; + this.SendPropertyChanged("MaterialRequisitionUnit"); + this.OnMaterialRequisitionUnitChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -198682,7 +198706,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(1000)")] public string ReviewResults { get @@ -296920,6 +296944,8 @@ namespace Model private System.Nullable _AuditDate2; + private string _WeldJointPoint; + private string _WeldingLocationCode; private string _IsWelding; @@ -298564,6 +298590,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointPoint", DbType="NVarChar(300)")] + public string WeldJointPoint + { + get + { + return this._WeldJointPoint; + } + set + { + if ((this._WeldJointPoint != value)) + { + this._WeldJointPoint = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingLocationCode", DbType="NVarChar(50)")] public string WeldingLocationCode { @@ -320714,7 +320756,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] public string Name { get @@ -321291,7 +321333,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -321482,7 +321524,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -326821,7 +326863,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -328293,7 +328335,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")] public string PackageContent { get @@ -338194,7 +338236,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")] public string ContractNo { get @@ -338214,7 +338256,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")] public string UnitWorks { get