shecs/Basf_TCC11
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

11

Browse Source
This commit is contained in:
佘春生
2024-06-05 08:24:19 +08:00
parent 1677a6d714
commit 3990f747ce
67 changed files with 6774 additions and 1645 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/GetWdldingDailyItem.ashx.cs
+3 -1
View File
@@ -30,7 +30,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
viewWeldlines[i].WeldTypeCode,
viewWeldlines[i].JointAttribute,
viewWeldlines[i].WeldingLocationCode,
viewWeldlines[i].DoneDin,
viewWeldlines[i].Size,
viewWeldlines[i].Dia,
viewWeldlines[i].Thickness,
viewWeldlines[i].WeldingMethodCode,
@@ -38,7 +38,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
viewWeldlines[i].Material2Code,
viewWeldlines[i].ComponentsCode1,
viewWeldlines[i].ComponentsCode2,
viewWeldlines[i].Coode1,
viewWeldlines[i].HeartNo1,
viewWeldlines[i].Coode2,
viewWeldlines[i].HeartNo2,
weldSilkCodes,
viewWeldlines[i].WeldMatCode,
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfo.aspx
+2 -2
View File
@@ -139,10 +139,10 @@
DataField="Thickness" SortField="Thickness" FieldType="Double" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,CompletedDI %>" ColumnID="DoneDin" DataField="DoneDin"
<%-- <f:RenderField HeaderText="<%$ Resources:Lan,CompletedDI %>" ColumnID="DoneDin" DataField="DoneDin"
SortField="DoneDin" FieldType="Double" HeaderTextAlign="Center" TextAlign="Left"
Width="90px">
</f:RenderField>
</f:RenderField>--%>
<f:RenderField HeaderText="<%$ Resources:Lan,Component1 %>" ColumnID="ComponentsCode1"
DataField="ComponentsCode1" SortField="ComponentsCode1" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="90px">
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx
+2 -2
View File
@@ -69,11 +69,11 @@
</f:DropDownList>
<f:NumberBox ID="txtDia" Label="<%$ Resources:Lan,ExternalDiameter %>" runat="server"
LabelWidth="130px" DecimalPrecision="4" NoNegative="true" ShowRedStar="true"
Required="true" Readonly="true">
AutoPostBack="true" OnTextChanged="txtText_TextChanged" Required="true" Readonly="true">
</f:NumberBox>
<f:NumberBox ID="txtThickness" Label="<%$ Resources:Lan,WallThickness %>" runat="server"
LabelWidth="130px" DecimalPrecision="4" NoNegative="true" ShowRedStar="true"
Required="true" Readonly="true">
AutoPostBack="true" OnTextChanged="txtText_TextChanged" Required="true" Readonly="true">
</f:NumberBox>
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoBatchEdit.aspx.cs
+164 -126
View File
@@ -95,7 +95,6 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
this.drpWeldingLocation.DataSource = from x in Funs.DB.Base_WeldingLocation orderby x.WeldingLocationCode select x;
this.drpWeldingLocation.DataBind();
///是否热处理
this.drpIsHotProess.DataValueField = "Value";
this.drpIsHotProess.DataTextField = "Text";
@@ -192,7 +191,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (this.drpJointAttribute.SelectedValue != BLL.Const._Null)
{
newJointInfo.JointAttribute = this.drpJointAttribute.SelectedValue;
if (this.drpJointAttribute.SelectedValue == "活动S")
if (this.drpJointAttribute.SelectedValue == "S")
{
newJointInfo.JointArea = "S";
}
@@ -331,136 +330,155 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (dn.Count() > 0)
{
if (dn.First().OutSizeDia != null)
if (ansi != "FB")
{
dia = dn.First().OutSizeDia.ToString();
}
txtDia.Readonly = true;
txtThickness.Readonly = true;
if (dn.First().OutSizeDia != null)
{
dia = dn.First().OutSizeDia.ToString();
}
if (ansi == "5")
{
if (dn.First().SCH5 != null)
if (ansi == "5")
{
sch = dn.First().SCH5.ToString();
if (dn.First().SCH5 != null)
{
sch = dn.First().SCH5.ToString();
}
}
if (ansi == "5S")
{
if (dn.First().SCH5S != null)
{
sch = dn.First().SCH5S.ToString();
}
}
if (ansi == "10")
{
if (dn.First().SCH10 != null)
{
sch = dn.First().SCH10.ToString();
}
}
if (ansi == "10S")
{
if (dn.First().SCH10S != null)
{
sch = dn.First().SCH10S.ToString();
}
}
if (ansi == "20")
{
if (dn.First().SCH20 != null)
{
sch = dn.First().SCH20.ToString();
}
}
if (ansi == "30")
{
if (dn.First().SCH30 != null)
{
sch = dn.First().SCH30.ToString();
}
}
if (ansi == "40")
{
if (dn.First().SCH40 != null)
{
sch = dn.First().SCH40.ToString();
}
}
if (ansi == "40S")
{
if (dn.First().SCH40S != null)
{
sch = dn.First().SCH40S.ToString();
}
}
if (ansi == "STD")
{
if (dn.First().STD != null)
{
sch = dn.First().STD.ToString();
}
}
if (ansi == "60")
{
if (dn.First().SCH60 != null)
{
sch = dn.First().SCH60.ToString();
}
}
if (ansi == "80")
{
if (dn.First().SCH80 != null)
{
sch = dn.First().SCH80.ToString();
}
}
if (ansi == "80S")
{
if (dn.First().SCH80S != null)
{
sch = dn.First().SCH80S.ToString();
}
}
if (ansi == "XS")
{
if (dn.First().XS != null)
{
sch = dn.First().XS.ToString();
}
}
if (ansi == "100")
{
if (dn.First().SCH100 != null)
{
sch = dn.First().SCH100.ToString();
}
}
if (ansi == "120")
{
if (dn.First().SCH120 != null)
{
sch = dn.First().SCH120.ToString();
}
}
if (ansi == "140")
{
if (dn.First().SCH140 != null)
{
sch = dn.First().SCH140.ToString();
}
}
if (ansi == "160")
{
if (dn.First().SCH160 != null)
{
sch = dn.First().SCH160.ToString();
}
}
if (ansi == "XXS")
{
if (dn.First().XXS != null)
{
sch = dn.First().XXS.ToString();
}
}
}
if (ansi == "5S")
else // 非美标FB
{
if (dn.First().SCH5S != null)
{
sch = dn.First().SCH5S.ToString();
}
}
if (ansi == "10")
{
if (dn.First().SCH10 != null)
{
sch = dn.First().SCH10.ToString();
}
}
if (ansi == "10S")
{
if (dn.First().SCH10S != null)
{
sch = dn.First().SCH10S.ToString();
}
}
if (ansi == "20")
{
if (dn.First().SCH20 != null)
{
sch = dn.First().SCH20.ToString();
}
}
if (ansi == "30")
{
if (dn.First().SCH30 != null)
{
sch = dn.First().SCH30.ToString();
}
}
if (ansi == "40")
{
if (dn.First().SCH40 != null)
{
sch = dn.First().SCH40.ToString();
}
}
if (ansi == "40S")
{
if (dn.First().SCH40S != null)
{
sch = dn.First().SCH40S.ToString();
}
}
if (ansi == "STD")
{
if (dn.First().STD != null)
{
sch = dn.First().STD.ToString();
}
}
if (ansi == "60")
{
if (dn.First().SCH60 != null)
{
sch = dn.First().SCH60.ToString();
}
}
if (ansi == "80")
{
if (dn.First().SCH80 != null)
{
sch = dn.First().SCH80.ToString();
}
}
if (ansi == "80S")
{
if (dn.First().SCH80S != null)
{
sch = dn.First().SCH80S.ToString();
}
}
if (ansi == "XS")
{
if (dn.First().XS != null)
{
sch = dn.First().XS.ToString();
}
}
if (ansi == "100")
{
if (dn.First().SCH100 != null)
{
sch = dn.First().SCH100.ToString();
}
}
if (ansi == "120")
{
if (dn.First().SCH120 != null)
{
sch = dn.First().SCH120.ToString();
}
}
if (ansi == "140")
{
if (dn.First().SCH140 != null)
{
sch = dn.First().SCH140.ToString();
}
}
if (ansi == "160")
{
if (dn.First().SCH160 != null)
{
sch = dn.First().SCH160.ToString();
}
}
if (ansi == "XXS")
{
if (dn.First().XXS != null)
{
sch = dn.First().XXS.ToString();
}
txtDia.Readonly = false;
txtThickness.Readonly = false;
//if (dn.First().OutSize_FB != null)
//{
// dia = dn.First().OutSize_FB.ToString();
//}
//if (dn.First().SCH_FB != null)
//{
// sch = dn.First().SCH_FB.ToString();
//}
}
if (!string.IsNullOrEmpty(dia))
@@ -478,6 +496,26 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
}
}
/// <summary>
/// 选择外径和壁厚自动获取规格
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtText_TextChanged(object sender, EventArgs e)
{
string dn = string.Empty;
string s = string.Empty;
if (!string.IsNullOrEmpty(this.txtDia.Text.Trim()))
{
dn = this.txtDia.Text.Trim();
if (!string.IsNullOrEmpty(this.txtThickness.Text.Trim()))
{
this.txtSpecification.Text = "Φ" + dn + "×" + this.txtThickness.Text.Trim();
}
}
}
#endregion
}
}
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx
+30 -27
View File
@@ -63,10 +63,10 @@
<f:DropDownList ID="drpANSISCH" Label="美标壁厚" AutoPostBack="true" OnSelectedIndexChanged="drpANSISCH_OnSelectedIndexChanged"
runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="130px">
</f:DropDownList>
<f:NumberBox ID="txtDia" Label="<%$ Resources:Lan,ExternalDiameter %>" runat="server"
<f:NumberBox ID="txtDia" Label="<%$ Resources:Lan,ExternalDiameter %>" runat="server" AutoPostBack="true" OnTextChanged="txtText_TextChanged"
LabelWidth="130px" DecimalPrecision="4" NoNegative="true" ShowRedStar="true" Required="true" Readonly="true">
</f:NumberBox>
<f:NumberBox ID="txtThickness" Label="<%$ Resources:Lan,WallThickness %>" runat="server"
<f:NumberBox ID="txtThickness" Label="<%$ Resources:Lan,WallThickness %>" runat="server" AutoPostBack="true" OnTextChanged="txtText_TextChanged"
LabelWidth="130px" DecimalPrecision="4" NoNegative="true" ShowRedStar="true" Required="true"
Readonly="true">
</f:NumberBox>
@@ -109,51 +109,54 @@
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtHeartNo1" Label="<%$ Resources:Lan,BatchNumber1 %>" runat="server"
LabelWidth="130px">
</f:TextBox>
<f:TextBox ID="txtHeartNo2" Label="<%$ Resources:Lan,BatchNumber2 %>" runat="server"
LabelWidth="130px">
</f:TextBox>
<Items>
<f:DropDownList ID="drpCoode1" Label="Coode1" runat="server"
EnableEdit="true" LabelWidth="130px" AutoPostBack="true" OnSelectedIndexChanged="drpCoode1_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpHeartNo1" Label="<%$ Resources:Lan,BatchNumber1 %>" runat="server"
LabelWidth="130px" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpCoode2" Label="Coode2" runat="server"
EnableEdit="true" LabelWidth="130px" AutoPostBack="true" OnSelectedIndexChanged="drpCoode2_SelectedIndexChanged">
</f:DropDownList>
<f:DropDownList ID="drpHeartNo2" Label="<%$ Resources:Lan,BatchNumber2 %>" runat="server"
LabelWidth="130px" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpPipeAssembly1" Label="<%$ Resources:Lan,Component1 %>" runat="server"
EnableEdit="true" LabelWidth="130px">
</f:DropDownList>
<f:DropDownList ID="drpPipeAssembly2" Label="<%$ Resources:Lan,Component2 %>" runat="server"
EnableEdit="true" LabelWidth="130px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpWeldSilk" Label="<%$ Resources:Lan,WeldingWire %>" runat="server"
EnableEdit="true" EnableMultiSelect="true" LabelWidth="130px">
</f:DropDownList>
<f:DropDownList ID="drpWeldMat" Label="<%$ Resources:Lan,Electrode %>" runat="server"
EnableEdit="true" LabelWidth="130px">
</f:DropDownList>
<f:TextBox ID="txtPrepareTemp" Label="预热温度" runat="server" LabelWidth="130px" ></f:TextBox>
<f:CheckBox ID="ckbIsGoldJoint" runat="server" Label="是否黄金口" LabelWidth="130px"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 25% 50% ">
<Items>
<f:FormRow>
<Items>
<f:TextBox ID="txtPrepareTemp" Label="预热温度" runat="server" LabelWidth="130px" ></f:TextBox>
<f:CheckBox ID="ckbIsGoldJoint" runat="server" Label="是否黄金口" LabelWidth="130px"></f:CheckBox>
<f:DropDownList ID="drpNDTType" runat="server" Label="可能探伤类型" LabelWidth="130px" EnableMultiSelect="true" ShowRedStar="true" Required="true"></f:DropDownList>
<f:CheckBox ID="ckbIsCancel" runat="server" Label="是否取消" LabelWidth="130px" ></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="45% 5% 50% ">
<Items>
<f:TextBox ID="txtCancelResult" runat="server" Label="取消原因" LabelWidth="130px" Width="160px"></f:TextBox>
<f:Button ID="btnCancel" Text="取消" ToolTip="如已发生业务可取消，取消时请说明原因，如未发生业务可直接删除！" runat="server"
OnClick="btnCancel_Click">
</f:Button>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="25% 25% 50% ">
<Items>
<f:TextBox ID="txtCoode1" Label="Coode1" runat="server" LabelWidth="130px">
</f:TextBox>
<f:TextBox ID="txtCoode2" Label="Coode2" runat="server" LabelWidth="130px">
</f:TextBox>
<f:TextBox ID="txtRemark" Label="<%$ Resources:Lan,Remark %>" runat="server" LabelWidth="130px">
</f:TextBox>
</Items>
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.cs
+224 -135
View File
@@ -1,6 +1,7 @@
using System;
using BLL;
using System.Linq;
using static System.Windows.Forms.VisualStyles.VisualStyleElement.Header;
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
@@ -125,6 +126,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttributeItem();
this.drpJointAttribute.DataBind();
Funs.FineUIPleaseSelect(this.drpJointAttribute,Resources.Lan.PleaseSelect);
// 物料码
BLL.MaterialCoodeService.InitCoodeDropDownList(this.drpCoode1, this.CurrUser.LoginProjectId, true, Resources.Lan.PleaseSelect);//Coode1
BLL.MaterialCoodeService.InitCoodeDropDownList(this.drpCoode2, this.CurrUser.LoginProjectId, true, Resources.Lan.PleaseSelect);//Coode2
///组件1号
Base_ComponentsService.InitComponentsDropDownList(this.drpPipeAssembly1, true,Resources.Lan.PleaseSelect);
///组件2号
@@ -285,8 +290,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
this.drpWeldingMethod.SelectedValue = jointInfo.WeldingMethodId;
}
this.txtHeartNo1.Text = jointInfo.HeartNo1;
this.txtHeartNo2.Text = jointInfo.HeartNo2;
if (!string.IsNullOrEmpty(jointInfo.GrooveTypeId))
{
this.drpGrooveType.SelectedValue = jointInfo.GrooveTypeId;
@@ -349,8 +353,19 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
this.txtTestPackageNo.Text = jointInfo.TestPackageNo;
this.txtPrepareTemp.Text = jointInfo.PrepareTemp;
txtPageNum.Text = jointInfo.PageNum;
txtCoode1.Text = jointInfo.Coode1;
txtCoode2.Text = jointInfo.Coode2;
if (!string.IsNullOrEmpty(jointInfo.Coode1))
{
drpCoode1.SelectedValue = jointInfo.Coode1;
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo1, drpCoode1.SelectedValue, true, Resources.Lan.PleaseSelect);
drpHeartNo1.SelectedValue = jointInfo.Coode1;
}
if (!string.IsNullOrEmpty(jointInfo.Coode2))
{
drpCoode2.SelectedValue = jointInfo.Coode2;
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo2, drpCoode2.SelectedValue, true, Resources.Lan.PleaseSelect);
drpHeartNo2.SelectedValue = jointInfo.Coode2;
}
this.txtRemark.Text = jointInfo.Remark;
}
}
@@ -429,7 +444,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (this.drpJointAttribute.SelectedValue != BLL.Const._Null)
{
newJointInfo.JointAttribute = this.drpJointAttribute.SelectedValue;
if (this.drpJointAttribute.SelectedValue == "活动S")
if (this.drpJointAttribute.SelectedValue == "S")
{
newJointInfo.JointArea = "S";
}
@@ -468,8 +483,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
newJointInfo.WeldingMethodId = this.drpWeldingMethod.SelectedValue;
}
newJointInfo.HeartNo1 = this.txtHeartNo1.Text.Trim();
newJointInfo.HeartNo2 = this.txtHeartNo2.Text.Trim();
if (this.drpGrooveType.SelectedValue != BLL.Const._Null)
{
newJointInfo.GrooveTypeId = this.drpGrooveType.SelectedValue;
@@ -503,8 +517,24 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
newJointInfo.TestPackageNo = this.txtTestPackageNo.Text.Trim();
newJointInfo.PrepareTemp = this.txtPrepareTemp.Text.Trim();
newJointInfo.PageNum = txtPageNum.Text.Trim();
newJointInfo.Coode1 = txtCoode1.Text.Trim();
newJointInfo.Coode2 = txtCoode2.Text.Trim();
if (drpCoode1.SelectedValue != Const._Null)
{
newJointInfo.Coode1 = drpCoode1.SelectedValue;
}
if (drpHeartNo1.SelectedValue != Const._Null)
{
newJointInfo.HeartNo1 = drpHeartNo1.SelectedValue;
}
if (drpCoode2.SelectedValue != Const._Null)
{
newJointInfo.Coode2=drpCoode2.SelectedValue;
}
if (drpHeartNo2.SelectedValue != Const._Null)
{
newJointInfo.HeartNo2 = drpHeartNo2.SelectedValue;
}
newJointInfo.Remark = this.txtRemark.Text.Trim();
newJointInfo.WPQId = drpWPS.SelectedValue;
newJointInfo.DetectionType = string.Join("|", drpNDTType.SelectedValueArray);
@@ -628,6 +658,24 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
protected void drpCoode1_SelectedIndexChanged(object sender, EventArgs e)
{
if (drpCoode1.SelectedValue != Const._Null)
{
drpHeartNo1.Items.Clear();
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo1, drpCoode1.SelectedValue, true, Resources.Lan.PleaseSelect);//HeartNo1
}
}
protected void drpCoode2_SelectedIndexChanged(object sender, EventArgs e)
{
if (drpCoode2.SelectedValue != Const._Null)
{
drpHeartNo2.Items.Clear();
BLL.MaterialCoodeService.InitHeartNoDropDownList(this.drpHeartNo2, drpCoode2.SelectedValue, true, Resources.Lan.PleaseSelect);//HeartNo2
}
}
#region 外径、壁厚输入框事件
/// <summary>
/// 选择外径和壁厚自动获取规格
@@ -645,136 +693,157 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (dn.Count()>0)
{
if (dn.First().OutSizeDia != null)
if (ansi != "FB")
{
dia = dn.First().OutSizeDia.ToString();
txtDia.Readonly = true;
txtThickness.Readonly = true;
if (dn.First().OutSizeDia != null)
{
dia = dn.First().OutSizeDia.ToString();
}
if (ansi == "5")
{
if (dn.First().SCH5 != null)
{
sch = dn.First().SCH5.ToString();
}
}
if (ansi == "5S")
{
if (dn.First().SCH5S != null)
{
sch = dn.First().SCH5S.ToString();
}
}
if (ansi == "10")
{
if (dn.First().SCH10 != null)
{
sch = dn.First().SCH10.ToString();
}
}
if (ansi == "10S")
{
if (dn.First().SCH10S != null)
{
sch = dn.First().SCH10S.ToString();
}
}
if (ansi == "20")
{
if (dn.First().SCH20 != null)
{
sch = dn.First().SCH20.ToString();
}
}
if (ansi == "30")
{
if (dn.First().SCH30 != null)
{
sch = dn.First().SCH30.ToString();
}
}
if (ansi == "40")
{
if (dn.First().SCH40 != null)
{
sch = dn.First().SCH40.ToString();
}
}
if (ansi == "40S")
{
if (dn.First().SCH40S != null)
{
sch = dn.First().SCH40S.ToString();
}
}
if (ansi == "STD")
{
if (dn.First().STD != null)
{
sch = dn.First().STD.ToString();
}
}
if (ansi == "60")
{
if (dn.First().SCH60 != null)
{
sch = dn.First().SCH60.ToString();
}
}
if (ansi == "80")
{
if (dn.First().SCH80 != null)
{
sch = dn.First().SCH80.ToString();
}
}
if (ansi == "80S")
{
if (dn.First().SCH80S != null)
{
sch = dn.First().SCH80S.ToString();
}
}
if (ansi == "XS")
{
if (dn.First().XS != null)
{
sch = dn.First().XS.ToString();
}
}
if (ansi == "100")
{
if (dn.First().SCH100 != null)
{
sch = dn.First().SCH100.ToString();
}
}
if (ansi == "120")
{
if (dn.First().SCH120 != null)
{
sch = dn.First().SCH120.ToString();
}
}
if (ansi == "140")
{
if (dn.First().SCH140 != null)
{
sch = dn.First().SCH140.ToString();
}
}
if (ansi == "160")
{
if (dn.First().SCH160 != null)
{
sch = dn.First().SCH160.ToString();
}
}
if (ansi == "XXS")
{
if (dn.First().XXS != null)
{
sch = dn.First().XXS.ToString();
}
}
}
if (ansi == "5")
else // 非美标FB
{
if (dn.First().SCH5 != null)
{
sch = dn.First().SCH5.ToString();
}
}
if (ansi == "5S")
{
if (dn.First().SCH5S != null)
{
sch = dn.First().SCH5S.ToString();
}
}
if (ansi == "10")
{
if (dn.First().SCH10 != null)
{
sch = dn.First().SCH10.ToString();
}
}
if (ansi == "10S")
{
if (dn.First().SCH10S != null)
{
sch = dn.First().SCH10S.ToString();
}
}
if (ansi == "20")
{
if (dn.First().SCH20 != null)
{
sch = dn.First().SCH20.ToString();
}
}
if (ansi == "30")
{
if (dn.First().SCH30 != null)
{
sch = dn.First().SCH30.ToString();
}
}
if (ansi == "40")
{
if (dn.First().SCH40 != null)
{
sch = dn.First().SCH40.ToString();
}
}
if (ansi == "40S")
{
if (dn.First().SCH40S != null)
{
sch = dn.First().SCH40S.ToString();
}
}
if (ansi == "STD")
{
if (dn.First().STD != null)
{
sch = dn.First().STD.ToString();
}
}
if (ansi == "60")
{
if (dn.First().SCH60 != null)
{
sch = dn.First().SCH60.ToString();
}
}
if (ansi == "80")
{
if (dn.First().SCH80 != null)
{
sch = dn.First().SCH80.ToString();
}
}
if (ansi == "80S")
{
if (dn.First().SCH80S != null)
{
sch = dn.First().SCH80S.ToString();
}
}
if (ansi == "XS")
{
if (dn.First().XS != null)
{
sch = dn.First().XS.ToString();
}
}
if (ansi == "100")
{
if (dn.First().SCH100 != null)
{
sch = dn.First().SCH100.ToString();
}
}
if (ansi == "120")
{
if (dn.First().SCH120 != null)
{
sch = dn.First().SCH120.ToString();
}
}
if (ansi == "140")
{
if (dn.First().SCH140 != null)
{
sch = dn.First().SCH140.ToString();
}
}
if (ansi == "160")
{
if (dn.First().SCH160 != null)
{
sch = dn.First().SCH160.ToString();
}
}
if (ansi == "XXS")
{
if (dn.First().XXS != null)
{
sch = dn.First().XXS.ToString();
}
txtDia.Readonly = false;
txtThickness.Readonly = false;
//if (dn.First().OutSize_FB != null)
//{
// dia = dn.First().OutSize_FB.ToString();
//}
//if (dn.First().SCH_FB != null)
//{
// sch = dn.First().SCH_FB.ToString();
//}
}
if (!string.IsNullOrEmpty(dia))
@@ -792,6 +861,26 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
}
}
/// <summary>
/// 选择外径和壁厚自动获取规格
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtText_TextChanged(object sender, EventArgs e)
{
string dn = string.Empty;
string s = string.Empty;
if (!string.IsNullOrEmpty(this.txtDia.Text.Trim()))
{
dn = this.txtDia.Text.Trim();
if (!string.IsNullOrEmpty(this.txtThickness.Text.Trim()))
{
this.txtSpecification.Text = "Φ" + dn + "×" + this.txtThickness.Text.Trim();
}
}
}
#endregion
}
}
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointInfoEdit.aspx.designer.cs
Generated
+84 -82
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingManage {
public partial class JointInfoEdit {
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
public partial class JointInfoEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// txtWeldJointCode 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldJointCode;
/// <summary>
/// drpPipingClass 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPipingClass;
/// <summary>
/// drpWeldType 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldType;
/// <summary>
/// txtPipeSegment 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipeSegment;
/// <summary>
/// drpMaterial1 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMaterial1;
/// <summary>
/// drpMaterial2 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMaterial2;
/// <summary>
/// drpWeldingMethod 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldingMethod;
/// <summary>
/// drpJointAttribute 控件。
/// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// txtSize 控件。
/// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtSize;
/// <summary>
/// drpANSISCH 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpANSISCH;
/// <summary>
/// txtDia 控件。
/// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtDia;
/// <summary>
/// txtThickness 控件。
/// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtThickness;
/// <summary>
/// txtSpecification 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSpecification;
/// <summary>
/// drpGrooveType 控件。
/// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpGrooveType;
/// <summary>
/// drpWeldingLocation 控件。
/// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldingLocation;
/// <summary>
/// drpWPS 控件。
/// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWPS;
/// <summary>
/// btnSelectWps 控件。
/// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSelectWps;
/// <summary>
/// txtPageNum 控件。
/// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPageNum;
/// <summary>
/// drpIsHotProess 控件。
/// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpIsHotProess;
/// <summary>
/// txtTestPackageNo 控件。
/// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTestPackageNo;
/// <summary>
/// txtSystemNumber 控件。
/// </summary>
@@ -245,25 +247,43 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtSystemNumber;
/// <summary>
/// txtHeartNo1 控件。
/// drpCoode1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHeartNo1;
protected global::FineUIPro.DropDownList drpCoode1;
/// <summary>
/// txtHeartNo2 控件。
/// drpHeartNo1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHeartNo2;
protected global::FineUIPro.DropDownList drpHeartNo1;
/// <summary>
/// drpCoode2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCoode2;
/// <summary>
/// drpHeartNo2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpHeartNo2;
/// <summary>
/// drpPipeAssembly1 控件。
/// </summary>
@@ -272,7 +292,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPipeAssembly1;
/// <summary>
/// drpPipeAssembly2 控件。
/// </summary>
@@ -281,7 +301,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpPipeAssembly2;
/// <summary>
/// drpWeldSilk 控件。
/// </summary>
@@ -290,7 +310,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldSilk;
/// <summary>
/// drpWeldMat 控件。
/// </summary>
@@ -299,7 +319,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldMat;
/// <summary>
/// txtPrepareTemp 控件。
/// </summary>
@@ -308,7 +328,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPrepareTemp;
/// <summary>
/// ckbIsGoldJoint 控件。
/// </summary>
@@ -317,7 +337,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsGoldJoint;
/// <summary>
/// drpNDTType 控件。
/// </summary>
@@ -326,7 +346,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpNDTType;
/// <summary>
/// ckbIsCancel 控件。
/// </summary>
@@ -335,7 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsCancel;
/// <summary>
/// txtCancelResult 控件。
/// </summary>
@@ -344,7 +364,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCancelResult;
/// <summary>
/// btnCancel 控件。
/// </summary>
@@ -353,25 +373,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnCancel;
/// <summary>
/// txtCoode1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCoode1;
/// <summary>
/// txtCoode2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCoode2;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -380,7 +382,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// SimpleForm2 控件。
/// </summary>
@@ -389,7 +391,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm2;
/// <summary>
/// txtReport 控件。
/// </summary>
@@ -398,7 +400,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtReport;
/// <summary>
/// txtPoint 控件。
/// </summary>
@@ -407,7 +409,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtPoint;
/// <summary>
/// ddlTrustFlag 控件。
/// </summary>
@@ -416,7 +418,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label ddlTrustFlag;
/// <summary>
/// ddlCheckFlag 控件。
/// </summary>
@@ -425,7 +427,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label ddlCheckFlag;
/// <summary>
/// lbUnitName 控件。
/// </summary>
@@ -434,7 +436,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbUnitName;
/// <summary>
/// lbInstallationName 控件。
/// </summary>
@@ -443,7 +445,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbInstallationName;
/// <summary>
/// txtWorkAreaId 控件。
/// </summary>
@@ -452,7 +454,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtWorkAreaId;
/// <summary>
/// txtPipelineCode 控件。
/// </summary>
@@ -461,7 +463,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtPipelineCode;
/// <summary>
/// txtSingleNumber 控件。
/// </summary>
@@ -470,7 +472,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtSingleNumber;
/// <summary>
/// ddlReportCode 控件。
/// </summary>
@@ -479,7 +481,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label ddlReportCode;
/// <summary>
/// txtReportDate 控件。
/// </summary>
@@ -488,7 +490,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtReportDate;
/// <summary>
/// ddlJointStatus 控件。
/// </summary>
@@ -497,7 +499,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label ddlJointStatus;
/// <summary>
/// txtBackingWelder 控件。
/// </summary>
@@ -506,7 +508,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtBackingWelder;
/// <summary>
/// txtBackingWelderName 控件。
/// </summary>
@@ -515,7 +517,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtBackingWelderName;
/// <summary>
/// txtCoverWelder 控件。
/// </summary>
@@ -524,7 +526,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label txtCoverWelder;
/// <summary>
/// txtCoverWelderName 控件。
/// </summary>
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/JointShowColumn.aspx.cs
+22 -22
View File
@@ -16,7 +16,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
if (!IsPostBack)
{
ListItem[] list = new ListItem[32];
ListItem[] list = new ListItem[33];
list[0] = new ListItem(Resources.Lan.WeldingJointNumber, "1");
list[1] = new ListItem(Resources.Lan.WeldedOrNot, "2");
list[2] = new ListItem("焊接工艺(WPS)", "3");
@@ -30,27 +30,27 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
list[10] = new ListItem(Resources.Lan.InchDiameter, "11");
list[11] = new ListItem(Resources.Lan.ExternalDiameter, "12");
list[12] = new ListItem(Resources.Lan.WallThickness, "13");
list[13] = new ListItem(Resources.Lan.CompletedDI, "14");
list[14] = new ListItem(Resources.Lan.Component1, "15");
list[15] = new ListItem(Resources.Lan.Component2, "16");
list[16] = new ListItem(Resources.Lan.Specifications, "17");
list[17] = new ListItem(Resources.Lan.BatchNumber1, "18");
list[18] = new ListItem(Resources.Lan.BatchNumber2, "19");
list[19] = new ListItem(Resources.Lan.BevelType, "20");
list[20] = new ListItem(Resources.Lan.WeldingMethod, "21");
list[21] = new ListItem(Resources.Lan.WeldingWire, "22");
list[22] = new ListItem(Resources.Lan.Electrode, "23");
list[23] = new ListItem(Resources.Lan.WeldingDate, "24");
list[24] = new ListItem(Resources.Lan.DailyNumber, "25");
list[25] = new ListItem(Resources.Lan.FloorWelder, "26");
list[26] = new ListItem(Resources.Lan.CoveringWelder, "27");
list[27] = new ListItem(Resources.Lan.IsHot, "28");
list[28] = new ListItem(Resources.Lan.SystemNumber, "29");
list[29] = new ListItem(Resources.Lan.PressureTestPackageNumber, "30");
list[30] = new ListItem(Resources.Lan.TotalPages, "31");
list[31] = new ListItem(Resources.Lan.Remark, "32");
list[32] = new ListItem("Coode1", "33");
list[33] = new ListItem("Coode2", "34");
//list[13] = new ListItem(Resources.Lan.CompletedDI, "14");
list[13] = new ListItem(Resources.Lan.Component1, "14");
list[14] = new ListItem(Resources.Lan.Component2, "15");
list[15] = new ListItem(Resources.Lan.Specifications, "16");
list[16] = new ListItem(Resources.Lan.BatchNumber1, "17");
list[17] = new ListItem(Resources.Lan.BatchNumber2, "18");
list[18] = new ListItem(Resources.Lan.BevelType, "19");
list[19] = new ListItem(Resources.Lan.WeldingMethod, "20");
list[20] = new ListItem(Resources.Lan.WeldingWire, "21");
list[21] = new ListItem(Resources.Lan.Electrode, "22");
list[22] = new ListItem(Resources.Lan.WeldingDate, "23");
list[23] = new ListItem(Resources.Lan.DailyNumber, "24");
list[24] = new ListItem(Resources.Lan.FloorWelder, "25");
list[25] = new ListItem(Resources.Lan.CoveringWelder, "26");
list[26] = new ListItem(Resources.Lan.IsHot, "27");
list[27] = new ListItem(Resources.Lan.SystemNumber, "28");
list[28] = new ListItem(Resources.Lan.PressureTestPackageNumber, "29");
list[29] = new ListItem(Resources.Lan.TotalPages, "30");
list[30] = new ListItem(Resources.Lan.Remark, "31");
list[31] = new ListItem("Coode1", "32");
list[32] = new ListItem("Coode2", "33");
this.cblColumn.DataSource = list;
this.cblColumn.DataBind();
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx
+102
View File
@@ -0,0 +1,102 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialCoode.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.WeldingManage.MaterialCoode" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>物料码</title>
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="物料码"
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" DataKeyNames="MaterialCoodeId"
AllowCellEditing="true" ClicksToEdit="2" DataIDField="MaterialCoodeId" AllowSorting="true"
SortField="Coode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true"
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange"
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox ID="txtCoode" runat="server" Label="物料码"
EmptyText="<%$ Resources:Lan,EnterQueryConditions %>" Width="250px" LabelWidth="120px" LabelAlign="Right">
</f:TextBox>
<f:Button ID="btnQuery" ToolTip="<%$ Resources:Lan,Inquiry %>" Icon="SystemSearch"
EnablePostBack="true" OnClick="btnQuery_Click" runat="server">
</f:Button>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="<%$ Resources:Lan,Add %>" Icon="Add" EnablePostBack="true"
runat="server" OnClick="btnNew_Click">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:RenderField Width="150px" ColumnID="Coode" DataField="Coode" FieldType="String"
HeaderText="物料码" HeaderTextAlign="Center" TextAlign="Left"
SortField="MediumCode">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="HeartNo" DataField="HeartNo" FieldType="String"
HeaderText="炉批号" HeaderTextAlign="Center"
TextAlign="Left" SortField="HeartNo">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Amount" DataField="Amount"
FieldType="String" HeaderText="数量" HeaderTextAlign="Center"
TextAlign="Left" SortField="MediumAbbreviation">
</f:RenderField>
</Columns>
<Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>
<PageItems>
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
</f:ToolbarSeparator>
<f:ToolbarText ID="ToolbarText1" runat="server" Text="<%$ Resources:Lan,NumberOfRecordsPerPage %>">
</f:ToolbarText>
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
<f:ListItem Text="10" Value="10" />
<f:ListItem Text="15" Value="15" />
<f:ListItem Text="20" Value="20" />
<f:ListItem Text="25" Value="25" />
</f:DropDownList>
</PageItems>
</f:Grid>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="<%$ Resources:Lan,PopForm %>" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
Width="700px" Height="330px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<f:MenuButton ID="btnMenuEdit" OnClick="btnMenuEdit_Click" Icon="BulletEdit" EnablePostBack="true"
runat="server" Text="<%$ Resources:Lan,Edit %>">
</f:MenuButton>
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
Icon="Delete" ConfirmText="<%$ Resources:Lan,DeleteReminder %>" ConfirmTarget="Top"
runat="server" Text="<%$ Resources:Lan,Delete %>">
</f:MenuButton>
<f:MenuButton ID="btnView" OnClick="btnView_Click" Icon="Find" EnablePostBack="true"
runat="server" Text="<%$ Resources:Lan,View %>">
</f:MenuButton>
</f:Menu>
</form>
<script type="text/javascript">
var menuID = '<%= Menu1.ClientID %>';
// 返回false，来阻止浏览器右键菜单
function onRowContextMenu(event, rowId) {
F(menuID).show(); //showAt(event.pageX, event.pageY);
return false;
}
function reloadGrid() {
__doPostBack(null, 'reloadGrid');
}
</script>
</body>
</html>
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.cs
+270
View File
@@ -0,0 +1,270 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Data;
using System.Data.SqlClient;
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
public partial class MaterialCoode : PageBase
{
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
this.BindGrid();
}
}
#endregion
#region 绑定数据
/// <summary>
/// 绑定数据
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT * FROM dbo.Base_MaterialCoode WHERE 1=1 ";
List<SqlParameter> listStr = new List<SqlParameter>();
if (!string.IsNullOrEmpty(this.txtCoode.Text.Trim()))
{
strSql += " AND Coode LIKE @Coode";
listStr.Add(new SqlParameter("@Coode", "%" + this.txtCoode.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
/// <summary>
/// 改变索引事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 分页下拉选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{
Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
{
BindGrid();
}
/// <summary>
/// 关闭弹出窗口
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Window1_Close(object sender, EventArgs e)
{
BindGrid();
}
#endregion
#region 增加按钮事件
/// <summary>
/// 增加按钮事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
if (GetButtonPower(Const.BtnAdd))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialCoodeEdit.aspx", "新增 - ")));
}
else
{
Alert.ShowInTop(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning);
return;
}
}
#endregion
#region 编辑
/// <summary>
/// 双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
this.EditData();
}
/// <summary>
/// 右键编辑事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuEdit_Click(object sender, EventArgs e)
{
this.EditData();
}
/// <summary>
/// 编辑数据方法
/// </summary>
private void EditData()
{
if (Grid1.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop(Resources.Lan.SelectLeastOneRecord, MessageBoxIcon.Warning);
return;
}
////双击事件 编辑权限有：编辑页面，无：查看页面 或者状态是完成时查看页面
if (GetButtonPower(Const.BtnModify))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialCoodeEdit.aspx?MaterialCoodeId={0}&flag=edit", Grid1.SelectedRowID, "编辑 - ")));
}
else if (GetButtonPower(Const.BtnSee))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialCoodeEdit.aspx?MaterialCoodeId={0}&flag=view", Grid1.SelectedRowID, "查看 - ")));
}
else
{
Alert.ShowInTop(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning);
return;
}
}
#endregion
#region 删除
/// <summary>
/// 右键删除事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMenuDelete_Click(object sender, EventArgs e)
{
if (GetButtonPower(Const.BtnDelete))
{
if (Grid1.SelectedRowIndexArray.Length > 0)
{
string strShowNotify = string.Empty;
foreach (int rowIndex in Grid1.SelectedRowIndexArray)
{
string rowID = Grid1.DataKeys[rowIndex][0].ToString();
var getMedium = BLL.Base_MediumService.GetMediumByMediumId(rowID);
if (getMedium != null)
{
string cont = judgementDelete(rowID);
if (string.IsNullOrEmpty(cont))
{
BLL.Base_MediumService.DeleteMediumByMediumId(rowID);
BLL.Sys_LogService.AddLog(Const.System_2, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.MediumMenuId, Const.BtnDelete, rowID);
}
else
{
strShowNotify += Resources.Lan.MediumDefinition + "：" + getMedium.MediumCode + cont;
}
}
}
BindGrid();
if (!string.IsNullOrEmpty(strShowNotify))
{
Alert.ShowInTop(strShowNotify, MessageBoxIcon.Warning);
}
else
{
ShowNotify(Resources.Lan.DeletedSuccessfully, MessageBoxIcon.Success);
}
}
}
else
{
Alert.ShowInTop(Resources.Lan.NoPrivilegePrompt, MessageBoxIcon.Warning);
return;
}
}
#region 判断是否可删除
/// <summary>
/// 判断是否可以删除
/// </summary>
/// <returns></returns>
private string judgementDelete(string id)
{
string content = string.Empty;
//if (Funs.DB.Pipeline_WeldJoint.FirstOrDefault(x => x.Coode1 == id) != null)
//{
// content += "已在【管线信息】中使用，不能删除！";
//}
return content;
}
#endregion
#endregion
#region 查询
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnQuery_Click(object sender, EventArgs e)
{
this.BindGrid();
}
#endregion
#region 查看按钮
/// <summary>
/// 查看按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnView_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MaterialCoodeEdit.aspx?MaterialCoodeId={0}&flag=view", Grid1.SelectedRowID, "查看 - ")));
}
#endregion
#region 获取按钮权限
/// <summary>
/// 获取按钮权限
/// </summary>
/// <param name="button"></param>
/// <returns></returns>
private bool GetButtonPower(string button)
{
return BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.MaterialCoodeMenuId, button);
}
#endregion
}
}
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoode.aspx.designer.cs
Generated
+170
View File
@@ -0,0 +1,170 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
public partial class MaterialCoode
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtCoode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCoode;
/// <summary>
/// btnQuery 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnQuery;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnNew 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuEdit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuEdit;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuDelete;
/// <summary>
/// btnView 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnView;
}
}
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoodeEdit.aspx
+54
View File
@@ -0,0 +1,54 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MaterialCoodeEdit.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.WeldingManage.MaterialCoodeEdit" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>编辑物料码信息</title>
<base target="_self" />
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:TextBox ID="txtCoode" runat="server" Label="Coode码"
Required="true" MaxLength="50" ShowRedStar="true" FocusOnPageLoad="true" LabelWidth="200px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtHeartNo" runat="server" Label="炉批号"
MaxLength="50" LabelWidth="200px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox ID="txtAmount" runat="server" Label="数量" LabelWidth="200px"></f:NumberBox>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="<%$ Resources:Lan,Close %>"
runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
</form>
</body>
</html>
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoodeEdit.aspx.cs
+109
View File
@@ -0,0 +1,109 @@
using BLL;
using System;
using System.Linq;
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
public partial class MaterialCoodeEdit : PageBase
{
#region 定义项
/// <summary>
/// 主键
/// </summary>
public string MaterialCoodeId
{
get
{
return (string)ViewState["MaterialCoodeId"];
}
set
{
ViewState["MaterialCoodeId"] = value;
}
}
#endregion
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.txtCoode.Focus();
btnClose.OnClientClick = ActiveWindow.GetHideReference();
this.MaterialCoodeId = Request.Params["MaterialCoodeId"];
string flag = Request.Params["flag"];
if (flag == "view")
{
this.btnSave.Hidden = true;
}
if (!string.IsNullOrEmpty(this.MaterialCoodeId))
{
Model.Base_MaterialCoode Material = BLL.MaterialCoodeService.GetMaterialCoode(this.MaterialCoodeId, this.CurrUser.LoginProjectId);
if (Material != null)
{
this.txtCoode.Text = Material.Coode;
this.txtHeartNo.Text = Material.HeartNo;
if (Material.Amount.HasValue)
{
txtAmount.Text = Material.Amount.Value.ToString();
}
}
}
}
}
#endregion
#region 保存
/// <summary>
/// 保存按钮
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (BLL.MaterialCoodeService.IsExistMaterialCoode(this.CurrUser.LoginProjectId, txtHeartNo.Text.Trim(), txtCoode.Text.Trim(), this.MaterialCoodeId))
{
Alert.ShowInTop("此物料码对应的炉批号已存在", MessageBoxIcon.Warning);
return;
}
Model.Base_MaterialCoode newCoode = new Model.Base_MaterialCoode
{
ProjectId = this.CurrUser.LoginProjectId,
Coode = this.txtCoode.Text.Trim(),
HeartNo = this.txtHeartNo.Text.Trim(),
};
if (this.txtAmount.Text != "")
{
newCoode.Amount = Convert.ToInt32(this.txtAmount.Text);
}
else
{
newCoode.Amount=null;
}
if (!string.IsNullOrEmpty(this.MaterialCoodeId))
{
newCoode.MaterialCoodeId= this.MaterialCoodeId;
BLL.MaterialCoodeService.UpdateMaterialCoode(newCoode);
BLL.Sys_LogService.AddLog(Const.System_2, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.MaterialCoodeMenuId, Const.BtnModify, this.MaterialCoodeId);
}
else
{
this.MaterialCoodeId = SQLHelper.GetNewID(typeof(Model.Base_MaterialCoode));
newCoode.MaterialCoodeId = this.MaterialCoodeId;
BLL.MaterialCoodeService.AddMaterialCoode(newCoode);
BLL.Sys_LogService.AddLog(Const.System_2, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.MaterialCoodeMenuId, Const.BtnAdd, this.MaterialCoodeId);
}
ShowNotify(Resources.Lan.SaveSuccessfully, MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
}
}
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/MaterialCoodeEdit.aspx.designer.cs
Generated
+98
View File
@@ -0,0 +1,98 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
public partial class MaterialCoodeEdit
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtCoode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCoode;
/// <summary>
/// txtHeartNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHeartNo;
/// <summary>
/// txtAmount 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtAmount;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// btnSave 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnClose 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
}
}
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx
+8 -4
View File
@@ -188,7 +188,7 @@
columnMenu: false,
columnResizing: false,
cls: 'gridinrowexpander',
fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'DoneDin', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'HeartNo1', 'HeartNo2', 'WeldSilkCode','WeldMatCode','PipeSegment','WPQCode'],
fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'Size', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'Coode1', 'HeartNo1', 'Coode2', 'HeartNo2', 'WeldSilkCode','WeldMatCode','PipeSegment','WPQCode'],
columns: [{
text: '序号', field: 'Num', width: 50
}, {
@@ -206,7 +206,7 @@
}, {
text: '焊接位置', field: 'WeldingLocationCode', width: 80
}, {
text: '管径', field: 'DoneDin', width: 65
text: '管径', field: 'Size', width: 65
}, {
text: '外径', field: 'Dia', width: 65
}, {
@@ -222,9 +222,13 @@
}, {
text: '组件2', field: 'ComponentsCode2', width: 90
}, {
text: '炉批号1', field: 'HeartNo1', width: 100
text: 'Coode1', field: 'Coode1', width: 90
}, {
text: '炉批号2', field: 'HeartNo2', width: 100
text: '炉批号1', field: 'HeartNo1', width: 120
}, {
text: 'Coode2', field: 'Coode2', width: 90
}, {
text: '炉批号2', field: 'HeartNo2', width: 120
}, {
text: '焊丝', field: 'WeldSilkCode', width: 150
}, {
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx.cs
+110 -5
View File
@@ -10,6 +10,8 @@ using NPOI.XSSF.UserModel;
using System.Linq;
using System.Threading;
using BLL;
using Org.BouncyCastle.Ocsp;
using NPOI.SS.Formula.Functions;
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
@@ -499,6 +501,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
var componentss = from x in Funs.DB.Base_Components select x;//安装组件
var consumabless = from x in Funs.DB.Base_Consumables select x;//焊接耗材（焊丝、焊条）
var wpsList = from x in Funs.DB.WPQ_WPQList select x;
var coodeList = from x in Funs.DB.Base_MaterialCoode where x.ProjectId == this.CurrUser.LoginProjectId select x; //coode
List<Model.SpWeldingDaily> dayList = new List<Model.SpWeldingDaily>();
for (int i = 0; i < ds.Tables[0].Rows.Count; i++)
@@ -579,7 +582,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
var pipeline = from x in Funs.DB.Pipeline_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId && x.WorkAreaId == areaId
&& x.InstallationId == insId && x.PipelineCode == ds.Tables[0].Rows[i]["管线号"].ToString()
&& x.InstallationId == insId && x.WorkAreaId==areaId && x.PipelineCode == ds.Tables[0].Rows[i]["管线号"].ToString()
select x;
if (pipeline.Count() > 0)
@@ -630,6 +633,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
d.Material2Id = jot.First().Material2Id;
d.PipeAssembly1Id = jot.First().PipeAssembly1Id;
d.PipeAssembly2Id = jot.First().PipeAssembly2Id;
d.Coode1 = jot.First().Coode1;
d.Coode2 = jot.First().Coode2;
d.HeartNo1 = jot.First().HeartNo1;
d.HeartNo2 = jot.First().HeartNo2;
d.WeldSilkId = jot.First().WeldSilkId;
@@ -750,14 +755,13 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
else
{
d.JointAttribute = att;
if (att == "S")
{
d.JointAttribute = "活动S";
d.JointArea = "S";
}
else
{
d.JointAttribute = "固定G";
d.JointArea = "F";
}
}
@@ -1014,14 +1018,71 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
d.PipeAssembly2Id = com.ComponentsId;
}
}
if (ds.Tables[0].Rows[i]["Coode1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["Coode1"].ToString()))
{
var cood = coodeList.FirstOrDefault(x => x.Coode == ds.Tables[0].Rows[i]["Coode1"].ToString());
if (cood == null)
{
errorInfos += "Coode1:[" + ds.Tables[0].Rows[i]["Coode1"].ToString() + "]不存在；";
}
else
{
d.Coode1 = cood.Coode;
}
}
else
{
errorInfos += (i + 2) + "行,Coode1不能为空!</br>";
}
if (ds.Tables[0].Rows[i]["Coode2"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["Coode2"].ToString()))
{
var cood = coodeList.FirstOrDefault(x => x.Coode == ds.Tables[0].Rows[i]["Coode2"].ToString());
if (cood == null)
{
errorInfos += "Coode2:[" + ds.Tables[0].Rows[i]["Coode2"].ToString() + "]不存在；";
}
else
{
d.Coode1 = cood.Coode;
}
}
else
{
errorInfos += (i + 2) + "行,Coode2不能为空!</br>";
}
if (ds.Tables[0].Rows[i]["炉批号1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号1"].ToString()))
{
d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString();
var cood = coodeList.FirstOrDefault(x => x.Coode == d.Coode1 && x.HeartNo == ds.Tables[0].Rows[i]["炉批号1"].ToString());
if (cood == null)
{
errorInfos += "炉批号1:[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]或对应的Coode1不存在；";
}
else
{
d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString();
}
}
else
{
errorInfos += (i + 2) + "行,炉批号1不能为空!</br>";
}
if (ds.Tables[0].Rows[i]["炉批号2"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号2"].ToString()))
{
d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString();
var cood = coodeList.FirstOrDefault(x => x.Coode == d.Coode2 && x.HeartNo == ds.Tables[0].Rows[i]["炉批号2"].ToString());
if (cood == null)
{
errorInfos += "炉批号2:[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]或对应的Coode2不存在；";
}
else
{
d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString();
}
}
else
{
errorInfos += (i + 2) + "行,炉批号2不能为空!</br>";
}
//if (ds.Tables[0].Rows[i]["焊丝"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["焊丝"].ToString()))
@@ -1237,12 +1298,55 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
#endregion
}
// 判断Coode数量
string coodeNumError=string.Empty;
var coode1Group = dayList.GroupBy(x => new { x.Coode1, x.HeartNo1 }).Select(g => new { Coode = g.Key.Coode1, HeartNo = g.Key.HeartNo1 });
var coode2Group = dayList.GroupBy(x => new { x.Coode2, x.HeartNo2 }).Select(g => new { Coode = g.Key.Coode2, HeartNo = g.Key.HeartNo2 });
var coodeListGroup= coode1Group.Union(coode2Group).Distinct();
string[] jotList = dayList.Select(x => x.WeldJointId).ToArray();
foreach (var c in coodeListGroup)
{
var coodeNum = from x in Funs.DB.Base_MaterialCoode
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.Coode == c.Coode && x.HeartNo == c.HeartNo
select x;
int daily1 = (from x in dayList where x.Coode1 == c.Coode && x.HeartNo1 == c.HeartNo select x).Count();
int daily2 = (from x in dayList where x.Coode2== c.Coode && x.HeartNo2 == c.HeartNo select x).Count();
int jotCoode1 = (from x in Funs.DB.Pipeline_WeldJoint
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.Coode1 == c.Coode && x.HeartNo1 == c.HeartNo
&& !jotList.Contains(x.WeldJointId)
select x).Count();
int jotCoode2 = (from x in Funs.DB.Pipeline_WeldJoint
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.Coode2 == c.Coode && x.HeartNo2 == c.HeartNo
&& !jotList.Contains(x.WeldJointId)
select x).Count();
if (coodeNum.Count() > 0 && coodeNum.First().Amount != null)
{
if (daily1 + daily2 + jotCoode1 + jotCoode2 > coodeNum.First().Amount.Value)
{
coodeNumError += "Coode:" + c.Coode + "对应的炉批号：" + c.HeartNo + "的数量已超出，";
}
}
}
if (!string.IsNullOrEmpty(coodeNumError))
{
coodeNumError = coodeNumError + "请检查后再导入";
}
// 数据验证错误，返回
if (!string.IsNullOrEmpty(errorInfos))
{
ShowNotify(errorInfos, MessageBoxIcon.Warning, 10000);
return;
}
else if (!string.IsNullOrEmpty(coodeNumError))
{
ShowNotify(coodeNumError, MessageBoxIcon.Warning, 10000);
return;
}
else
{
// 焊工资质符全条件
@@ -1282,6 +1386,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
newWeldJoint.WeldTypeId = item.WeldTypeId;
newWeldJoint.JointAttribute = item.JointAttribute;
newWeldJoint.WeldingLocationId = item.WeldingLocationId;
newWeldJoint.Size = item.Size;
newWeldJoint.ANSISCH = item.ANSISCH;
newWeldJoint.Dia = item.Dia;
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx
+18 -2
View File
@@ -208,7 +208,23 @@
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="炉批号1" ColumnID="HeartNo1"
<f:RenderField HeaderText="Coode1-炉批号1" ColumnID="CoodeHeartNo1"
DataField="CoodeHeartNo1" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="200px">
<Editor>
<f:DropDownList ID="drpCoode1" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="Coode2-炉批号2" ColumnID="CoodeHeartNo2"
DataField="CoodeHeartNo2" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="200px">
<Editor>
<f:DropDownList ID="drpCoode2" Required="true" runat="server" ShowRedStar="true">
</f:DropDownList>
</Editor>
</f:RenderField>
<%--<f:RenderField HeaderText="炉批号1" ColumnID="HeartNo1"
DataField="HeartNo1" SortField="HeartNo1" FieldType="String"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor>
@@ -223,7 +239,7 @@
<f:TextBox ID="txtHeartNo2" runat="server" >
</f:TextBox>
</Editor>
</f:RenderField>
</f:RenderField>--%>
<f:RenderField HeaderText="焊丝" ColumnID="WeldSilkCode"
DataField="WeldSilkCode" FieldType="String"
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.cs
+72 -9
View File
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
using BLL;
using Newtonsoft.Json.Linq;
@@ -60,7 +61,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
this.drpWeldType.DataValueField = "WeldTypeCode";
this.drpWeldType.DataSource = from x in Funs.DB.Base_WeldType orderby x.WeldTypeCode select x;
this.drpWeldType.DataBind();
///焊接位置
this.drpWeldingLocationId.DataTextField = "WeldingLocationCode";
this.drpWeldingLocationId.DataValueField = "WeldingLocationCode";
@@ -123,6 +124,10 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
drpWPS.DataBind();
Funs.FineUIPleaseSelect(drpWPS);
// 物料码
BLL.MaterialCoodeService.InitMaterialCoodeDropDownList(this.drpCoode1, this.CurrUser.LoginProjectId, true, Resources.Lan.PleaseSelect);//Coode1
BLL.MaterialCoodeService.InitMaterialCoodeDropDownList(this.drpCoode2, this.CurrUser.LoginProjectId, true, Resources.Lan.PleaseSelect);//Coode2
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.Pipeline_WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
this.BindGrid(GetWeldingDailyItem); // 初始化页面
@@ -325,6 +330,50 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
string eventArg = string.Empty;
List<Model.SpWeldingDailyItem> GetWeldingDailyItem = this.CollectGridJointInfo();
// 判断Coode数量
string coodeNumError = string.Empty;
var coode1Group = GetWeldingDailyItem.GroupBy(x => x.CoodeHeartNo1).Select(g => g.Key);
var coode2Group = GetWeldingDailyItem.GroupBy(x => x.CoodeHeartNo2).Select(g => g.Key);
var coodeListGroup = coode1Group.Union(coode2Group).Distinct();
string[] jotList= GetWeldingDailyItem.Select(x=>x.WeldJointId).ToArray();
foreach (var c in coodeListGroup)
{
if (c.Contains(":"))
{
string coode = c.Split(':')[0];
string heartNo = c.Split(':')[1];
var coodeNum = from x in Funs.DB.Base_MaterialCoode
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.Coode == coode && x.HeartNo == heartNo
select x;
int daily1 = (from x in GetWeldingDailyItem where x.CoodeHeartNo1 == c select x).Count();
int daily2 = (from x in GetWeldingDailyItem where x.CoodeHeartNo2 == c select x).Count();
int jotCoode1 = (from x in Funs.DB.Pipeline_WeldJoint
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.Coode1 == coode && x.HeartNo1 == heartNo
&& !jotList.Contains(x.WeldJointId)
select x).Count();
int jotCoode2 = (from x in Funs.DB.Pipeline_WeldJoint
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.Coode2 == coode && x.HeartNo2 == heartNo
&& !jotList.Contains(x.WeldJointId)
select x).Count();
if (coodeNum.Count() > 0 && coodeNum.First().Amount != null)
{
if (daily1 + daily2 + jotCoode1 + jotCoode2 > coodeNum.First().Amount.Value)
{
coodeNumError += "Coode:" + coode + "对应的炉批号：" + heartNo + "的数量已超出，";
}
}
}
}
if (!string.IsNullOrEmpty(coodeNumError))
{
coodeNumError = coodeNumError + "请检查后再导入";
}
#region 焊工资质判断，暂不用
//// 焊工资质
//foreach (var item in GetWeldingDailyItem)
@@ -621,8 +670,13 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//}
#endregion
if (!string.IsNullOrEmpty(coodeNumError))
{
ShowNotify(coodeNumError, MessageBoxIcon.Warning, 10000);
return;
}
// 焊工资质都符合条件
if (eventArg == string.Empty)
else if (eventArg == string.Empty)
{
Model.Pipeline_WeldingDaily newWeldingDaily = new Model.Pipeline_WeldingDaily();
newWeldingDaily.WeldingDailyCode = this.txtWeldingDailyCode.Text.Trim();
@@ -681,11 +735,18 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
newWeldJoint.JointAttribute = item.JointAttribute;
newWeldJoint.JointArea = item.JointArea;
newWeldJoint.WeldingLocationId = item.WeldingLocationId;
newWeldJoint.Material1Id = item.MaterialId1;
newWeldJoint.Material2Id = item.MaterialId2;
newWeldJoint.HeartNo1 = item.HeartNo1;
newWeldJoint.HeartNo2 = item.HeartNo2;
if (item.CoodeHeartNo1.Contains(":"))
{
newWeldJoint.Coode1 = item.CoodeHeartNo1.Split(':')[0];
newWeldJoint.HeartNo1 = item.CoodeHeartNo1.Split(':')[1];
}
if (item.CoodeHeartNo2.Contains(":"))
{
newWeldJoint.Coode2 = item.CoodeHeartNo2.Split(':')[0];
newWeldJoint.HeartNo2 = item.CoodeHeartNo2.Split(':')[1];
}
newWeldJoint.PipeAssembly1Id = item.Components1Id;
newWeldJoint.PipeAssembly2Id = item.Components2Id;
newWeldJoint.WeldingMethodId = item.WeldingMethodId;
@@ -700,7 +761,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
//更新焊口号 修改固定焊口号后 +G
//BLL.Pipeline_WeldJointService.UpdateWeldJointAddG(newWeldJoint.WeldJointId, newWeldJoint.JointAttribute, Const.BtnAdd);
BLL.Batch_PointBatchItemService.InsertPointBatch(this.ProjectId, this.drpUnit.SelectedValue, this.drpInstallation.SelectedValue,item.BackingWelderId ,item.CoverWelderId, item.WeldJointId, newWeldingDaily.WeldingDate);
BLL.Batch_PointBatchItemService.InsertPointBatch(this.ProjectId, this.drpUnit.SelectedValue, this.drpInstallation.SelectedValue, item.BackingWelderId, item.CoverWelderId, item.WeldJointId, newWeldingDaily.WeldingDate);
}
@@ -938,7 +999,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
if (!string.IsNullOrEmpty(values.Value<string>("JointAttribute")))
{
item.JointAttribute = values.Value<string>("JointAttribute").ToString();
if (item.JointAttribute == "活动S")
if (item.JointAttribute == "S")
{
item.JointArea = "S";
}
@@ -947,6 +1008,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
item.JointArea = "F";
}
}
var weldingLocation = (from x in Funs.DB.Base_WeldingLocation
where x.WeldingLocationCode == values.Value<string>("WeldingLocationId")
select x).FirstOrDefault();
@@ -956,8 +1018,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
}
item.Size = Funs.GetNewDecimalOrZero(values.Value<string>("DoneDin").ToString());
item.DoneDin = Funs.GetNewDecimalOrZero(values.Value<string>("DoneDin").ToString());
item.HeartNo1= values.Value<string>("HeartNo1").ToString();
item.HeartNo2 = values.Value<string>("HeartNo2").ToString();
item.CoodeHeartNo1 = values.Value<string>("CoodeHeartNo1").ToString();
item.CoodeHeartNo2 = values.Value<string>("CoodeHeartNo2").ToString();
var wmt = (from x in Funs.DB.Base_WeldingMethod
where x.WeldingMethodCode == values.Value<string>("WeldingMethodCode")
HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReportEdit.aspx.designer.cs
Generated
+51 -49
View File
@@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldingProcess.WeldingManage {
public partial class WeldReportEdit {
namespace FineUIPro.Web.WeldingProcess.WeldingManage
{
public partial class WeldReportEdit
{
/// <summary>
/// form1 控件。
/// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// panelCenterRegion 控件。
/// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel panelCenterRegion;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// hdItemsString 控件。
/// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdItemsString;
/// <summary>
/// hdTablerId 控件。
/// </summary>
@@ -74,7 +76,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdTablerId;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@@ -83,7 +85,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// btnSave 控件。
/// </summary>
@@ -92,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@@ -101,7 +103,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// txtWeldingDailyCode 控件。
/// </summary>
@@ -110,7 +112,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeldingDailyCode;
/// <summary>
/// drpUnit 控件。
/// </summary>
@@ -119,7 +121,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpInstallation 控件。
/// </summary>
@@ -128,7 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpInstallation;
/// <summary>
/// txtWeldingDate 控件。
/// </summary>
@@ -137,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtWeldingDate;
/// <summary>
/// txtTabler 控件。
/// </summary>
@@ -146,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTabler;
/// <summary>
/// txtTableDate 控件。
/// </summary>
@@ -155,7 +157,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtTableDate;
/// <summary>
/// txtRemark 控件。
/// </summary>
@@ -164,7 +166,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtRemark;
/// <summary>
/// lbAmount 控件。
/// </summary>
@@ -173,7 +175,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lbAmount;
/// <summary>
/// Grid1 控件。
/// </summary>
@@ -182,7 +184,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@@ -191,7 +193,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// ckSelect 控件。
/// </summary>
@@ -200,7 +202,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button ckSelect;
/// <summary>
/// drpCoverWelderId 控件。
/// </summary>
@@ -209,7 +211,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCoverWelderId;
/// <summary>
/// drpBackingWelderId 控件。
/// </summary>
@@ -218,7 +220,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpBackingWelderId;
/// <summary>
/// drpWeldType 控件。
/// </summary>
@@ -227,7 +229,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldType;
/// <summary>
/// drpJointAttribute 控件。
/// </summary>
@@ -236,7 +238,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpJointAttribute;
/// <summary>
/// drpWeldingLocationId 控件。
/// </summary>
@@ -245,7 +247,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldingLocationId;
/// <summary>
/// txtDoneDin 控件。
/// </summary>
@@ -254,7 +256,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtDoneDin;
/// <summary>
/// drpWeldingMethod 控件。
/// </summary>
@@ -263,7 +265,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldingMethod;
/// <summary>
/// drpMaterial1 控件。
/// </summary>
@@ -272,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMaterial1;
/// <summary>
/// drpMaterial2 控件。
/// </summary>
@@ -281,7 +283,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMaterial2;
/// <summary>
/// drpComponents1 控件。
/// </summary>
@@ -290,7 +292,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpComponents1;
/// <summary>
/// drpComponents2 控件。
/// </summary>
@@ -299,25 +301,25 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpComponents2;
/// <summary>
/// txtHeartNo1 控件。
/// drpCoode1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHeartNo1;
protected global::FineUIPro.DropDownList drpCoode1;
/// <summary>
/// txtHeartNo2 控件。
/// drpCoode2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHeartNo2;
protected global::FineUIPro.DropDownList drpCoode2;
/// <summary>
/// drpWeldSilkCode 控件。
/// </summary>
@@ -326,7 +328,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldSilkCode;
/// <summary>
/// drpWeldMatCode 控件。
/// </summary>
@@ -335,7 +337,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeldMatCode;
/// <summary>
/// txtPipeSegment 控件。
/// </summary>
@@ -344,7 +346,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtPipeSegment;
/// <summary>
/// drpWPS 控件。
/// </summary>
@@ -353,7 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWPS;
/// <summary>
/// Window1 控件。
/// </summary>
@@ -362,7 +364,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Menu1 控件。
/// </summary>
@@ -371,7 +373,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>