2022-11-03 焊接修改，二次焊口设计增加新增焊口类型
This commit is contained in:
@@ -0,0 +1,173 @@
|
||||
alter table HJGL_Pipeline add FlowingSection nvarchar(200)
|
||||
alter table HJGL_WeldJoint add TwoJointType nvarchar(100)
|
||||
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 --备注
|
||||
|
||||
,jot.[WeldJointId] --焊口Id
|
||||
,jot.[WeldJointCode] --焊口号
|
||||
,jot.[Material1Id] --材质1Id
|
||||
,mat1.MaterialCode AS Material1Code --材质1
|
||||
,jot.[Material2Id] --材质2Id
|
||||
,mat2.MaterialCode AS Material2Code --材质2
|
||||
,jot.[Dia] --外径
|
||||
,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.[GrooveTypeId] --坡口类型Id
|
||||
,GrooveType.GrooveTypeCode --坡口类型
|
||||
,jot.[WeldingRod] --焊条Id
|
||||
,rod.ConsumablesCode AS WeldingRodCode --焊条
|
||||
,jot.[WeldingWire] --焊丝Id
|
||||
,wire.ConsumablesCode AS WeldingWireCode --焊丝
|
||||
,jot.PreTemperature --预热温度
|
||||
,jot.[JointAttribute] --焊口属性
|
||||
,jot.TwoJointType --二次焊口新增类型
|
||||
,CONVERT(VARCHAR(100), daily.WeldingDate, 23) AS WeldingDate --焊接日期
|
||||
,BackingWelder.WelderCode AS BackingWelderCode --打底焊工
|
||||
,CoverWelder.WelderCode AS CoverWelderCode --盖面焊工
|
||||
,(CASE (SELECT COUNT(*) FROM [dbo].[HJGL_HotProess_TrustItem] hpti
|
||||
WHERE hpti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 ISNULL(ReportNo,'') FROM [dbo].[HJGL_HotProess_Trust] hpt
|
||||
LEFT JOIN [dbo].[HJGL_HotProess_TrustItem] hpti ON hpti.HotProessTrustId=hpt.HotProessTrustId
|
||||
WHERE hpti.WeldJointId=jot.WeldJointId) END) AS HotProessReportNo --热处理报告编号
|
||||
,(CASE (SELECT TOP 1 IsCompleted FROM [dbo].[HJGL_HotProess_TrustItem] hpti
|
||||
WHERE hpti.WeldJointId=jot.WeldJointId) WHEN 1 THEN '完成' WHEN 0 THEN '未完成' ELSE '未热处理' END) AS HotProessResult --热处理检测结果
|
||||
,(CASE (SELECT COUNT(*) FROM [dbo].HJGL_Hard_TrustItem hti
|
||||
WHERE hti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 ISNULL(InspectionNum,'') FROM [dbo].HJGL_Hard_Trust ht
|
||||
LEFT JOIN [dbo].HJGL_Hard_TrustItem hti ON hti.HardTrustID=ht.HardTrustID
|
||||
WHERE hti.WeldJointId=jot.WeldJointId) END) AS HardReportNo --硬度报告编号
|
||||
,(CASE (SELECT TOP 1 IsPass FROM [dbo].HJGL_Hard_TrustItem hti
|
||||
WHERE hti.WeldJointId=jot.WeldJointId) WHEN 1 THEN '合格' WHEN 0 THEN '不合格' ELSE '待检测' END) AS HardResult --硬度检测结果
|
||||
,(CASE (SELECT COUNT(*) FROM [dbo].HJGL_Batch_BatchTrustItem bti
|
||||
WHERE bti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 TrustBatchCode FROM [dbo].HJGL_Batch_BatchTrust bt
|
||||
LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchId=bt.TrustBatchId
|
||||
WHERE bti.WeldJointId=jot.WeldJointId) END) AS TrustBatchCode --委托单编号
|
||||
,(CASE (SELECT COUNT(*) FROM [dbo].HJGL_Batch_NDEItem ndei
|
||||
LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId=ndei.TrustBatchItemId
|
||||
WHERE bti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 ISNULL(NDECode,'') FROM [dbo].HJGL_Batch_NDE nde
|
||||
LEFT JOIN [dbo].HJGL_Batch_NDEItem ndei ON ndei.NDEID=nde.NDEID
|
||||
LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId=ndei.TrustBatchItemId
|
||||
WHERE bti.WeldJointId=jot.WeldJointId) END) AS NDECode --检测单编号
|
||||
,(CASE (SELECT TOP 1 CheckResult FROM [dbo].HJGL_Batch_NDEItem ndei
|
||||
LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId=ndei.TrustBatchItemId
|
||||
WHERE bti.WeldJointId=jot.WeldJointId) WHEN '1' THEN '合格' WHEN '2' THEN '不合格' ELSE '' END) AS CheckResult --检测结果
|
||||
,jot.PipelineId
|
||||
,jot.[JointArea]
|
||||
,jot.[WeldingLocationId]
|
||||
,jot.[HeartNo1]
|
||||
,jot.[HeartNo2]
|
||||
,jot.[IsHotProess]
|
||||
,jot.[WeldingDailyId]
|
||||
,jot.[BackingWelderId]
|
||||
,jot.[CoverWelderId]
|
||||
,jot.WeldingMode
|
||||
,jot.Remark
|
||||
,jot.IsTwoJoint
|
||||
,jot.SubmitMan
|
||||
,jot.AuditMan
|
||||
,jot.AuditDate
|
||||
,WeldingLocation.WeldingLocationCode
|
||||
,CASE WHEN jot.WeldingDailyId IS NULL THEN '否' ELSE '是' END AS IsWelding
|
||||
,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.Base_Unit unit ON unit.UnitId=pipe.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
|
||||
LEFT JOIN SitePerson_Person AS CoverWelder ON CoverWelder.PersonId=jot.CoverWelderId
|
||||
LEFT JOIN dbo.HJGL_WeldingDaily AS daily ON daily.WeldingDailyId=jot.WeldingDailyId
|
||||
LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=pipe.PipingClassId
|
||||
LEFT JOIN dbo.Base_Medium medium ON medium.MediumId = pipe.MediumId
|
||||
LEFT JOIN dbo.Base_DetectionType ndt ON ndt.DetectionTypeId = jot.DetectionTypeId
|
||||
LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = jot.WPQId
|
||||
LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.WeldJointId = jot.WeldJointId
|
||||
LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId
|
||||
|
||||
|
||||
|
||||
GO
|
||||
|
||||
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'流水段' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_Pipeline', @level2type=N'COLUMN',@level2name=N'FlowingSection'
|
||||
GO
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'二次焊口新增类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_WeldJoint', @level2type=N'COLUMN',@level2name=N'TwoJointType'
|
||||
GO
|
||||
@@ -70,6 +70,9 @@ namespace BLL
|
||||
case "3":
|
||||
TypeName = "管道预制加工图";
|
||||
break;
|
||||
case "4":
|
||||
TypeName = "ISO施工轴测图";
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -95,7 +95,8 @@ namespace BLL
|
||||
PreTemperature = weldJoint.PreTemperature,
|
||||
Remark = weldJoint.Remark,
|
||||
IsTwoJoint = weldJoint.IsTwoJoint,
|
||||
SubmitMan = weldJoint.SubmitMan
|
||||
SubmitMan = weldJoint.SubmitMan,
|
||||
TwoJointType=weldJoint.TwoJointType
|
||||
};
|
||||
|
||||
db.HJGL_WeldJoint.InsertOnSubmit(newWeldJoint);
|
||||
@@ -146,6 +147,8 @@ namespace BLL
|
||||
newWeldJoint.Remark = weldJoint.Remark;
|
||||
newWeldJoint.AttachUrl = weldJoint.AttachUrl;
|
||||
newWeldJoint.SubmitMan = weldJoint.SubmitMan;
|
||||
newWeldJoint.TwoJointType = weldJoint.TwoJointType;
|
||||
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -55,7 +55,8 @@
|
||||
</f:TextBox>
|
||||
<f:DropDownList runat="server" ID="DropImportType" Label="文件类别" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
|
||||
<f:ListItem Text="ISO轴测图" Value="0" />
|
||||
<f:ListItem Text="管道预制加工图" Value="3" />
|
||||
<f:ListItem Text="ISO施工轴测图" Value="4" />
|
||||
<f:ListItem Text="管道预制加工图" Value="3" />
|
||||
</f:DropDownList>
|
||||
<f:ToolbarFill runat="server"></f:ToolbarFill>
|
||||
<f:Button ID="btnSearch" ToolTip="查询" Icon="SystemSearch" runat="server" OnClick="btnQuery_Click" Text="查询" Hidden="true">
|
||||
|
||||
@@ -154,7 +154,7 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
from ( select * from HJGL_DataImport a where not exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version<b.Version )) as Import
|
||||
left join Base_DesignProfessional as Design on Design.DesignProfessionalId=Import.DesignProfessionalId
|
||||
left join Person_Persons as Users on Users.PersonId=Import.CreateMan
|
||||
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.ImportType in ('0','3') ";
|
||||
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.ImportType in ('0','3','4') ";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
|
||||
@@ -184,7 +184,7 @@ namespace FineUIPro.Web.HJGL.DataImport
|
||||
from ( select * from HJGL_DataImport a where exists (select 1 from HJGL_DataImport b where a.FileName=b.FileName and a.UnitWorkId=b.UnitWorkId and a.Version<b.Version )) as Import
|
||||
left join Base_DesignProfessional as Design on Design.DesignProfessionalId=Import.DesignProfessionalId
|
||||
left join Person_Persons as Users on Users.PersonId=Import.CreateMan
|
||||
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.FileName=@FileName and Import.ImportType in ('0','3')";
|
||||
where Import.UnitWorkId=@UnitWorkId and Import.ProjectId=@ProjectId and Import.FileName=@FileName and Import.ImportType in ('0','3','4')";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
|
||||
listStr.Add(new SqlParameter("@UnitWorkId", this.tvControlItem.SelectedNodeID));
|
||||
|
||||
@@ -17,8 +17,9 @@
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:DropDownList runat="server" ID="DropImportType" Label="文件类别" ShowRedStar="true" Required="true" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
|
||||
<f:ListItem Text="ISO轴测图" Value="0" />
|
||||
<f:ListItem Text="管道预制加工图" Value="3" />
|
||||
<f:ListItem Text="ISO轴测图" Value="0" />
|
||||
<f:ListItem Text="ISO施工轴测图" Value="4" />
|
||||
<f:ListItem Text="管道预制加工图" Value="3" />
|
||||
</f:DropDownList>
|
||||
<f:DropDownList ID="DropDesignProfessional" runat="server" Label="专业" ShowRedStar="true" AutoSelectFirstItem="true" LabelAlign="Right" AutoPostBack="true" LabelWidth="140px"></f:DropDownList>
|
||||
</Items>
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="焊口台账总览"
|
||||
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="WeldJointId"
|
||||
ClicksToEdit="2" DataIDField="WeldJointId" AllowSorting="true"
|
||||
ClicksToEdit="2" DataIDField="WeldJointId" AllowSorting="true" EnableCheckBoxSelect="true"
|
||||
SortField="UnitWorkCode,PipelineCode,WeldJointCode" OnSort="Grid1_Sort" OnRowClick="Grid1_RowClick" EnableRowClickEvent="true"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
|
||||
EnableTextSelection="True">
|
||||
|
||||
@@ -242,15 +242,16 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.TagNum = "";
|
||||
parameter3D.ButtonType = "0,2.1";
|
||||
parameter3D.ButtonType = "2.1";
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
|
||||
parameter3D.Incomplete_weldjunction = Incomplete_weldjunction;
|
||||
|
||||
|
||||
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
|
||||
{
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
|
||||
parameter3D.Crater_data = "0";
|
||||
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
|
||||
parameter3D.Incomplete_weldjunction = Incomplete_weldjunction;
|
||||
|
||||
}
|
||||
else if (this.tvControlItem.SelectedNode.CommandName == "管线")
|
||||
@@ -258,6 +259,8 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID);
|
||||
if (model != null&&!string.IsNullOrEmpty(model.UnitWorkId))
|
||||
{
|
||||
parameter3D.Crater_data = "1";
|
||||
parameter3D.TagNum = "/" + model.PipelineCode;
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId);
|
||||
|
||||
}
|
||||
@@ -518,16 +521,23 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
|
||||
protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
|
||||
{
|
||||
var q = WeldJointService.GetViewWeldJointById(Grid1.SelectedRowID).PipelineCode;
|
||||
var pipecode = "/" + q;
|
||||
var Id = Grid1.SelectedRowIDArray;
|
||||
List<string> weldjointcodes = new List<string>();
|
||||
foreach (var item in Id)
|
||||
{
|
||||
var WeldJointCode = WeldJointService.GetViewWeldJointById(item).WeldJointCode;
|
||||
weldjointcodes.Add("/" + WeldJointCode);
|
||||
}
|
||||
|
||||
//var q = WeldJointService.GetViewWeldJointById(Grid1.SelectedRowID).PipelineCode;
|
||||
//var pipecode = "/" + q;
|
||||
Model.Parameter3D parameter3D = new Model.Parameter3D();
|
||||
Model.ColorModel colorModel = new Model.ColorModel();
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.TagNum = pipecode;
|
||||
parameter3D.ButtonType = "0,2.1";
|
||||
parameter3D.Completed_weldedjunction = Completed_weldedjunction;
|
||||
parameter3D.Incomplete_weldjunction=Incomplete_weldjunction;
|
||||
parameter3D.TagNum = string.Join(",", weldjointcodes);
|
||||
parameter3D.ButtonType = "2.1";
|
||||
parameter3D.Crater_data = "2";
|
||||
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
|
||||
{
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
|
||||
@@ -76,6 +76,9 @@
|
||||
<f:Button ID="btnSinglePreview" ToolTip="ISO轴测图" Icon="PageRed" Text="ISO轴测图"
|
||||
EnablePostBack="true" OnClick="btnSinglePreview_Click" runat="server">
|
||||
</f:Button>
|
||||
<f:Button ID="btnSinglePreview_2" ToolTip="ISO施工轴测图" Icon="PageRed" Text="ISO施工轴测图"
|
||||
EnablePostBack="true" OnClick="btnSinglePreview_2_Click" runat="server">
|
||||
</f:Button>
|
||||
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Text="导出" Icon="FolderUp"
|
||||
EnableAjax="false" DisableControlBeforePostBack="false">
|
||||
</f:Button>
|
||||
|
||||
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.TagNum = "";
|
||||
parameter3D.ButtonType = "0,2";
|
||||
parameter3D.ButtonType = "2";
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
parameter3D.Line_No = Line_No;
|
||||
parameter3D.Transparency = colorModel.PipelineComplete;
|
||||
@@ -452,7 +452,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.TagNum = pipecode;
|
||||
parameter3D.ButtonType = "0,2";
|
||||
parameter3D.ButtonType = "2";
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
parameter3D.Line_No = Line_No;
|
||||
parameter3D.Transparency = colorModel.PipelineComplete;
|
||||
@@ -463,5 +463,29 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
ctlAuditFlow.data = parameter3D;
|
||||
ctlAuditFlow.BindData();
|
||||
}
|
||||
|
||||
protected void btnSinglePreview_2_Click(object sender, EventArgs e)
|
||||
{
|
||||
var id = Grid1.SelectedRowID;
|
||||
if (string.IsNullOrEmpty(id))
|
||||
{
|
||||
ShowNotify("请选择相对应的ISO施工轴测图", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
var SingleName = (from x in Funs.DB.View_HJGL_Pipeline where x.PipelineId == id select (x.SingleName)).FirstOrDefault();
|
||||
var filemodel = BLL.HJGL_DataImportService.GetLatestFileByFileName(SingleName, "4", this.CurrUser.LoginProjectId);
|
||||
if (filemodel != null)
|
||||
{
|
||||
string httpUrl = filemodel.FilePath;
|
||||
PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/AttachFile/Look.aspx?fileUrl={0}", httpUrl, "查看 -")));
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
ShowNotify("请上传相关ISO施工轴测图", MessageBoxIcon.Warning);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -185,6 +185,15 @@ namespace FineUIPro.Web.HJGL.InfoQuery
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSinglePreview;
|
||||
|
||||
/// <summary>
|
||||
/// btnSinglePreview_2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSinglePreview_2;
|
||||
|
||||
/// <summary>
|
||||
/// btnOut 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -157,7 +157,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.TagNum = "";
|
||||
parameter3D.ButtonType = "0,1";
|
||||
parameter3D.ButtonType = "1";
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
parameter3D.Line_No = Line_No;
|
||||
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
|
||||
@@ -279,7 +279,7 @@ namespace FineUIPro.Web.HJGL.PreDesign
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.TagNum = pipecode;
|
||||
parameter3D.ButtonType = "0,1";
|
||||
parameter3D.ButtonType = "1";
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
parameter3D.Line_No = Line_No;
|
||||
|
||||
|
||||
@@ -236,7 +236,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.TagNum = "";
|
||||
parameter3D.ButtonType = "0,4";
|
||||
parameter3D.ButtonType = "4";
|
||||
parameter3D.Line_No = Line_No;
|
||||
|
||||
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
|
||||
@@ -578,7 +578,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.TagNum = pipecode;
|
||||
parameter3D.ButtonType = "0,4";
|
||||
parameter3D.ButtonType = "4";
|
||||
parameter3D.Line_No = Line_No;
|
||||
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
|
||||
{
|
||||
|
||||
@@ -46,6 +46,10 @@
|
||||
EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
|
||||
Width="240px" LabelWidth="80px" LabelAlign="Right">
|
||||
</f:TextBox>
|
||||
<f:DropDownList runat="server" ID="DropTwoJointType" Label="二次新增类型" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
||||
<f:ListItem Text="新增口" Value="新增口" />
|
||||
<f:ListItem Text="修改口" Value="修改口" />
|
||||
</f:DropDownList>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="btnSelectColumn" Text="选择显示列" Icon="ShapesManySelect"
|
||||
@@ -105,6 +109,9 @@
|
||||
<f:RenderField HeaderText="焊口号" ColumnID="WeldJointCode" DataField="WeldJointCode" SortField="WeldJointCode" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="100px" Locked="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="二次新增类型" ColumnID="TwoJointType" DataField="TwoJointType" SortField="TwoJointType" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="100px" Locked="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField HeaderText="材质1" ColumnID="Material1Code" DataField="Material1Code" SortField="Material1Code" FieldType="String" HeaderTextAlign="Center"
|
||||
TextAlign="Left" Width="90px">
|
||||
</f:RenderField>
|
||||
|
||||
@@ -16,6 +16,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
if (!IsPostBack)
|
||||
{
|
||||
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
|
||||
Funs.FineUIPleaseSelect(DropTwoJointType, "请选择");
|
||||
this.InitTreeMenu();//加载树
|
||||
|
||||
}
|
||||
@@ -197,7 +198,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"SELECT WeldJointId,WeldJointCode,PipelineId,PipelineCode,JointAttribute,
|
||||
string strSql = @"SELECT WeldJointId,WeldJointCode,PipelineId,PipelineCode,JointAttribute,TwoJointType,
|
||||
ComponentsCode1,ComponentsCode2,IsWelding,IsHotProessStr,Material1Code,Material2Code,
|
||||
WeldTypeCode,Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode,
|
||||
WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
|
||||
@@ -218,6 +219,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
strSql += " AND WeldJointCode LIKE @WeldJointCode";
|
||||
listStr.Add(new SqlParameter("@WeldJointCode", "%" + this.txtWeldJointCode.Text.Trim() + "%"));
|
||||
}
|
||||
if (DropTwoJointType.SelectedValue!=BLL.Const._Null)
|
||||
{
|
||||
strSql += " AND TwoJointType = @TwoJointType";
|
||||
listStr.Add(new SqlParameter("@TwoJointType", DropTwoJointType.SelectedValue));
|
||||
}
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
||||
@@ -826,5 +832,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
}
|
||||
@@ -113,6 +113,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtWeldJointCode;
|
||||
|
||||
/// <summary>
|
||||
/// DropTwoJointType 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList DropTwoJointType;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -61,6 +61,10 @@
|
||||
CompareMessage="止数应大于等于起数" CompareOperator="GreaterThanEqual"
|
||||
ShowRedStar="true" Required="true" LabelWidth="100px">
|
||||
</f:NumberBox>
|
||||
<f:DropDownList runat="server" ID="DropTwoJointType" Label="二次新增类型" LabelAlign="Right" LabelWidth="100px" AutoPostBack="true">
|
||||
<f:ListItem Text="新增口" Value="新增口" />
|
||||
<f:ListItem Text="修改口" Value="修改口" />
|
||||
</f:DropDownList>
|
||||
<%-- <f:TextBox ID="txtZhanwei"
|
||||
runat="server" LabelWidth="100px" Hidden="true">
|
||||
</f:TextBox>--%>
|
||||
@@ -103,6 +107,7 @@
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
|
||||
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" runat="server" Hidden="true"
|
||||
LabelWidth="100px" LabelAlign="Right">
|
||||
</f:DropDownList>
|
||||
|
||||
@@ -37,6 +37,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
BLL.Base_WeldingMethodService.InitWeldingMethodDropDownList(this.drpWeldingMethodId, true, "请选择");//焊接方法
|
||||
BLL.Base_ConsumablesService.InitConsumablesDropDownList(this.drpWeldingRod, true, "2", "请选择");//焊丝类型
|
||||
BLL.Base_ConsumablesService.InitConsumablesDropDownList(this.drpWeldingWire, true, "1", "请选择");//焊条类型
|
||||
Funs.FineUIPleaseSelect(DropTwoJointType, "请选择");
|
||||
|
||||
// 焊口属性
|
||||
this.drpJointAttribute.DataTextField = "Text";
|
||||
@@ -98,6 +99,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
drpWeldTypeCode.SelectedValue = joint.WeldTypeId;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(joint.TwoJointType))
|
||||
{
|
||||
DropTwoJointType.SelectedValue = joint.TwoJointType;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(joint.DetectionTypeId))
|
||||
{
|
||||
List<Model.Base_DetectionType> dList = new List<Model.Base_DetectionType>();
|
||||
@@ -319,6 +324,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
joint.WeldTypeId = drpWeldTypeCode.SelectedValue;
|
||||
}
|
||||
if (this.DropTwoJointType.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
joint.TwoJointType = DropTwoJointType.SelectedValue;
|
||||
}
|
||||
joint.PreTemperature = this.txtPreTemperature.Text;
|
||||
joint.Specification = this.txtSpecification.Text;
|
||||
//var DetectionType = BLL.Base_DetectionTypeService.GetDetectionTypeIdByDetectionTypeCode(this.txtDetectionTypeId.Text.Trim());
|
||||
|
||||
@@ -140,6 +140,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.NumberBox txtWeldJointCode2;
|
||||
|
||||
/// <summary>
|
||||
/// DropTwoJointType 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList DropTwoJointType;
|
||||
|
||||
/// <summary>
|
||||
/// drpMaterial1 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -90,7 +90,10 @@
|
||||
<f:TextBox ID="txtRemark" runat="server" Label="备注" MaxLength="200" LabelAlign="Right"
|
||||
LabelWidth="100px">
|
||||
</f:TextBox>
|
||||
<f:Label runat="server"></f:Label>
|
||||
<f:DropDownList runat="server" ID="DropTwoJointType" Label="二次新增类型" LabelAlign="Right" LabelWidth="140px" AutoPostBack="true">
|
||||
<f:ListItem Text="新增口" Value="新增口" />
|
||||
<f:ListItem Text="修改口" Value="修改口" />
|
||||
</f:DropDownList>
|
||||
<f:Label runat="server"></f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
|
||||
@@ -38,6 +38,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
BLL.Base_WeldingMethodService.InitWeldingMethodDropDownList(this.drpWeldingMethodId, true, "请选择");//焊接方法
|
||||
BLL.Base_ConsumablesService.InitConsumablesDropDownList(this.drpWeldingRod, true, "2", "请选择");//焊丝类型
|
||||
BLL.Base_ConsumablesService.InitConsumablesDropDownList(this.drpWeldingWire, true, "1", "请选择");//焊条类型
|
||||
Funs.FineUIPleaseSelect(DropTwoJointType, "请选择");
|
||||
|
||||
// 焊口属性
|
||||
//this.drpJointAttribute.DataTextField = "Text";
|
||||
@@ -121,6 +122,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
drpWeldTypeCode.SelectedValue = joint.WeldTypeId;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(joint.TwoJointType))
|
||||
{
|
||||
DropTwoJointType.SelectedValue = joint.TwoJointType;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(joint.DetectionTypeId))
|
||||
{
|
||||
List<Model.Base_DetectionType> dList = new List<Model.Base_DetectionType>();
|
||||
@@ -379,6 +384,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
{
|
||||
joint.WeldTypeId = drpWeldTypeCode.SelectedValue;
|
||||
}
|
||||
if (this.DropTwoJointType.SelectedValue != BLL.Const._Null)
|
||||
{
|
||||
joint.TwoJointType = DropTwoJointType.SelectedValue;
|
||||
}
|
||||
joint.PreTemperature = this.txtPreTemperature.Text;
|
||||
joint.Specification = this.txtSpecification.Text;
|
||||
//var DetectionType = BLL.Base_DetectionTypeService.GetDetectionTypeIdByDetectionTypeCode(this.txtDetectionTypeId.Text.Trim());
|
||||
|
||||
@@ -221,6 +221,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtRemark;
|
||||
|
||||
/// <summary>
|
||||
/// DropTwoJointType 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList DropTwoJointType;
|
||||
|
||||
/// <summary>
|
||||
/// GroupPanel2 控件。
|
||||
/// </summary>
|
||||
|
||||
@@ -212,7 +212,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.TagNum = "";
|
||||
parameter3D.ButtonType = "0,3";
|
||||
parameter3D.ButtonType = "3";
|
||||
|
||||
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
|
||||
{
|
||||
@@ -350,7 +350,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
|
||||
Model.ColorModel colorModel = new Model.ColorModel();
|
||||
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
|
||||
parameter3D.ColorModel = colorModel;
|
||||
parameter3D.ButtonType = "0,3";
|
||||
parameter3D.ButtonType = "3";
|
||||
if (this.tvControlItem.SelectedNode.CommandName == "单位工程")
|
||||
{
|
||||
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
|
||||
|
||||
@@ -47,7 +47,12 @@ namespace Model
|
||||
/// <summary>
|
||||
/// 未完成颜色
|
||||
/// </summary>
|
||||
public string Incomplete_color { get; set; }
|
||||
public string Incomplete_color { get; set; }
|
||||
/// <summary>
|
||||
/// 焊口台账中点击状态0、1、2(主项、管线、焊口)
|
||||
/// </summary>
|
||||
public string Crater_data { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 颜色模型
|
||||
/// </summary>
|
||||
|
||||
@@ -73282,6 +73282,8 @@ namespace Model
|
||||
|
||||
private System.Nullable<int> _State;
|
||||
|
||||
private string _FlowingSection;
|
||||
|
||||
private EntityRef<Base_TestMedium> _Base_TestMedium;
|
||||
|
||||
private EntitySet<HJGL_Batch_PointBatch> _HJGL_Batch_PointBatch;
|
||||
@@ -73386,6 +73388,8 @@ namespace Model
|
||||
partial void OnIsFinishedChanged();
|
||||
partial void OnStateChanging(System.Nullable<int> value);
|
||||
partial void OnStateChanged();
|
||||
partial void OnFlowingSectionChanging(string value);
|
||||
partial void OnFlowingSectionChanged();
|
||||
#endregion
|
||||
|
||||
public HJGL_Pipeline()
|
||||
@@ -74087,6 +74091,26 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FlowingSection", DbType="NVarChar(200)")]
|
||||
public string FlowingSection
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._FlowingSection;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._FlowingSection != value))
|
||||
{
|
||||
this.OnFlowingSectionChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._FlowingSection = value;
|
||||
this.SendPropertyChanged("FlowingSection");
|
||||
this.OnFlowingSectionChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_[HJGL_Pipeline_Base_TestMedium1", Storage="_Base_TestMedium", ThisKey="LeakMedium", OtherKey="TestMediumId", IsForeignKey=true)]
|
||||
public Base_TestMedium Base_TestMedium
|
||||
{
|
||||
@@ -77363,6 +77387,8 @@ namespace Model
|
||||
|
||||
private string _MatchableWPQ;
|
||||
|
||||
private string _TwoJointType;
|
||||
|
||||
private EntitySet<HJGL_Batch_BatchTrustItem> _HJGL_Batch_BatchTrustItem;
|
||||
|
||||
private EntitySet<HJGL_Batch_PointBatchItem> _HJGL_Batch_PointBatchItem;
|
||||
@@ -77497,6 +77523,8 @@ namespace Model
|
||||
partial void OnAuditDateChanged();
|
||||
partial void OnMatchableWPQChanging(string value);
|
||||
partial void OnMatchableWPQChanged();
|
||||
partial void OnTwoJointTypeChanging(string value);
|
||||
partial void OnTwoJointTypeChanged();
|
||||
#endregion
|
||||
|
||||
public HJGL_WeldJoint()
|
||||
@@ -78446,6 +78474,26 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TwoJointType", DbType="NVarChar(100)")]
|
||||
public string TwoJointType
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._TwoJointType;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._TwoJointType != value))
|
||||
{
|
||||
this.OnTwoJointTypeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._TwoJointType = value;
|
||||
this.SendPropertyChanged("TwoJointType");
|
||||
this.OnTwoJointTypeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user