Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

DataBase/版本日志/SGGLDB_V2024-06-19.sql

@@ -0,0 +1,232 @@
+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
+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
+         , 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
+
+
+
+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)
+

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();
             }
         }

SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs

@@ -387,7 +387,9 @@ namespace BLL
                                     else WeldJointCode end) as '焊口序号',
                                      WeldJointCode as '焊口号',
                                      BackingWelderCode as '打底焊工',
+                                     BackingWelderTeamGroupName as '打底焊工班组',
                                      CoverWelderCode as '盖面焊工',
+                                        CoverWelderTeamGroupName as '盖面焊工班组',
                                      Material1Code as '材质1' ,
                                      Material2Code as '材质2' , 
                                      Dia as '外径' ,

SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx

@@ -184,13 +184,21 @@
                                             Width="100px">
                                         </f:RenderField>
 
-                                        <f:RenderField HeaderText="打底焊工号" ColumnID="BackingWelder"
+                                        <f:RenderField HeaderText="打底焊工号" ColumnID="BackingWelderCode"
-                                            DataField="BackingWelder" SortField="BackingWelder" FieldType="String" HeaderTextAlign="Center"
+                                            DataField="BackingWelderCode" SortField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center"
                                             Width="100px">
                                         </f:RenderField>
+                                        <f:RenderField HeaderText="打底焊工班组" ColumnID="BackingWelderTeamGroupName"
+                                            DataField="BackingWelderTeamGroupName" FieldType="String" HeaderTextAlign="Center"
+                                            TextAlign="Center" Width="90px">
+                                        </f:RenderField>
                                         <f:RenderField HeaderText="盖面焊工号" ColumnID="WelderCode" DataField="WelderCode"
                                             FieldType="String" HeaderTextAlign="Center" Width="100px">
                                         </f:RenderField>
+                                        <f:RenderField HeaderText="盖面焊工班组" ColumnID="CoverWelderTeamGroupName"
+                                            DataField="CoverWelderTeamGroupName" FieldType="String" HeaderTextAlign="Center"
+                                            TextAlign="Center" Width="90px">
+                                        </f:RenderField>
                                         <f:RenderField HeaderText="热处理报告编号" ColumnID="HotProessReportNo" DataField="HotProessReportNo"
                                             FieldType="String" HeaderTextAlign="Center" Width="120px">
                                         </f:RenderField>

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,

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx

@@ -113,9 +113,17 @@
                                                    DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
                                                    TextAlign="Center" Width="90px">
                                     </f:RenderField>
+                                    <f:RenderField HeaderText="盖面焊工班组" ColumnID="CoverWelderTeamGroupName"
+                                        DataField="CoverWelderTeamGroupName" FieldType="String" HeaderTextAlign="Center"
+                                        TextAlign="Center" Width="90px">
+                                    </f:RenderField>
                                     <f:RenderField HeaderText="打底焊工" ColumnID="BackingWelderCode"
-                                                   DataField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center"
+                                        DataField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center"
-                                                   TextAlign="Center" Width="90px">
+                                        TextAlign="Center" Width="90px">
+                                    </f:RenderField>
+                                    <f:RenderField HeaderText="打底焊工班组" ColumnID="BackingWelderTeamGroupName"
+                                        DataField="BackingWelderTeamGroupName" FieldType="String" HeaderTextAlign="Center"
+                                        TextAlign="Center" Width="90px">
                                     </f:RenderField>
                                     <f:RenderField HeaderText="焊口机动化程度" ColumnID="WeldingMode" DataField="WeldingMode" Hidden="True"
                                                    FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="150px">

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs

@@ -192,7 +192,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode,
                                          BackingWelderCode,CoverWelderCode,Material1Code,Material2Code,
                                          Dia,DNDia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode,
-	                                     WeldingRodCode,Size,JointAttribute
+	                                     WeldingRodCode,Size,JointAttribute,CoverWelderTeamGroupName,BackingWelderTeamGroupName
 
                                   FROM dbo.View_HJGL_WeldJoint
                                    WHERE WeldingDailyId=@WeldingDailyId";

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs

@@ -532,6 +532,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                             {
                                 t.CoverWelderId = coverWelderCode.PersonId;
                                 newWeldJoint.CoverWelderId = coverWelderCode.PersonId;
+                                newWeldJoint.CoverWelderTeamGroupId = coverWelderCode.TeamGroupId;
                             }
 
                             var backingWelderCode = (from x in Funs.DB.SitePerson_Person
@@ -542,6 +543,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                             {
                                 t.BackingWelderId = backingWelderCode.PersonId;
                                 newWeldJoint.BackingWelderId = backingWelderCode.PersonId;
+                                newWeldJoint.BackingWelderTeamGroupId = backingWelderCode.TeamGroupId;
                             }
 
                             WeldTaskService.UpdateWeldTask(t);
@@ -868,6 +870,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     newWeldJoint.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
                     newWeldJoint.CoverWelderId = coverWelderId;
                     newWeldJoint.BackingWelderId = backingWelderId;
+                    newWeldJoint.CoverWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId,coverWelderId).TeamGroupId;
+                    newWeldJoint.BackingWelderTeamGroupId = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, backingWelderId).TeamGroupId;
                     //if (item.WeldingLocationId != Const._Null)
                     //{
                     //    newWeldJoint.WeldingLocationId = item.WeldingLocationId;
@@ -1001,6 +1005,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                             updateWeldJoint.WeldingDailyCode = null;
                             updateWeldJoint.CoverWelderId = null;
                             updateWeldJoint.BackingWelderId = null;
+                            updateWeldJoint.CoverWelderTeamGroupId= null;
+                            updateWeldJoint.BackingWelderTeamGroupId = null;
                             BLL.WeldJointService.UpdateWeldJoint(updateWeldJoint);
                         }
                     }

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx

@@ -46,6 +46,8 @@
                                 <f:Button ID="btnTreeFind" ToolTip="查询" Icon="SystemSearch"
                                     EnablePostBack="true" OnClick="btnTreeFind_Click" runat="server">
                                 </f:Button>
+                                <f:Button ID="Button1" Text="自动录入" Icon="Add" runat="server" OnClick="btnAutoInput2_Click">
+                                </f:Button>
                             </Items>
                         </f:Toolbar>
                     </Toolbars>
@@ -53,7 +55,7 @@
                         <f:Tree ID="tvControlItem" ShowHeader="false" Height="560px" Title="单位工程"
                             OnNodeCommand="tvControlItem_NodeCommand" runat="server" ShowBorder="false" EnableCollapse="true"
                             EnableSingleClickExpand="false" AutoLeafIdentification="true"
-                            EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded">
+                            EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded" EnableCheckBox="true" OnlyLeafCheck="true">
                         </f:Tree>
                     </Items>
                 </f:Panel>
@@ -194,9 +196,10 @@
                                 <f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
                                     OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
                                     <f:ListItem Text="10" Value="10" />
-                                    <f:ListItem Text="15" Value="15" />
-                                    <f:ListItem Text="20" Value="20" />
                                     <f:ListItem Text="25" Value="25" />
+                                    <f:ListItem Text="500" Value="500" />
+                                    <f:ListItem Text="1000" Value="1000" />
+                                    <f:ListItem Text="2000" Value="2000" />
                                     <f:ListItem Text="所有行" Value="10000" />
                                 </f:DropDownList>
                             </PageItems>

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs

@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
+using System.Text;
 
 namespace FineUIPro.Web.HJGL.WeldingManage
 {
@@ -121,6 +122,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
                     tn1.EnableExpandEvent = true;
                     tn1.EnableClickEvent = true;
+                    tn1.EnableCheckBox = false;
                     rootNode1.Nodes.Add(tn1);
                     if (a > 0)
                     {
@@ -182,6 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize);
                     tn2.EnableExpandEvent = true;
                     tn2.EnableClickEvent = true;
+                    tn2.EnableCheckBox = false;
                     rootNode2.Nodes.Add(tn2);
                     if (a > 0)
                     {
@@ -463,6 +466,79 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 ShowNotify("该管线焊口已完成自动录入！", MessageBoxIcon.Success);
             }
         }
+        protected void btnAutoInput2_Click(object sender, EventArgs e)
+        {
+            if (this.drpUnit.SelectedValue == BLL.Const._Null)
+            {
+                ShowNotify("请选择工艺规程编制单位！", MessageBoxIcon.Warning);
+                return;
+            }
+            TreeNode[] nodes = tvControlItem.GetCheckedNodes();
+            if (nodes.Length > 0)
+            {
+                foreach (TreeNode node in nodes)
+                {
+                    if (!string.IsNullOrEmpty(node.NodeID))
+                    {
+                        var jotList = from x in Funs.DB.HJGL_WeldJoint where x.PipelineId == node.NodeID && x.JointAttribute == drpJointAttribute.SelectedValue select x;
+                        if (jotList.Count() > 0)
+                        {
+                            foreach (var jot in jotList)
+                            {
+                                List<Model.View_HJGL_WPQ> wpqList = BLL.WPQListServiceService.GetMatchWPQ(jot, this.CurrUser.LoginProjectId, drpUnit.SelectedValue);
+                                Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint();
+                                if (wpqList != null)
+                                {
+                                    Model.WPQ_WPQList wps = new Model.WPQ_WPQList();
+                                    var a = wpqList.FirstOrDefault(x => x.WeldingMethodId == "feb1234c-a538-476f-99ac-7b3ab15997c1");  //优先匹配GTAW+SMAW的焊评
+                                    if (a == null)
+                                    {
+                                        wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId);
+                                    }
+                                    else
+                                    {
+                                        wps = BLL.WPQListServiceService.GetWPQById(a.WPQId);
+                                    }
+
+                                    newJot.WPQId = wps.WPQId;
+                                    newJot.WeldJointId = jot.WeldJointId;
+                                    newJot.WeldingRod = wps.WeldingRod;
+                                    newJot.WeldingWire = wps.WeldingWire;
+                                    newJot.WeldingMethodId = wps.WeldingMethodId;
+                                    newJot.GrooveTypeId = wps.GrooveType;
+                                    newJot.PreTemperature = wps.PreTemperature;
+                                    newJot.IsHotProess = wps.IsHotProess;
+                                    newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode));
+
+
+                                }
+                                else
+                                {
+                                    newJot.WPQId = null;
+                                    newJot.WeldJointId = jot.WeldJointId;
+                                    newJot.WeldingRod = null;
+                                    newJot.WeldingWire = null;
+                                    newJot.WeldingMethodId = null;
+                                    newJot.GrooveTypeId = null;
+                                    newJot.PreTemperature = null;
+                                    newJot.IsHotProess = null;
+                                    newJot.MatchableWPQ = null;
+                                }
+                                BLL.WeldJointService.UpdateConWeldJoint(newJot);
+                            }
+                        }
+
+                    }
+
+                }
+               // BindGrid();
+                ShowNotify("该管线焊口已完成自动录入！", MessageBoxIcon.Success);
+            }
+            else
+            {
+                ShowNotify("请勾选需要自动录入的管线！", MessageBoxIcon.Warning);
+            }
+        }
 
         protected void btnEdit_Click(object sender, EventArgs e)
         {

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.WeldingManage {
+namespace FineUIPro.Web.HJGL.WeldingManage
+{
 
 
-    public partial class WeldingConDate {
+    public partial class WeldingConDate
+    {
 
         /// <summary>
         /// form1 控件。
@@ -102,6 +104,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
         /// </remarks>
         protected global::FineUIPro.Button btnTreeFind;
 
+        /// <summary>
+        /// Button1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button Button1;
+
         /// <summary>
         /// tvControlItem 控件。
         /// </summary>

SGGL/Model/Model.cs

@@ -11845,7 +11845,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
@@ -97808,6 +97808,10 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _AuditDate2;
 		
+		private string _BackingWelderTeamGroupId;
+		
+		private string _CoverWelderTeamGroupId;
+		
 		private EntitySet<HJGL_Batch_BatchTrustItem> _HJGL_Batch_BatchTrustItem;
 		
 		private EntitySet<HJGL_Batch_PointBatchItem> _HJGL_Batch_PointBatchItem;
@@ -97950,6 +97954,10 @@ namespace Model
     partial void OnAuditMan2Changed();
     partial void OnAuditDate2Changing(System.Nullable<System.DateTime> value);
     partial void OnAuditDate2Changed();
+    partial void OnBackingWelderTeamGroupIdChanging(string value);
+    partial void OnBackingWelderTeamGroupIdChanged();
+    partial void OnCoverWelderTeamGroupIdChanging(string value);
+    partial void OnCoverWelderTeamGroupIdChanged();
     #endregion
 		
 		public HJGL_WeldJoint()
@@ -98979,6 +98987,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BackingWelderTeamGroupId", DbType="NVarChar(50)")]
+		public string BackingWelderTeamGroupId
+		{
+			get
+			{
+				return this._BackingWelderTeamGroupId;
+			}
+			set
+			{
+				if ((this._BackingWelderTeamGroupId != value))
+				{
+					this.OnBackingWelderTeamGroupIdChanging(value);
+					this.SendPropertyChanging();
+					this._BackingWelderTeamGroupId = value;
+					this.SendPropertyChanged("BackingWelderTeamGroupId");
+					this.OnBackingWelderTeamGroupIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CoverWelderTeamGroupId", DbType="NVarChar(50)")]
+		public string CoverWelderTeamGroupId
+		{
+			get
+			{
+				return this._CoverWelderTeamGroupId;
+			}
+			set
+			{
+				if ((this._CoverWelderTeamGroupId != value))
+				{
+					this.OnCoverWelderTeamGroupIdChanging(value);
+					this.SendPropertyChanging();
+					this._CoverWelderTeamGroupId = value;
+					this.SendPropertyChanged("CoverWelderTeamGroupId");
+					this.OnCoverWelderTeamGroupIdChanged();
+				}
+			}
+		}
+		
 		[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> HJGL_Batch_BatchTrustItem
 		{
@@ -152113,7 +152161,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
@@ -183072,7 +183120,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
@@ -183192,7 +183240,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
@@ -183252,7 +183300,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
@@ -183636,7 +183684,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<decimal> WorkPackageEstimate
 		{
 			get
@@ -183941,16 +183989,6 @@ namespace Model
 		
 		private string _ProjectId;
 		
-		private string _ContractId;
-		
-		private string _OrderCode;
-		
-		private System.Nullable<System.DateTime> _OrderInDate;
-		
-		private System.Nullable<System.DateTime> _OrderOutDate;
-		
-		private string _MaterialRequisitionUnit;
-		
 		private System.Nullable<int> _State;
 		
 		private string _InvoiceCode;
@@ -183979,6 +184017,16 @@ namespace Model
 		
 		private string _CreateUser;
 		
+		private string _ContractId;
+		
+		private System.Nullable<System.DateTime> _OrderInDate;
+		
+		private string _OrderCode;
+		
+		private System.Nullable<System.DateTime> _OrderOutDate;
+		
+		private string _MaterialRequisitionUnit;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -183987,16 +184035,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<System.DateTime> value);
-    partial void OnOrderInDateChanged();
-    partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
-    partial void OnOrderOutDateChanged();
-    partial void OnMaterialRequisitionUnitChanging(string value);
-    partial void OnMaterialRequisitionUnitChanged();
     partial void OnStateChanging(System.Nullable<int> value);
     partial void OnStateChanged();
     partial void OnInvoiceCodeChanging(string value);
@@ -184025,6 +184063,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<System.DateTime> value);
+    partial void OnOrderInDateChanged();
+    partial void OnOrderCodeChanging(string value);
+    partial void OnOrderCodeChanged();
+    partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
+    partial void OnOrderOutDateChanged();
+    partial void OnMaterialRequisitionUnitChanging(string value);
+    partial void OnMaterialRequisitionUnitChanged();
     #endregion
 		
 		public PHTGL_Invoice()
@@ -184072,106 +184120,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<System.DateTime> 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<System.DateTime> 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<int> State
 		{
@@ -184452,6 +184400,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<System.DateTime> 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<System.DateTime> 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;
@@ -277057,6 +277105,10 @@ namespace Model
 		
 		private string _CoverWelderCode;
 		
+		private string _CoverWelderTeamGroupName;
+		
+		private string _BackingWelderTeamGroupName;
+		
 		private string _HotProessReportNo;
 		
 		private string _HotProessResult;
@@ -278333,6 +278385,38 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CoverWelderTeamGroupName", DbType="NVarChar(50)")]
+		public string CoverWelderTeamGroupName
+		{
+			get
+			{
+				return this._CoverWelderTeamGroupName;
+			}
+			set
+			{
+				if ((this._CoverWelderTeamGroupName != value))
+				{
+					this._CoverWelderTeamGroupName = value;
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BackingWelderTeamGroupName", DbType="NVarChar(50)")]
+		public string BackingWelderTeamGroupName
+		{
+			get
+			{
+				return this._BackingWelderTeamGroupName;
+			}
+			set
+			{
+				if ((this._BackingWelderTeamGroupName != value))
+				{
+					this._BackingWelderTeamGroupName = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HotProessReportNo", DbType="NVarChar(50)")]
 		public string HotProessReportNo
 		{
@@ -296646,7 +296730,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
@@ -297223,7 +297307,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
@@ -297414,7 +297498,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
@@ -302701,7 +302785,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
@@ -304173,7 +304257,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
@@ -313724,7 +313808,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
@@ -313744,7 +313828,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