diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo
index 92ce933b..80c39ad9 100644
Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ
diff --git a/DataBase/版本日志/SGGLDB_V2024-06-19.sql b/DataBase/版本日志/SGGLDB_V2024-06-19.sql
new file mode 100644
index 00000000..23a7bc1d
--- /dev/null
+++ b/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 --̽˱51020
+ , pipe.DetectionType --̽Id(ܶм|ָ)
+ , STUFF((SELECT ',' + DetectionTypeCode
+ FROM Base_DetectionType
+ WHERE CHARINDEX('|' + LTRIM(DetectionTypeId) + '|', '|' + pipe.DetectionType + '|') > 0
+ FOR XML PATH('')), 1, 1, '') AS DetectionTypeStr --̽ͣܶм,ָ
+ , pipe.DesignTemperature --¶ȡ
+ , pipe.DesignPress --ѹMpa(g)
+ , pipe.TestMedium --ѹId
+ , tm.MediumName AS TestMediumName --ѹ
+ , pipe.TestPressure --ѹѹMpa(g)
+ , pipe.PressurePipingClassId --ѹܵId
+ , ppc.PressurePipingClassCode --ѹܵ
+ , pipe.PipeLenth --߳(m)
+ , pipe.LeakMedium --й¶Id
+ , tm2.MediumName AS LeakMediumName --й¶
+ , pipe.LeakPressure --й¶ѹMpa(g)
+ , pipe.PCMedium --ϴҪId
+ , pm.PurgeMethodCode --ϴҪ
+ , pipe.VacuumPressure --ѹKpa(a)
+ , pipe.MaterialId --Id
+ , mat.MaterialCode AS PipeMaterialCode --
+ , pipe.Remark AS PipeRemark --ע
+ , pipe.FlowingSection as FlowingSection --ˮ
+ , jot.[WeldJointId] --Id
+ , jot.[WeldJointCode] --ں
+ , jot.[Material1Id] --1Id
+ , mat1.MaterialCode AS Material1Code --1
+ , jot.[Material2Id] --2Id
+ , mat2.MaterialCode AS Material2Code --2
+ , jot.[Dia] --⾶
+ , jot.DNDia --DNֱ
+ , jot.[Size] --
+ , jot.[Thickness] --ں
+ , jot.[Specification] --
+ , jot.[WeldTypeId] --Id
+ , WeldType.WeldTypeCode --
+ , jot.[DetectionTypeId] --Id
+ , ndt.DetectionTypeCode --
+ , jot.[Components1Id] --1Id
+ , com1.ComponentsCode AS ComponentsCode1 --1
+ , jot.[Components2Id] --2Id
+ , com2.ComponentsCode AS ComponentsCode2 --2
+ , jot.DesignIsHotProess --Ƿȴ
+ , CASE jot.DesignIsHotProess WHEN 1 THEN '' ELSE '' END AS DesignIsHotProessStr --Ƿȴ
+ , jot.[WeldingMethodId] --ӷId
+ , WeldingMethod.WeldingMethodCode --ӷ
+ , jot.WPQId --WPSId
+ , wps.WPQCode --WPS
+ , jot.MatchableWPQ --ƥWPQ
+ , jot.[GrooveTypeId] --¿Id
+ , GrooveType.GrooveTypeCode --¿
+ , jot.[WeldingRod] --Id
+ , rod.ConsumablesCode AS WeldingRodCode --
+ , jot.[WeldingWire] --˿Id
+ , wire.ConsumablesCode AS WeldingWireCode --˿
+ , jot.PreTemperature --Ԥ¶
+ , jot.[JointAttribute] --
+ , jot.TwoJointType --κ
+ , pipe.PipeArea --Ԥ/ֳװ
+ , daily.WeldingDate as WeldingDateD
+ , CONVERT(VARCHAR(100), daily.WeldingDate, 23) AS WeldingDate --
+ , BackingWelder.WelderCode AS BackingWelderCode --
+ , CoverWelder.WelderCode AS CoverWelderCode --溸
+ , CoverWelderTeamGroup.TeamGroupName as CoverWelderTeamGroupName ----溸
+ , BackingWelderTeamGroup.TeamGroupName as BackingWelderTeamGroupName --
+ , (CASE (SELECT COUNT(*)
+ FROM [dbo].[HJGL_HotProess_TrustItem] hpti
+ WHERE hpti.WeldJointId = jot.WeldJointId)
+ WHEN 0 THEN ''
+ ELSE (SELECT TOP 1 ISNULL(ReportNo, '')
+ FROM [dbo].[HJGL_HotProess_Trust] hpt
+ LEFT JOIN [dbo].[HJGL_HotProess_TrustItem] hpti
+ ON hpti.HotProessTrustId = hpt.HotProessTrustId
+ WHERE hpti.WeldJointId = jot.WeldJointId) END) AS HotProessReportNo --ȴ
+ , (CASE (SELECT TOP 1 IsCompleted
+ FROM [dbo].[HJGL_HotProess_TrustItem] hpti
+ WHERE hpti.WeldJointId = jot.WeldJointId)
+ WHEN 1 THEN ''
+ WHEN 0 THEN 'δ'
+ ELSE 'δȴ' END) AS HotProessResult --ȴ
+ , (CASE (SELECT COUNT(*)
+ FROM [dbo].HJGL_Hard_TrustItem hti
+ WHERE hti.WeldJointId = jot.WeldJointId)
+ WHEN 0 THEN ''
+ ELSE (SELECT TOP 1 ISNULL(InspectionNum, '')
+ FROM [dbo].HJGL_Hard_Trust ht
+ LEFT JOIN [dbo].HJGL_Hard_TrustItem hti ON hti.HardTrustID = ht.HardTrustID
+ WHERE hti.WeldJointId = jot.WeldJointId) END) AS HardReportNo --Ӳȱ
+ , (CASE (SELECT TOP 1 IsPass
+ FROM [dbo].HJGL_Hard_TrustItem hti
+ WHERE hti.WeldJointId = jot.WeldJointId)
+ WHEN 1 THEN 'ϸ'
+ WHEN 0 THEN 'ϸ'
+ ELSE '' END) AS HardResult --Ӳȼ
+ , (CASE (SELECT COUNT(*)
+ FROM [dbo].HJGL_Batch_BatchTrustItem bti
+ WHERE bti.WeldJointId = jot.WeldJointId)
+ WHEN 0 THEN ''
+ ELSE (SELECT TOP 1 TrustBatchCode
+ FROM [dbo].HJGL_Batch_BatchTrust bt
+ LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchId = bt.TrustBatchId
+ WHERE bti.WeldJointId = jot.WeldJointId) END) AS TrustBatchCode --ίе
+ , (CASE (SELECT COUNT(*)
+ FROM [dbo].HJGL_Batch_NDEItem ndei
+ LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId = ndei.TrustBatchItemId
+ WHERE bti.WeldJointId = jot.WeldJointId)
+ WHEN 0 THEN ''
+ ELSE (SELECT TOP 1 ISNULL(NDECode, '')
+ FROM [dbo].HJGL_Batch_NDE nde
+ LEFT JOIN [dbo].HJGL_Batch_NDEItem ndei ON ndei.NDEID = nde.NDEID
+ LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti
+ ON bti.TrustBatchItemId = ndei.TrustBatchItemId
+ WHERE bti.WeldJointId = jot.WeldJointId) END) AS NDECode --ⵥ
+ , (CASE (SELECT TOP 1 CheckResult
+ FROM [dbo].HJGL_Batch_NDEItem ndei
+ LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId = ndei.TrustBatchItemId
+ WHERE bti.WeldJointId = jot.WeldJointId)
+ WHEN '1' THEN 'ϸ'
+ WHEN '2' THEN 'ϸ'
+ ELSE '' END) AS CheckResult --
+ , jot.PipelineId
+ , jot.[JointArea]
+ , jot.[WeldingLocationId]
+ , jot.[HeartNo1]
+ , jot.[HeartNo2]
+ , jot.[IsHotProess]
+ , jot.[WeldingDailyId]
+ , jot.[BackingWelderId]
+ , jot.[CoverWelderId]
+ , jot.WeldingMode
+ , jot.Remark
+ , jot.IsTwoJoint
+ , jot.SubmitMan
+ , jot.AuditMan
+ , jot.AuditMan2
+ , jot.AuditDate
+ , jot.AuditDate2
+ , WeldingLocation.WeldingLocationCode
+ , CASE WHEN jot.WeldingDailyId IS NULL THEN '' ELSE '' END AS IsWelding
+ , CASE WHEN jot.WeldingDailyId IS NULL THEN 'δ' ELSE '' END AS IsWeldOK
+ , CASE WHEN jot.IsHotProess = 1 THEN '' ELSE '' END AS IsHotProessStr
+ , BackingWelder.PersonName AS BackingWelderName
+ , CoverWelder.PersonName AS CoverWelderName
+ , (CASE
+ WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL
+ THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode
+ ELSE (ISNULL(CoverWelder.WelderCode, '') + ISNULL(BackingWelder.WelderCode, '')) END) AS WelderCode
+ , --
+ (CASE
+ WHEN mat1.MaterialCode IS NOT NULL AND mat2.MaterialCode IS NOT NULL
+ THEN mat1.MaterialCode + '/' + mat2.MaterialCode
+ ELSE (ISNULL(mat1.MaterialCode, '') + ISNULL(mat2.MaterialCode, '')) END) AS MaterialCode
+ , --
+
+ daily.WeldingDailyCode
+ , pointItem.PointBatchId
+ , point.PointBatchCode
+ , (CASE
+ WHEN pointItem.PointState = '1' THEN 'ѵ'
+ WHEN pointItem.PointState = '2' THEN ''
+ ELSE '' END) AS IsPoint
+ FROM [dbo].[HJGL_WeldJoint] jot
+ LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId
+ LEFT JOIN dbo.WBS_UnitWork uw ON uw.UnitWorkId = pipe.UnitWorkId
+ LEFT JOIN dbo.HJGL_WeldingDaily AS daily ON daily.WeldingDailyId = jot.WeldingDailyId
+ LEFT JOIN dbo.Base_Unit unit ON unit.UnitId = daily.UnitId
+ LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId = jot.WeldTypeId
+ LEFT JOIN dbo.Base_DetectionRate dr ON dr.DetectionRateId = pipe.DetectionRateId
+ LEFT JOIN Base_TestMedium tm ON tm.TestMediumId = pipe.TestMedium
+ LEFT JOIN Base_TestMedium tm2 ON tm2.TestMediumId = pipe.LeakMedium
+ LEFT JOIN Base_PurgeMethod pm ON pm.PurgeMethodId = pipe.PCMedium
+ LEFT JOIN Base_PressurePipingClass ppc ON ppc.PressurePipingClassId = pipe.PressurePipingClassId
+ LEFT JOIN Base_Material AS mat ON mat.MaterialId = pipe.MaterialId
+ LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id
+ LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id
+ LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId = jot.WeldingMethodId
+ LEFT JOIN Base_WeldingLocation AS WeldingLocation
+ ON WeldingLocation.WeldingLocationId = jot.WeldingLocationId
+ LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId = jot.WeldingWire
+ LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId = jot.WeldingRod
+ LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId = jot.GrooveTypeId
+ LEFT JOIN Base_Components AS com1 ON com1.ComponentsId = jot.Components1Id
+ LEFT JOIN Base_Components AS com2 ON com2.ComponentsId = jot.Components2Id
+ LEFT JOIN SitePerson_Person AS BackingWelder
+ ON BackingWelder.PersonId = jot.BackingWelderId and BackingWelder.ProjectId = jot.ProjectId
+ LEFT JOIN SitePerson_Person AS CoverWelder
+ ON CoverWelder.PersonId = jot.CoverWelderId and CoverWelder.ProjectId = jot.ProjectId
+ LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId = pipe.PipingClassId
+ LEFT JOIN dbo.Base_Medium medium ON medium.MediumId = pipe.MediumId
+ LEFT JOIN dbo.Base_DetectionType ndt ON ndt.DetectionTypeId = jot.DetectionTypeId
+ LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = jot.WPQId
+ LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.WeldJointId = jot.WeldJointId
+ LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId
+ LEFT JOIN dbo.ProjectData_TeamGroup AS CoverWelderTeamGroup
+ on CoverWelderTeamGroup.TeamGroupId = jot.CoverWelderTeamGroupId and
+ CoverWelderTeamGroup.ProjectId = jot.ProjectId
+ LEFT JOIN dbo.ProjectData_TeamGroup AS BackingWelderTeamGroup
+ on BackingWelderTeamGroup.TeamGroupId = jot.BackingWelderTeamGroupId and
+ BackingWelderTeamGroup.ProjectId = jot.ProjectId
+go
+
+
+
+update HJGL_WeldJoint set BackingWelderTeamGroupId=(select TOP 1 TeamGroupId from SitePerson_Person where PersonId= BackingWelderId)
+update HJGL_WeldJoint set CoverWelderTeamGroupId=(select TOP 1 TeamGroupId from SitePerson_Person where PersonId= CoverWelderId)
+
diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs
index 03a74df0..1f6b5ed3 100644
--- a/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs
+++ b/SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs
@@ -119,7 +119,9 @@ namespace BLL
Remark = weldJoint.Remark,
IsTwoJoint = weldJoint.IsTwoJoint,
SubmitMan = weldJoint.SubmitMan,
- TwoJointType = weldJoint.TwoJointType
+ TwoJointType = weldJoint.TwoJointType,
+ CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId,
+ BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId
};
if (!string.IsNullOrEmpty(weldJoint.WeldJointId))
{
@@ -188,7 +190,8 @@ namespace BLL
newWeldJoint.AttachUrl = weldJoint.AttachUrl;
newWeldJoint.SubmitMan = weldJoint.SubmitMan;
newWeldJoint.TwoJointType = weldJoint.TwoJointType;
-
+ newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId;
+ newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId;
db.SubmitChanges();
}
}
diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs
index 24e91bfd..a71e9e64 100644
--- a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs
+++ b/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 '外径' ,
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
index 3ddbb677..332cabde 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
@@ -184,13 +184,21 @@
Width="100px">
-
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
index 1e4388ec..9e0a48bd 100644
--- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
@@ -511,7 +511,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery
焊口属性 = x.JointAttribute,
焊接日期 = x.WeldingDate,
打底焊工号 = x.BackingWelderCode,
- 盖面焊工号 = x.WelderCode,
+ 打底焊工班组=x.BackingWelderTeamGroupName,
+ 盖面焊工号 = x.CoverWelderCode,
+ 盖面焊工班组 = x.CoverWelderTeamGroupName,
热处理报告编号 = x.HotProessReportNo,
热处理检测结果 = x.HotProessResult,
硬度报告编号 = x.HardReportNo,
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
index c265e4a3..24b7ea0d 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
@@ -113,9 +113,17 @@
DataField="CoverWelderCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="90px">
+
+
+ DataField="BackingWelderCode" FieldType="String" HeaderTextAlign="Center"
+ TextAlign="Center" Width="90px">
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
index 05770e3e..dce404f3 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs
+++ b/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";
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index 58bc7938..36d4cf0f 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/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);
}
}
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
index ec4922f8..9803e66d 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx
@@ -46,6 +46,8 @@
+
+
@@ -53,7 +55,7 @@
+ EnableTextSelection="true" OnNodeExpand="tvControlItem_TreeNodeExpanded" EnableCheckBox="true" OnlyLeafCheck="true">
@@ -194,9 +196,10 @@
-
-
+
+
+
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
index 5bfe511d..b9de329e 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.cs
+++ b/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 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)
{
diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs
index b9d45417..01c22733 100644
--- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingConDate.aspx.designer.cs
@@ -7,11 +7,13 @@
//
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.HJGL.WeldingManage {
-
-
- public partial class WeldingConDate {
-
+namespace FineUIPro.Web.HJGL.WeldingManage
+{
+
+
+ public partial class WeldingConDate
+ {
+
///
/// form1 控件。
///
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 控件。
///
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
/// Panel1 控件。
///
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Panel Panel1;
-
+
///
/// panelLeftRegion 控件。
///
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Panel panelLeftRegion;
-
+
///
/// Toolbar1 控件。
///
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
/// txtPipelineCode 控件。
///
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtPipelineCode;
-
+
///
/// ckNOEdit 控件。
///
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.CheckBox ckNOEdit;
-
+
///
/// drpPipeArea 控件。
///
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpPipeArea;
-
+
///
/// hdUnitWorkId 控件。
///
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.HiddenField hdUnitWorkId;
-
+
///
/// btnTreeFind 控件。
///
@@ -101,7 +103,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnTreeFind;
-
+
+ ///
+ /// Button1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button Button1;
+
///
/// tvControlItem 控件。
///
@@ -110,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Tree tvControlItem;
-
+
///
/// panelCenterRegion 控件。
///
@@ -119,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Panel panelCenterRegion;
-
+
///
/// Toolbar3 控件。
///
@@ -128,7 +139,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Toolbar Toolbar3;
-
+
///
/// txtWeldJointCode 控件。
///
@@ -137,7 +148,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtWeldJointCode;
-
+
///
/// rbInput 控件。
///
@@ -146,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.RadioButtonList rbInput;
-
+
///
/// drpUnit 控件。
///
@@ -155,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpUnit;
-
+
///
/// drpJointAttribute 控件。
///
@@ -164,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpJointAttribute;
-
+
///
/// ToolbarFill1 控件。
///
@@ -173,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.ToolbarFill ToolbarFill1;
-
+
///
/// btnAutoInput 控件。
///
@@ -182,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnAutoInput;
-
+
///
/// btnEdit 控件。
///
@@ -191,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnEdit;
-
+
///
/// Grid1 控件。
///
@@ -200,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Grid Grid1;
-
+
///
/// ToolbarSeparator1 控件。
///
@@ -209,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-
+
///
/// ToolbarText1 控件。
///
@@ -218,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.ToolbarText ToolbarText1;
-
+
///
/// ddlPageSize 控件。
///
@@ -227,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList ddlPageSize;
-
+
///
/// Window1 控件。
///
@@ -236,7 +247,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Window Window1;
-
+
///
/// Window2 控件。
///
@@ -245,7 +256,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Window Window2;
-
+
///
/// Window3 控件。
///
@@ -254,7 +265,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Window Window3;
-
+
///
/// Menu 控件。
///
@@ -263,7 +274,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Menu Menu;
-
+
///
/// btnMenuEdit 控件。
///
@@ -272,7 +283,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.MenuButton btnMenuEdit;
-
+
///
/// btnView 控件。
///
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 3ae7afd8..afeb19e1 100644
--- a/SGGL/Model/Model.cs
+++ b/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 _AuditDate2;
+ private string _BackingWelderTeamGroupId;
+
+ private string _CoverWelderTeamGroupId;
+
private EntitySet _HJGL_Batch_BatchTrustItem;
private EntitySet _HJGL_Batch_PointBatchItem;
@@ -97950,6 +97954,10 @@ namespace Model
partial void OnAuditMan2Changed();
partial void OnAuditDate2Changing(System.Nullable 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
{
@@ -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 WorkPackageEstimate
{
get
@@ -183941,16 +183989,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;
@@ -183979,6 +184017,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);
@@ -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 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);
@@ -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 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()
@@ -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 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
{
@@ -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 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;
@@ -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