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

2022-11-03 焊接修改，二次焊口设计增加新增焊口类型

Browse Source
This commit is contained in:
李鹏飞
2022-11-03 17:39:51 +08:00
parent eeddc36939
commit 31e416c302
25 changed files with 375 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx
+2 -1
View File
@@ -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">
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImport.aspx.cs
+2 -2
View File
@@ -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));
SGGL/FineUIPro.Web/HJGL/DataImport/DrawingImportEdit.aspx
+3 -2
View File
@@ -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>
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx
+1 -1
View File
@@ -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">
SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs
+20 -10
View File
@@ -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);
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx
+3
View File
@@ -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>
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.cs
+26 -2
View File
@@ -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;
}
}
}
}
SGGL/FineUIPro.Web/HJGL/InfoQuery/PipelineQuery.aspx.designer.cs
Generated
+9
View File
@@ -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>
SGGL/FineUIPro.Web/HJGL/PreDesign/PipelingDivide.aspx.cs
+2 -2
View File
@@ -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;
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageEdit.aspx.cs
+2 -2
View File
@@ -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 == "单位工程")
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx
+7
View File
@@ -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>
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.cs
+8 -1
View File
@@ -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
}
}
SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs
Generated
+9
View File
@@ -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>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx
+5
View File
@@ -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>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.cs
+9
View File
@@ -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());
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.designer.cs
Generated
+9
View File
@@ -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>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx
+4 -1
View File
@@ -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>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs
+9
View File
@@ -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());
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs
Generated
+9
View File
@@ -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>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+2 -2
View File
@@ -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);