lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

焊口导入增加焊点坐标

Browse Source
This commit is contained in:
李鹏飞
2026-03-02 20:03:07 +08:00
parent bc2427b335
commit 39a7bc2f6c
8 changed files with 469 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_V2026-03-02-001.sql
+222
View File
@@ -0,0 +1,222 @@
alter table dbo.HJGL_WeldJoint
add WeldJointPoint nvarchar(300)
go
alter view dbo.View_HJGL_WeldJoint as
SELECT jot.[ProjectId] --项目Id
, pipe.[UnitWorkId] --单位工程Id
, uw.UnitWorkName --单位工程
, pipe.[UnitId] --单位Id
, unit.UnitName --单位
, jot.[PipelineCode] --管线号
, pipe.[SingleNumber] --单线图号
, pipe.[SingleName] --图纸名称
, pipe.[MediumId] --介质Id
, medium.MediumCode
, medium.MediumName --介质名称
, pipe.[PipingClassId] --管道等级Id
, pipingClass.PipingClassCode --管道等级
, pipe.[DetectionRateId] --探伤比例Id
, dr.DetectionRateCode --探伤比例（例如5，10，20）
, pipe.DetectionType --探伤类型Id(可能多个，中间用|分隔)
, STUFF((SELECT ',' + DetectionTypeCode
FROM Base_DetectionType
WHERE CHARINDEX('|' + LTRIM(DetectionTypeId) + '|', '|' + pipe.DetectionType + '|') > 0
FOR XML PATH('')), 1, 1, '') AS DetectionTypeStr --探伤类型（可能多个，中间用,分隔）
, pipe.DesignTemperature --设计温度℃
, pipe.DesignPress --设计压力Mpa(g)
, pipe.TestMedium --压力试验介质Id
, tm.MediumName AS TestMediumName --压力试验介质
, pipe.TestPressure --压力试验压力Mpa(g)
, pipe.PressurePipingClassId --压力管道级别Id
, ppc.PressurePipingClassCode --压力管道级别
, pipe.PipeLenth --管线长度(m)
, pipe.LeakMedium --泄露性试验介质Id
, tm2.MediumName AS LeakMediumName --泄露性试验介质
, pipe.LeakPressure --泄露性试验压力Mpa(g)
, pipe.PCMedium --吹洗要求Id
, pm.PurgeMethodCode --吹洗要求
, pipe.VacuumPressure --真空试验压力Kpa(a)
, pipe.MaterialId --材质Id
, mat.MaterialCode AS PipeMaterialCode --材质
, pipe.Remark AS PipeRemark --备注
, pipe.FlowingSection as FlowingSection --流水段
, jot.[WeldJointId] --焊口Id
, jot.[WeldJointCode] --焊口号
, jot.[Material1Id] --材质1Id
, mat1.MaterialCode AS Material1Code --材质1
, jot.[Material2Id] --材质2Id
, mat2.MaterialCode AS Material2Code --材质2
, jot.[Dia] --外径
, jot.DNDia --DN公称直径
, jot.[Size] --达因
, jot.[Thickness] --壁厚
, jot.[Specification] --规格
, jot.[WeldTypeId] --焊缝类型Id
, WeldType.WeldTypeCode --焊缝类型
, jot.[DetectionTypeId] --检测类型Id
, ndt.DetectionTypeCode --检测类型
, jot.[Components1Id] --组件1号Id
, com1.ComponentsCode AS ComponentsCode1 --组件1号
, jot.[Components2Id] --组件2号Id
, com2.ComponentsCode AS ComponentsCode2 --组件2号
, jot.DesignIsHotProess --是否热处理
, CASE jot.DesignIsHotProess WHEN 1 THEN '是' ELSE '否' END AS DesignIsHotProessStr --是否热处理
, jot.[WeldingMethodId] --焊接方法Id
, WeldingMethod.WeldingMethodCode --焊接方法
, jot.WPQId --WPS的Id
, wps.WPQCode --WPS编号
, jot.MatchableWPQ --可匹配WPQ
, jot.[GrooveTypeId] --坡口类型Id
, GrooveType.GrooveTypeCode --坡口类型
, jot.[WeldingRod] --焊条Id
, rod.ConsumablesCode AS WeldingRodCode --焊条
, jot.[WeldingWire] --焊丝Id
, wire.ConsumablesCode AS WeldingWireCode --焊丝
, jot.PreTemperature --预热温度
, jot.[JointAttribute] --焊口属性
, jot.TwoJointType --二次焊口新增类型
, pipe.PipeArea --工厂预制/现场安装
, daily.WeldingDate as WeldingDateD
, CONVERT(VARCHAR(100), daily.WeldingDate, 23) AS WeldingDate --焊接日期
, BackingWelder.WelderCode AS BackingWelderCode --打底焊工
, CoverWelder.WelderCode AS CoverWelderCode --盖面焊工
, CoverWelderTeamGroup.TeamGroupName as CoverWelderTeamGroupName ----盖面焊工班组
, BackingWelderTeamGroup.TeamGroupName as BackingWelderTeamGroupName --打底焊工班组
, (CASE (SELECT COUNT(*)
FROM [dbo].[HJGL_HotProess_TrustItem] hpti
WHERE hpti.WeldJointId = jot.WeldJointId)
WHEN 0 THEN ''
ELSE (SELECT TOP 1 ISNULL(ReportNo, '')
FROM [dbo].[HJGL_HotProess_Trust] hpt
LEFT JOIN [dbo].[HJGL_HotProess_TrustItem] hpti
ON hpti.HotProessTrustId = hpt.HotProessTrustId
WHERE hpti.WeldJointId = jot.WeldJointId) END) AS HotProessReportNo --热处理报告编号
, (CASE (SELECT TOP 1 IsCompleted
FROM [dbo].[HJGL_HotProess_TrustItem] hpti
WHERE hpti.WeldJointId = jot.WeldJointId)
WHEN 1 THEN '完成'
WHEN 0 THEN '未完成'
ELSE '未热处理' END) AS HotProessResult --热处理检测结果
, (CASE (SELECT COUNT(*)
FROM [dbo].HJGL_Hard_TrustItem hti
WHERE hti.WeldJointId = jot.WeldJointId)
WHEN 0 THEN ''
ELSE (SELECT TOP 1 ISNULL(InspectionNum, '')
FROM [dbo].HJGL_Hard_Trust ht
LEFT JOIN [dbo].HJGL_Hard_TrustItem hti ON hti.HardTrustID = ht.HardTrustID
WHERE hti.WeldJointId = jot.WeldJointId) END) AS HardReportNo --硬度报告编号
, (CASE (SELECT TOP 1 IsPass
FROM [dbo].HJGL_Hard_TrustItem hti
WHERE hti.WeldJointId = jot.WeldJointId)
WHEN 1 THEN '合格'
WHEN 0 THEN '不合格'
ELSE '待检测' END) AS HardResult --硬度检测结果
, (CASE (SELECT COUNT(*)
FROM [dbo].HJGL_Batch_BatchTrustItem bti
WHERE bti.WeldJointId = jot.WeldJointId)
WHEN 0 THEN ''
ELSE (SELECT TOP 1 TrustBatchCode
FROM [dbo].HJGL_Batch_BatchTrust bt
LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchId = bt.TrustBatchId
WHERE bti.WeldJointId = jot.WeldJointId) END) AS TrustBatchCode --委托单编号
, (CASE (SELECT COUNT(*)
FROM [dbo].HJGL_Batch_NDEItem ndei
LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId = ndei.TrustBatchItemId
WHERE bti.WeldJointId = jot.WeldJointId)
WHEN 0 THEN ''
ELSE (SELECT TOP 1 ISNULL(NDECode, '')
FROM [dbo].HJGL_Batch_NDE nde
LEFT JOIN [dbo].HJGL_Batch_NDEItem ndei ON ndei.NDEID = nde.NDEID
LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti
ON bti.TrustBatchItemId = ndei.TrustBatchItemId
WHERE bti.WeldJointId = jot.WeldJointId) END) AS NDECode --检测单编号
, (CASE (SELECT TOP 1 CheckResult
FROM [dbo].HJGL_Batch_NDEItem ndei
LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId = ndei.TrustBatchItemId
WHERE bti.WeldJointId = jot.WeldJointId)
WHEN '1' THEN '合格'
WHEN '2' THEN '不合格'
ELSE '' END) AS CheckResult --检测结果
, jot.PipelineId
, jot.[JointArea]
, jot.[WeldingLocationId]
, jot.[HeartNo1]
, jot.[HeartNo2]
, jot.[IsHotProess]
, jot.[WeldingDailyId]
, jot.[BackingWelderId]
, jot.[CoverWelderId]
, jot.WeldingMode
, jot.Remark
, jot.IsTwoJoint
, jot.SubmitMan
, jot.AuditMan
, jot.AuditMan2
, jot.AuditDate
, jot.AuditDate2
, jot.WeldJointPoint
, WeldingLocation.WeldingLocationCode
, CASE WHEN jot.WeldingDailyId IS NULL THEN '否' ELSE '是' END AS IsWelding
, CASE WHEN jot.WeldingDailyId IS NULL THEN '未完成' ELSE '已完成' END AS IsWeldOK
, CASE WHEN jot.IsHotProess = 1 THEN '是' ELSE '否' END AS IsHotProessStr
, BackingWelder.PersonName AS BackingWelderName
, CoverWelder.PersonName AS CoverWelderName
, (CASE
WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL
THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode
ELSE (ISNULL(CoverWelder.WelderCode, '') + ISNULL(BackingWelder.WelderCode, '')) END) AS WelderCode
, --焊工
(CASE
WHEN mat1.MaterialCode IS NOT NULL AND mat2.MaterialCode IS NOT NULL
THEN mat1.MaterialCode + '/' + mat2.MaterialCode
ELSE (ISNULL(mat1.MaterialCode, '') + ISNULL(mat2.MaterialCode, '')) END) AS MaterialCode
, --材质
daily.WeldingDailyCode
, pointItem.PointBatchId
, point.PointBatchCode
, (CASE
WHEN pointItem.PointState = '1' THEN '已点口'
WHEN pointItem.PointState = '2' THEN '已扩透'
ELSE '' END) AS IsPoint
FROM [dbo].[HJGL_WeldJoint] jot
LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId
LEFT JOIN dbo.WBS_UnitWork uw ON uw.UnitWorkId = pipe.UnitWorkId
LEFT JOIN dbo.HJGL_WeldingDaily AS daily ON daily.WeldingDailyId = jot.WeldingDailyId
LEFT JOIN dbo.Base_Unit unit ON unit.UnitId = daily.UnitId
LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId = jot.WeldTypeId
LEFT JOIN dbo.Base_DetectionRate dr ON dr.DetectionRateId = pipe.DetectionRateId
LEFT JOIN Base_TestMedium tm ON tm.TestMediumId = pipe.TestMedium
LEFT JOIN Base_TestMedium tm2 ON tm2.TestMediumId = pipe.LeakMedium
LEFT JOIN Base_PurgeMethod pm ON pm.PurgeMethodId = pipe.PCMedium
LEFT JOIN Base_PressurePipingClass ppc ON ppc.PressurePipingClassId = pipe.PressurePipingClassId
LEFT JOIN Base_Material AS mat ON mat.MaterialId = pipe.MaterialId
LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id
LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id
LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId = jot.WeldingMethodId
LEFT JOIN Base_WeldingLocation AS WeldingLocation
ON WeldingLocation.WeldingLocationId = jot.WeldingLocationId
LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId = jot.WeldingWire
LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId = jot.WeldingRod
LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId = jot.GrooveTypeId
LEFT JOIN Base_Components AS com1 ON com1.ComponentsId = jot.Components1Id
LEFT JOIN Base_Components AS com2 ON com2.ComponentsId = jot.Components2Id
LEFT JOIN SitePerson_Person AS BackingWelder
ON BackingWelder.PersonId = jot.BackingWelderId and BackingWelder.ProjectId = jot.ProjectId
LEFT JOIN SitePerson_Person AS CoverWelder
ON CoverWelder.PersonId = jot.CoverWelderId and CoverWelder.ProjectId = jot.ProjectId
LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId = pipe.PipingClassId
LEFT JOIN dbo.Base_Medium medium ON medium.MediumId = pipe.MediumId
LEFT JOIN dbo.Base_DetectionType ndt ON ndt.DetectionTypeId = jot.DetectionTypeId
LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = jot.WPQId
LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.WeldJointId = jot.WeldJointId
LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId
LEFT JOIN dbo.ProjectData_TeamGroup AS CoverWelderTeamGroup
on CoverWelderTeamGroup.TeamGroupId = jot.CoverWelderTeamGroupId and
CoverWelderTeamGroup.ProjectId = jot.ProjectId
LEFT JOIN dbo.ProjectData_TeamGroup AS BackingWelderTeamGroup
on BackingWelderTeamGroup.TeamGroupId = jot.BackingWelderTeamGroupId and
BackingWelderTeamGroup.ProjectId = jot.ProjectId
go
SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs
+3 -1
View File
@@ -118,7 +118,8 @@ namespace BLL
SubmitMan = weldJoint.SubmitMan, SubmitMan = weldJoint.SubmitMan,
TwoJointType = weldJoint.TwoJointType, TwoJointType = weldJoint.TwoJointType,
CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId, CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId,
BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId,
WeldJointPoint = weldJoint.WeldJointPoint
}; };
if (!string.IsNullOrEmpty(weldJoint.WeldJointId)) if (!string.IsNullOrEmpty(weldJoint.WeldJointId))
{ {
@@ -189,6 +190,7 @@ namespace BLL
newWeldJoint.TwoJointType = weldJoint.TwoJointType; newWeldJoint.TwoJointType = weldJoint.TwoJointType;
newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId; newWeldJoint.CoverWelderTeamGroupId = weldJoint.CoverWelderTeamGroupId;
newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId; newWeldJoint.BackingWelderTeamGroupId = weldJoint.BackingWelderTeamGroupId;
newWeldJoint.WeldJointPoint = weldJoint.WeldJointPoint;
db.SubmitChanges(); db.SubmitChanges();
} }
} }
SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出（设计）数据模板.xlsx
BIN
View File
Binary file not shown.
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineListPDMSIn.aspx.cs
+11 -1
View File
@@ -730,6 +730,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
} }
} }
// 读取焊点坐标（AE列）
string col29 = Convert.ToString(pds[i].AE);
if (!string.IsNullOrEmpty(col29))
{
pipeline.WeldJointPoint = col29;
}
if (!string.IsNullOrEmpty(pipeline.PipelineCode) && !string.IsNullOrEmpty(pipeline.WeldJointCode)) if (!string.IsNullOrEmpty(pipeline.PipelineCode) && !string.IsNullOrEmpty(pipeline.WeldJointCode))
{ {
pipeline.ProjectId = this.CurrUser.LoginProjectId; pipeline.ProjectId = this.CurrUser.LoginProjectId;
@@ -1039,6 +1046,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
JointAttribute = x.JointAttribute, JointAttribute = x.JointAttribute,
ProjectId = this.CurrUser.LoginProjectId, ProjectId = this.CurrUser.LoginProjectId,
IsHotProess = x.IsHotProess, IsHotProess = x.IsHotProess,
WeldJointPoint = x.WeldJointPoint,
}).DistinctBy(temp => new }).DistinctBy(temp => new
{ {
temp.WeldJointCode, temp.WeldJointCode,
@@ -1054,7 +1062,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
temp.DetectionTypeId, temp.DetectionTypeId,
temp.JointAttribute, temp.JointAttribute,
temp.ProjectId, temp.ProjectId,
temp.IsHotProess temp.IsHotProess,
temp.WeldJointPoint
}).ToList(); }).ToList();
var pipelineCodes = weldJoints.Select(x => x.PipelineCode).Distinct().ToList(); var pipelineCodes = weldJoints.Select(x => x.PipelineCode).Distinct().ToList();
@@ -1076,6 +1085,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
weldJoint.JointAttribute = weldJoints[i].JointAttribute; weldJoint.JointAttribute = weldJoints[i].JointAttribute;
weldJoint.ProjectId = weldJoints[i].ProjectId; weldJoint.ProjectId = weldJoints[i].ProjectId;
weldJoint.IsHotProess = weldJoints[i].IsHotProess; weldJoint.IsHotProess = weldJoints[i].IsHotProess;
weldJoint.WeldJointPoint = weldJoints[i].WeldJointPoint;
var isExistJot = allWeldJoints.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == weldJoint.WeldJointCode); var isExistJot = allWeldJoints.FirstOrDefault(x => x.PipelineId == weldJoint.PipelineId && x.WeldJointCode == weldJoint.WeldJointCode);
if (isExistJot != null) // 更新焊口 if (isExistJot != null) // 更新焊口
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx
+4
View File
@@ -294,6 +294,10 @@
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="90px"> Width="90px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="焊点坐标" ColumnID="WeldJointPoint" DataField="WeldJointPoint"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left"
Width="90px">
</f:RenderField>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu3" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu3" />
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs
+1 -1
View File
@@ -328,7 +328,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
IsWelding,IsHotProessStr,Material1Code,Material2Code,WeldTypeCode, IsWelding,IsHotProessStr,Material1Code,Material2Code,WeldTypeCode,
Specification,HeartNo1,HeartNo2,Size,Dia,DNDia,Thickness,GrooveTypeCode, Specification,HeartNo1,HeartNo2,Size,Dia,DNDia,Thickness,GrooveTypeCode,
WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode, WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,WeldJointPoint
FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL "; FROM View_HJGL_WeldJoint WHERE IsTwoJoint IS NULL ";
List<SqlParameter> listStr = new List<SqlParameter> { }; List<SqlParameter> listStr = new List<SqlParameter> { };
SGGL/FineUIPro.Web/Person/PersonEdit.aspx.cs
+2 -2
View File
@@ -629,10 +629,10 @@ namespace FineUIPro.Web.Person
/// <param name="e"></param> /// <param name="e"></param>
protected void drpRole_SelectedIndexChanged(object sender, EventArgs e) protected void drpRole_SelectedIndexChanged(object sender, EventArgs e)
{ {
if (this.drpRole.SelectedItemArray.Count() > 4) if (this.drpRole.SelectedItemArray.Count() > 5)
{ {
this.drpRole.SelectedValueArray = null; this.drpRole.SelectedValueArray = null;
Alert.ShowInParent("最多可选择4个角色！", MessageBoxIcon.Warning); Alert.ShowInParent("最多可选择5个角色！", MessageBoxIcon.Warning);
} }
else else
{ {
SGGL/Model/Model.cs
+226 -184
View File
@@ -12365,7 +12365,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
public string ApproveIdea public string ApproveIdea
{ {
get get
@@ -22544,6 +22544,8 @@ namespace Model
private string _UnitId; private string _UnitId;
private string _ProjectId;
private string _MaterialId; private string _MaterialId;
private string _ColorName; private string _ColorName;
@@ -22554,8 +22556,6 @@ namespace Model
private string _Remark; private string _Remark;
private string _ProjectId;
#region 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -22564,6 +22564,8 @@ namespace Model
partial void OnMaterialColorIdChanged(); partial void OnMaterialColorIdChanged();
partial void OnUnitIdChanging(string value); partial void OnUnitIdChanging(string value);
partial void OnUnitIdChanged(); partial void OnUnitIdChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
partial void OnMaterialIdChanging(string value); partial void OnMaterialIdChanging(string value);
partial void OnMaterialIdChanged(); partial void OnMaterialIdChanged();
partial void OnColorNameChanging(string value); partial void OnColorNameChanging(string value);
@@ -22574,8 +22576,6 @@ namespace Model
partial void OnRGBChanged(); partial void OnRGBChanged();
partial void OnRemarkChanging(string value); partial void OnRemarkChanging(string value);
partial void OnRemarkChanged(); partial void OnRemarkChanged();
partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged();
#endregion #endregion
public Base_MaterialColor() public Base_MaterialColor()
@@ -22623,6 +22623,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialId", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialId", DbType="NVarChar(50)")]
public string MaterialId public string MaterialId
{ {
@@ -22723,26 +22743,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
public string ProjectId
{
get
{
return this._ProjectId;
}
set
{
if ((this._ProjectId != value))
{
this.OnProjectIdChanging(value);
this.SendPropertyChanging();
this._ProjectId = value;
this.SendPropertyChanged("ProjectId");
this.OnProjectIdChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@@ -100096,10 +100096,10 @@ namespace Model
private string _TrainNumber; private string _TrainNumber;
private System.Nullable<int> _TypeInt;
private string _TrainNumberId; private string _TrainNumberId;
private System.Nullable<int> _TypeInt;
private string _CompileMan; private string _CompileMan;
private System.Nullable<System.DateTime> _CompileDate; private System.Nullable<System.DateTime> _CompileDate;
@@ -100134,10 +100134,10 @@ namespace Model
partial void OnReceiveDateChanged(); partial void OnReceiveDateChanged();
partial void OnTrainNumberChanging(string value); partial void OnTrainNumberChanging(string value);
partial void OnTrainNumberChanged(); partial void OnTrainNumberChanged();
partial void OnTypeIntChanging(System.Nullable<int> value);
partial void OnTypeIntChanged();
partial void OnTrainNumberIdChanging(string value); partial void OnTrainNumberIdChanging(string value);
partial void OnTrainNumberIdChanged(); partial void OnTrainNumberIdChanged();
partial void OnTypeIntChanging(System.Nullable<int> value);
partial void OnTypeIntChanged();
partial void OnCompileManChanging(string value); partial void OnCompileManChanging(string value);
partial void OnCompileManChanged(); partial void OnCompileManChanged();
partial void OnCompileDateChanging(System.Nullable<System.DateTime> value); partial void OnCompileDateChanging(System.Nullable<System.DateTime> value);
@@ -100391,26 +100391,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
public System.Nullable<int> TypeInt
{
get
{
return this._TypeInt;
}
set
{
if ((this._TypeInt != value))
{
this.OnTypeIntChanging(value);
this.SendPropertyChanging();
this._TypeInt = value;
this.SendPropertyChanged("TypeInt");
this.OnTypeIntChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TrainNumberId", DbType="VarChar(50)")]
public string TrainNumberId public string TrainNumberId
{ {
@@ -100431,6 +100411,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeInt", DbType="Int")]
public System.Nullable<int> TypeInt
{
get
{
return this._TypeInt;
}
set
{
if ((this._TypeInt != value))
{
this.OnTypeIntChanging(value);
this.SendPropertyChanging();
this._TypeInt = value;
this.SendPropertyChanged("TypeInt");
this.OnTypeIntChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")]
public string CompileMan public string CompileMan
{ {
@@ -107488,6 +107488,8 @@ namespace Model
private string _CoverWelderTeamGroupId; private string _CoverWelderTeamGroupId;
private string _WeldJointPoint;
private EntitySet<HJGL_Batch_BatchTrustItem> _HJGL_Batch_BatchTrustItem; private EntitySet<HJGL_Batch_BatchTrustItem> _HJGL_Batch_BatchTrustItem;
private EntitySet<HJGL_Batch_PointBatchItem> _HJGL_Batch_PointBatchItem; private EntitySet<HJGL_Batch_PointBatchItem> _HJGL_Batch_PointBatchItem;
@@ -107634,6 +107636,8 @@ namespace Model
partial void OnBackingWelderTeamGroupIdChanged(); partial void OnBackingWelderTeamGroupIdChanged();
partial void OnCoverWelderTeamGroupIdChanging(string value); partial void OnCoverWelderTeamGroupIdChanging(string value);
partial void OnCoverWelderTeamGroupIdChanged(); partial void OnCoverWelderTeamGroupIdChanged();
partial void OnWeldJointPointChanging(string value);
partial void OnWeldJointPointChanged();
#endregion #endregion
public HJGL_WeldJoint() public HJGL_WeldJoint()
@@ -108703,6 +108707,26 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointPoint", DbType="NVarChar(300)")]
public string WeldJointPoint
{
get
{
return this._WeldJointPoint;
}
set
{
if ((this._WeldJointPoint != value))
{
this.OnWeldJointPointChanging(value);
this.SendPropertyChanging();
this._WeldJointPoint = value;
this.SendPropertyChanged("WeldJointPoint");
this.OnWeldJointPointChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_BatchTrustItem_HJGL_WeldJoint", Storage="_HJGL_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")] [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 public EntitySet<HJGL_Batch_BatchTrustItem> HJGL_Batch_BatchTrustItem
{ {
@@ -111678,7 +111702,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(500)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Rectification", DbType="NVarChar(50)")]
public string Rectification public string Rectification
{ {
get get
@@ -111804,7 +111828,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(500)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Measures", DbType="NVarChar(50)")]
public string Measures public string Measures
{ {
get get
@@ -164917,7 +164941,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
public string AttentPerson public string AttentPerson
{ {
get get
@@ -195924,7 +195948,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
public string ProjectDescription public string ProjectDescription
{ {
get get
@@ -196044,7 +196068,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
public string CalculationRule public string CalculationRule
{ {
get get
@@ -196104,7 +196128,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
public string ConstructionSubcontractor public string ConstructionSubcontractor
{ {
get get
@@ -196488,7 +196512,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WorkPackageEstimate public System.Nullable<decimal> WorkPackageEstimate
{ {
get get
@@ -196793,16 +196817,6 @@ namespace Model
private string _ProjectId; 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 System.Nullable<int> _State;
private string _InvoiceCode; private string _InvoiceCode;
@@ -196831,6 +196845,16 @@ namespace Model
private string _CreateUser; 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 可扩展性方法定义 #region 可扩展性方法定义
partial void OnLoaded(); partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action); partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -196839,16 +196863,6 @@ namespace Model
partial void OnInvoiceIdChanged(); partial void OnInvoiceIdChanged();
partial void OnProjectIdChanging(string value); partial void OnProjectIdChanging(string value);
partial void OnProjectIdChanged(); 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 OnStateChanging(System.Nullable<int> value);
partial void OnStateChanged(); partial void OnStateChanged();
partial void OnInvoiceCodeChanging(string value); partial void OnInvoiceCodeChanging(string value);
@@ -196877,6 +196891,16 @@ namespace Model
partial void OnCreateDateChanged(); partial void OnCreateDateChanged();
partial void OnCreateUserChanging(string value); partial void OnCreateUserChanging(string value);
partial void OnCreateUserChanged(); 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 #endregion
public PHTGL_Invoice() public PHTGL_Invoice()
@@ -196924,106 +196948,6 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
public string OrderCode
{
get
{
return this._OrderCode;
}
set
{
if ((this._OrderCode != value))
{
this.OnOrderCodeChanging(value);
this.SendPropertyChanging();
this._OrderCode = value;
this.SendPropertyChanged("OrderCode");
this.OnOrderCodeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<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")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
public System.Nullable<int> State public System.Nullable<int> State
{ {
@@ -197304,6 +197228,106 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
public string ContractId
{
get
{
return this._ContractId;
}
set
{
if ((this._ContractId != value))
{
this.OnContractIdChanging(value);
this.SendPropertyChanging();
this._ContractId = value;
this.SendPropertyChanged("ContractId");
this.OnContractIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
public System.Nullable<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 PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged; public event PropertyChangedEventHandler PropertyChanged;
@@ -198682,7 +198706,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReviewResults", DbType="NVarChar(1000)")]
public string ReviewResults public string ReviewResults
{ {
get get
@@ -296920,6 +296944,8 @@ namespace Model
private System.Nullable<System.DateTime> _AuditDate2; private System.Nullable<System.DateTime> _AuditDate2;
private string _WeldJointPoint;
private string _WeldingLocationCode; private string _WeldingLocationCode;
private string _IsWelding; private string _IsWelding;
@@ -298564,6 +298590,22 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointPoint", DbType="NVarChar(300)")]
public string WeldJointPoint
{
get
{
return this._WeldJointPoint;
}
set
{
if ((this._WeldJointPoint != value))
{
this._WeldJointPoint = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingLocationCode", DbType="NVarChar(50)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingLocationCode", DbType="NVarChar(50)")]
public string WeldingLocationCode public string WeldingLocationCode
{ {
@@ -320714,7 +320756,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
public string Name public string Name
{ {
get get
@@ -321291,7 +321333,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent public string PackageContent
{ {
get get
@@ -321482,7 +321524,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent public string PackageContent
{ {
get get
@@ -326821,7 +326863,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent public string PackageContent
{ {
get get
@@ -328293,7 +328335,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
public string PackageContent public string PackageContent
{ {
get get
@@ -338194,7 +338236,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
public string ContractNo public string ContractNo
{ {
get get
@@ -338214,7 +338256,7 @@ namespace Model
} }
} }
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")] [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
public string UnitWorks public string UnitWorks
{ {
get get