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

2011-10-19 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-10-19 15:49:56 +08:00
parent 6e363ef6ae
commit b7a43a4130
26 changed files with 444 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/WeldingManage/PipelineFinish.aspx
+2 -2
View File
@@ -46,12 +46,12 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtPlanStartDate" Label="计划开始时间" runat="server" LabelWidth="120px"></f:DatePicker>
<f:DatePicker ID="txtPlanStartDate" Label="计划开始日期(安装)" runat="server" LabelWidth="120px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker ID="txtPlanEndDate" Label="计划完成时间" runat="server" LabelWidth="120px"></f:DatePicker>
<f:DatePicker ID="txtPlanEndDate" Label="计划完成日期(安装)" runat="server" LabelWidth="120px"></f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx
+2 -2
View File
@@ -103,7 +103,7 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" runat="server"
<f:DropDownList ID="drpJointAttribute" Label="焊口属性" runat="server" Hidden="true"
LabelWidth="100px" LabelAlign="Right">
</f:DropDownList>
<%-- <f:DropDownList ID="drpComponent1" Label="组件1号" runat="server"
@@ -112,7 +112,7 @@
<f:DropDownList ID="drpComponent2" Label="组件2号" runat="server"
LabelWidth="100px" LabelAlign="Right">
</f:DropDownList>--%>
<f:DropDownList ID="drpDesignIsHotProess" runat="server" Label="是否热处理" LabelAlign="Right"
<f:DropDownList ID="drpDesignIsHotProess" runat="server" Label="是否热处理" LabelAlign="Right" Hidden="true"
LabelWidth="100px" AutoPostBack="true" OnSelectedIndexChanged="drpDesignIsHotProess_SelectedIndexChanged">
<f:ListItem Value="False" Text="否" Selected="true" />
<f:ListItem Value="True" Text="是" />
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointBatchEdit.aspx.cs
+27 -22
View File
@@ -50,6 +50,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
//Funs.FineUIPleaseSelect(this.drpDetectionTypeId);
string weldJointId = Request.Params["WeldJointId"];
string isTwoJoint = Request.Params["IsTwoJoint"];
GroupPanel2.Hidden = true;
if (!string.IsNullOrEmpty(weldJointId))
{
@@ -233,7 +234,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// </summary>
private void SaveData()
{
if (this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.hdWeldingMethodId.Text) || string.IsNullOrEmpty(this.txtWpqId.Text.Trim()))
// if (this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.hdWeldingMethodId.Text) || string.IsNullOrEmpty(this.txtWpqId.Text.Trim()))
if (string.IsNullOrEmpty(this.txtWeldJointCode.Text.Trim()) || this.drpPipingClass.SelectedValue == BLL.Const._Null || this.drpMaterial1.SelectedValue == BLL.Const._Null || this.drpMaterial2.SelectedValue == BLL.Const._Null || this.drpWeldTypeCode.SelectedValue == BLL.Const._Null)
{
Alert.ShowInTop("页面必填项不能为空", MessageBoxIcon.Warning);
Alert.ShowInTop("请完善必填项！", MessageBoxIcon.Warning);
@@ -266,11 +269,11 @@ namespace FineUIPro.Web.HJGL.WeldingManage
}
else
{
if (this.txtWeldJointCode.Text.Contains("G"))
{
Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning);
return;
}
//if (this.txtWeldJointCode.Text.Contains("G"))
//{
// Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning);
// return;
//}
joint.WeldJointCode = this.txtWeldJointCode.Text;
}
@@ -323,26 +326,28 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
joint.DetectionTypeId = this.drpDetectionTypeId.SelectedValue;
}
bool flag = false;
if (Convert.ToBoolean(drpDesignIsHotProess.SelectedValue))
{
flag = true;
}
if (flag)
{
joint.IsHotProess = true;
}
else
{
joint.IsHotProess = false;
}
//bool flag = false;
//if (Convert.ToBoolean(drpDesignIsHotProess.SelectedValue))
//{
// flag = true;
//}
//if (flag)
//{
// joint.IsHotProess = true;
//}
//else
//{
// joint.IsHotProess = false;
//}
//joint.IsHotProess = Convert.ToBoolean(drpIsHotProess.SelectedValue);
//joint.DesignIsHotProess = Convert.ToBoolean(drpDesignIsHotProess.SelectedValue);
joint.Remark = txtRemark.Text.Trim();
joint.SubmitMan = CurrUser.PersonId;
if (!string.IsNullOrEmpty(this.txtWpqId.Text))
{
joint.WPQId = this.txtWpqId.Text;
}
joint.IsHotProess = Convert.ToBoolean(drpIsHotProess.SelectedValue);
joint.DesignIsHotProess = Convert.ToBoolean(drpDesignIsHotProess.SelectedValue);
joint.Remark = txtRemark.Text.Trim();
if (Request.Params["IsTwoJoint"] == "1")
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs
+8 -8
View File
@@ -313,8 +313,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
joint.PipelineCode = txtPipelineCode.Text.Trim();
joint.ProjectId = this.CurrUser.LoginProjectId;
if (!this.txtWeldJointCode.Text.Contains("G"))
{
//if (!this.txtWeldJointCode.Text.Contains("G"))
//{
int jointCode = Funs.GetNewIntOrZero(this.txtWeldJointCode.Text.Trim());
if (jointCode != 0)
{
@@ -331,12 +331,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
joint.WeldJointCode = this.txtWeldJointCode.Text;
}
}
else
{
Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning);
return;
}
//}
//else
//{
// Alert.ShowInTop("焊口编号不能包含G！", MessageBoxIcon.Warning);
// return;
//}
if (this.drpMaterial1.SelectedValue != BLL.Const._Null)
{
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatch.aspx.cs
+15 -1
View File
@@ -195,6 +195,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID))
{
Model.HJGL_Pipeline pipeline = BLL.PipelineService.GetPipelineByPipelineId(this.tvControlItem.SelectedNodeID);
this.hdUnitWorkId.Text = string.Empty;
if (pipeline != null)
@@ -202,7 +203,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.hdUnitWorkId.Text = this.tvControlItem.SelectedNode.ParentNode.NodeID;
this.BindGrid();
}
lbPlanStartDate.Text = pipeline.PlanStartDate.HasValue ? pipeline.PlanStartDate.Value.ToShortDateString() : "";
if (PipeArea == PipelineService.PipeArea_SHOP)
{
var list= BLL.HJGL_PipelineComponentService.GetComponentByPipelineId(pipeline.PipelineId);
if (list!=null&&list.Count()>0)
{
lbPlanStartDate.Text = list.First().PlanStartDate.ToString () ;
}
}
else if (PipeArea == PipelineService.PipeArea_FIELD)
{
lbPlanStartDate.Text = pipeline.PlanStartDate.HasValue ? pipeline.PlanStartDate.Value.ToShortDateString() : "";
}
//if (pipeline.PlanStartDate.HasValue && pipeline.ActStartDate.HasValue)
//{
// if (pipeline.ActStartDate < pipeline.PlanStartDate)
SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldingPlan.aspx.cs
+2 -2
View File
@@ -124,7 +124,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = "";
parameter3D.ButtonType = "0,1";
parameter3D.ButtonType = "0";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
@@ -294,7 +294,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId);
parameter3D.ColorModel = colorModel;
parameter3D.TagNum = pipecode;
parameter3D.ButtonType = "0,1";
parameter3D.ButtonType = "0";
parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID);
ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId) + "item/IPE%7CVPD%7C" + parameter3D.ModelName;
ctlAuditFlow.data = parameter3D;