gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260416 材质修改

This commit is contained in:
毕文静 2026-04-16 14:56:53 +08:00
parent 5663de52a1
commit bd5962e941
7 changed files with 181 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DataBase/版本日志/HJGLDB_DS_2026-04-16_bwj.sql Normal file
View File

@ -0,0 +1,3 @@
alter table HJGL_BS_Steel add IsCracking bit
go

2
HJGL_DS/BLL/HJGLServer/BaseInfo/HJGL_MaterialService.cs
View File

@ -63,6 +63,7 @@ namespace BLL
newSteel.MaterialGroup = steel.MaterialGroup;
newSteel.HardQuaStandard = steel.HardQuaStandard;
newSteel.IsUse = steel.IsUse;
newSteel.IsCracking = steel.IsCracking;
db.HJGL_BS_Steel.InsertOnSubmit(newSteel);
db.SubmitChanges();
@ -87,6 +88,7 @@ namespace BLL
newSteel.MaterialGroup = steel.MaterialGroup;
newSteel.HardQuaStandard = steel.HardQuaStandard;
newSteel.IsUse = steel.IsUse;
newSteel.IsCracking = steel.IsCracking;
db.SubmitChanges();
}

20
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
View File

@ -1344,13 +1344,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理未合格,";
}
else if ((DateTime.Now - joint.HotResultDate.Value).Days < 1)
else
{
if (!string.IsNullOrEmpty(joint.STE_ID))
{
//材质有延迟裂纹倾向，热处理合格未满24小时提醒
var material = BLL.HJGL_MaterialService.GetSteelBySteID(joint.STE_ID);
if (material.IsCracking == true && (DateTime.Now - joint.HotResultDate.Value).Days < 1)
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
}
}
}
}
}
}
if (EventArg != string.Empty)
{
EventArg = EventArg.Substring(0, EventArg.Length - 1);
@ -1529,13 +1537,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理未合格,";
}
else if ((DateTime.Now - joint.HotResultDate.Value).Days < 1)
else
{
if (!string.IsNullOrEmpty(joint.STE_ID))
{
//材质有延迟裂纹倾向，热处理合格未满24小时提醒
var material = BLL.HJGL_MaterialService.GetSteelBySteID(joint.STE_ID);
if (material.IsCracking == true && (DateTime.Now - joint.HotResultDate.Value).Days < 1)
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
}
}
}
}
}
}
if (EventArg != string.Empty)
{
EventArg = EventArg.Substring(0, EventArg.Length - 1);

54
HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx
View File

@ -17,8 +17,8 @@
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="材质" ShowHeader="false" Layout="HBox">
<Items>
<f:Grid ID="Grid1" Title="材质" ShowHeader="false" EnableCollapse="true" PageSize="15"
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="760px" EnableColumnLines="true"
<f:Grid ID="Grid1" Title="材质" ShowHeader="false" EnableCollapse="true" PageSize="15" Width="760px"
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" EnableColumnLines="true"
SortField="STE_Code" SortDirection="ASC" OnSort="Grid1_Sort" DataKeyNames="STE_ID" DataIDField="STE_ID" OnPageIndexChange="Grid1_PageIndexChange"
AllowFilters="true" OnFilterChange="Grid1_FilterChange" AllowSorting="true" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick">
<Toolbars>
@ -37,14 +37,14 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center"/>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
<f:RenderField Width="140px" ColumnID="STE_Code" DataField="STE_Code" FieldType="String"
HeaderText="材质" HeaderTextAlign="Center" TextAlign="Left" SortField="STE_Code">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="STE_Name" DataField="STE_Name" FieldType="String"
<f:RenderField Width="100px" ColumnID="STE_Name" DataField="STE_Name" FieldType="String"
HeaderText="材质类型" HeaderTextAlign="Center" TextAlign="Left" SortField="STE_Name">
</f:RenderField>
<f:TemplateField Width="80px" HeaderText="类别" HeaderTextAlign="Center" TextAlign="Center">
<%-- <f:TemplateField Width="80px" HeaderText="类别" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertMaterialType(Eval("MaterialType")) %>'></asp:Label>
</ItemTemplate>
@ -53,24 +53,25 @@
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertMaterialGroup(Eval("MaterialGroup")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="120px" ColumnID="STE_SteelTypeName" DataField="STE_SteelType" FieldType="String"
ExpandUnusedSpace="true" HeaderText="钢材类型" HeaderTextAlign="Center" TextAlign="Left" SortField="STE_SteelType"
</f:TemplateField> --%>
<f:RenderField Width="90px" ColumnID="STE_SteelTypeName" DataField="STE_SteelType" FieldType="String"
HeaderText="钢材类型" HeaderTextAlign="Center" TextAlign="Left" SortField="STE_SteelType"
RendererFunction="renderGender">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="HardQuaStandard" DataField="HardQuaStandard" FieldType="String"
HeaderText="硬度合格标准" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="STE_Remark" DataField="STE_Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="1px" ColumnID="MaterialType" DataField="MaterialType" FieldType="String"
<%-- <f:RenderField Width="1px" ColumnID="MaterialType" DataField="MaterialType" FieldType="String"
HeaderText="类别" Hidden="true" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="1px" ColumnID="MaterialGroup" DataField="MaterialGroup" FieldType="String"
HeaderText="组别" Hidden="true" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>--%>
<f:RenderCheckField Width="140px" ColumnID="IsCracking" DataField="IsCracking" HeaderText="是否有延迟裂纹倾向" ></f:RenderCheckField>
<f:RenderCheckField Width="75px" ColumnID="IsUse" DataField="IsUse" HeaderText="是否使用" ></f:RenderCheckField>
<f:RenderField Width="80px" ColumnID="STE_Remark" DataField="STE_Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderCheckField Width="60px" ColumnID="IsUse" DataField="IsUse" HeaderText="是否使用" ></f:RenderCheckField>
</Columns>
<Listeners>
<f:Listener Event="rowselect" Handler="onGridRowSelect" />
@ -90,30 +91,31 @@
</PageItems>
</f:Grid>
<f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
LabelWidth="100px" BodyPadding="5px" Width="390px">
LabelWidth="100px" BodyPadding="5px" Width="320px">
<Items>
<f:HiddenField ID="hfFormID" runat="server">
</f:HiddenField>
<f:TextBox ID="txtSte_Code" Label="材质" ShowRedStar="true" Required="true" LabelWidth="110px"
<f:TextBox ID="txtSte_Code" Label="材质" ShowRedStar="true" Required="true" LabelWidth="140px"
runat="server" LabelAlign="right" FocusOnPageLoad="true">
</f:TextBox>
<f:TextBox ID="txtSte_Name" Label="材质类型" ShowRedStar="true" Required="true"
runat="server" LabelWidth="110px" LabelAlign="right">
runat="server" LabelWidth="140px" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpMaterialClass" runat="server" Label="类别"
<%-- <f:DropDownList ID="drpMaterialClass" runat="server" Label="类别"
LabelAlign="Right" AutoPostBack="true" LabelWidth="110px" EnableEdit="true"
OnSelectedIndexChanged="drpMaterialClass_SelectedIndexChanged" >
</f:DropDownList>
<f:DropDownList ID="drpMaterialGroup" runat="server" Label="组别" LabelAlign="Right"
LabelWidth="110px" EnableEdit="true">
</f:DropDownList>
</f:DropDownList>--%>
<f:DropDownList ID="ddlSteType" Label="材质类型" runat="server"
LabelWidth="110px" LabelAlign="right" ShowRedStar="true" Required="true" >
LabelWidth="140px" LabelAlign="right" ShowRedStar="true" Required="true" >
</f:DropDownList>
<f:TextBox ID="txtHardQuaStandard" Label="硬度合格标准" LabelWidth="110px" runat="server" LabelAlign="right" ShowRedStar="true" Required="true" >
<f:TextBox ID="txtHardQuaStandard" Label="硬度合格标准" LabelWidth="140px" runat="server" LabelAlign="right" ShowRedStar="true" Required="true" >
</f:TextBox>
<f:CheckBox ID="cbIsUse" Label="是否使用" runat="server" LabelWidth="110px" LabelAlign="right"/>
<f:TextArea ID="txtRemark" Label="备注" runat="server" LabelWidth="110px" LabelAlign="right" Height="64px">
<f:CheckBox ID="cbIsCracking" Label="是否有延迟裂纹倾向" runat="server" LabelWidth="140px" LabelAlign="right"/>
<f:CheckBox ID="cbIsUse" Label="是否使用" runat="server" LabelWidth="140px" LabelAlign="right"/>
<f:TextArea ID="txtRemark" Label="备注" runat="server" LabelWidth="140px" LabelAlign="right" Height="64px">
</f:TextArea>
</Items>
<Toolbars>
@ -186,8 +188,8 @@
var txtSte_NameClientID = '<%= txtSte_Name.ClientID %>';
var txtHardQuaStandardClientID = '<%= txtHardQuaStandard.ClientID %>';
var txtRemarkClientID = '<%= txtRemark.ClientID %>';
var drpMaterialClassClientID = '<%= drpMaterialClass.ClientID %>';
var drpMaterialGroupClientID = '<%= drpMaterialGroup.ClientID %>';
<%--var drpMaterialClassClientID = '<%= drpMaterialClass.ClientID %>';
var drpMaterialGroupClientID = '<%= drpMaterialGroup.ClientID %>';--%>
function onGridRowSelect(event, rowId) {
var grid = F(gridClientID);
@ -206,8 +208,8 @@
F(txtHardQuaStandardClientID).setValue(rowValue['HardQuaStandard']);
F(txtRemarkClientID).setValue(rowValue['STE_Remark']);
F(drpMaterialClassClientID).setValue(rowValue['MaterialType']);
F(drpMaterialGroupClientID).setValue(rowValue['MaterialGroup']);
//F(drpMaterialClassClientID).setValue(rowValue['MaterialType']);
//F(drpMaterialGroupClientID).setValue(rowValue['MaterialGroup']);
// 更新提交按钮文本
F(btnSaveClientID).setText('提交数据（编辑）');

103
HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.cs
View File

@ -41,17 +41,17 @@
this.drpSteType.DataBind();
Funs.FineUIPleaseSelect(this.drpSteType);
this.drpMaterialClass.DataTextField = "MaterialClass";
this.drpMaterialClass.DataValueField = "MaterialClassId";
this.drpMaterialClass.DataSource = BLL.HJGL_MaterialClassService.GetMaterialClassList();
this.drpMaterialClass.DataBind();
Funs.FineUIPleaseSelect(this.drpMaterialClass);
//this.drpMaterialClass.DataTextField = "MaterialClass";
//this.drpMaterialClass.DataValueField = "MaterialClassId";
//this.drpMaterialClass.DataSource = BLL.HJGL_MaterialClassService.GetMaterialClassList();
//this.drpMaterialClass.DataBind();
//Funs.FineUIPleaseSelect(this.drpMaterialClass);
this.drpMaterialGroup.DataTextField = "MaterialGroup";
this.drpMaterialGroup.DataValueField = "MaterialGroupId";
this.drpMaterialGroup.DataSource = (from x in Funs.DB.HJGL_BS_MaterialGroup orderby x.MaterialGroupCode select x).ToList();
this.drpMaterialGroup.DataBind();
Funs.FineUIPleaseSelect(this.drpMaterialGroup);
//this.drpMaterialGroup.DataTextField = "MaterialGroup";
//this.drpMaterialGroup.DataValueField = "MaterialGroupId";
//this.drpMaterialGroup.DataSource = (from x in Funs.DB.HJGL_BS_MaterialGroup orderby x.MaterialGroupCode select x).ToList();
//this.drpMaterialGroup.DataBind();
//Funs.FineUIPleaseSelect(this.drpMaterialGroup);
// 绑定表格
BindGrid();
}
@ -66,7 +66,7 @@
{
string strSql = @"SELECT Steel.STE_ID,Steel.STE_Code,Steel.STE_Name,Steel.STE_SteelType,Steel.STE_Remark,
Steel.MaterialType,Steel.MaterialGroup,MaterialClas.MaterialClass as MaterialClassName,
MaterialGroup.MaterialGroup as MaterialGroupName,Steel.HardQuaStandard,Steel.IsUse
MaterialGroup.MaterialGroup as MaterialGroupName,Steel.HardQuaStandard,Steel.IsUse,Steel.IsCracking
FROM HJGL_BS_Steel AS Steel
LEFT JOIN HJGL_BS_MaterialClass AS MaterialClas ON Steel.MaterialType=MaterialClas.MaterialClassId
LEFT JOIN HJGL_BS_MaterialGroup AS MaterialGroup ON Steel.MaterialGroup=MaterialGroup.MaterialGroupId
@ -113,7 +113,14 @@
{
cbIsUse.Checked = false;
}
if (q.IsCracking == true)
{
cbIsCracking.Checked = true;
}
else
{
cbIsCracking.Checked = false;
}
}
#region 分页排序
@ -275,8 +282,8 @@
{
this.ddlSteType.SelectedValue = Material.STE_SteelType;
}
this.drpMaterialClass.SelectedValue = Material.MaterialType;
this.drpMaterialGroup.SelectedValue = Material.MaterialGroup;
//this.drpMaterialClass.SelectedValue = Material.MaterialType;
//this.drpMaterialGroup.SelectedValue = Material.MaterialGroup;
this.txtHardQuaStandard.Text = Material.HardQuaStandard;
hfFormID.Text = Id;
this.btnDelete.Enabled = true;
@ -310,14 +317,14 @@
{
steel.STE_SteelType = this.ddlSteType.SelectedValue;
}
if (this.drpMaterialClass.SelectedValue != BLL.Const._Null)
{
steel.MaterialType = this.drpMaterialClass.SelectedValue;
}
if (this.drpMaterialGroup.SelectedValue != BLL.Const._Null)
{
steel.MaterialGroup = this.drpMaterialGroup.SelectedValue;
}
//if (this.drpMaterialClass.SelectedValue != BLL.Const._Null)
//{
// steel.MaterialType = this.drpMaterialClass.SelectedValue;
//}
//if (this.drpMaterialGroup.SelectedValue != BLL.Const._Null)
//{
// steel.MaterialGroup = this.drpMaterialGroup.SelectedValue;
//}
if (cbIsUse.Checked)
{
@ -327,6 +334,14 @@
{
steel.IsUse = false;
}
if (cbIsCracking.Checked)
{
steel.IsCracking = true;
}
else
{
steel.IsCracking = false;
}
if (string.IsNullOrEmpty(strRowID))
{
@ -490,19 +505,19 @@
/// </summary>
/// <param name="WorkStage"></param>
/// <returns></returns>
protected string ConvertMaterialType(object MaterialType)
{
string name = string.Empty;
if (MaterialType != null)
{
var type = BLL.HJGL_MaterialClassService.GetMaterialClassById(MaterialType.ToString());
if (type != null)
{
name =type.MaterialClass;
}
}
return name;
}
//protected string ConvertMaterialType(object MaterialType)
//{
// string name = string.Empty;
// if (MaterialType != null)
// {
// var type = BLL.HJGL_MaterialClassService.GetMaterialClassById(MaterialType.ToString());
// if (type != null)
// {
// name =type.MaterialClass;
// }
// }
// return name;
//}
/// <summary>
/// 获取工作阶段
@ -524,14 +539,14 @@
}
#endregion
protected void drpMaterialClass_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpMaterialGroup.Items.Clear();
this.drpMaterialGroup.DataTextField = "MaterialGroup";
this.drpMaterialGroup.DataValueField = "MaterialGroupId";
this.drpMaterialGroup.DataSource = BLL.HJGL_MaterialGroupService.GetMaterialGroupByMaterialClassId(this.drpMaterialClass.SelectedValue);
this.drpMaterialGroup.DataBind();
Funs.FineUIPleaseSelect(this.drpMaterialGroup);
}
//protected void drpMaterialClass_SelectedIndexChanged(object sender, EventArgs e)
//{
// this.drpMaterialGroup.Items.Clear();
// this.drpMaterialGroup.DataTextField = "MaterialGroup";
// this.drpMaterialGroup.DataValueField = "MaterialGroupId";
// this.drpMaterialGroup.DataSource = BLL.HJGL_MaterialGroupService.GetMaterialGroupByMaterialClassId(this.drpMaterialClass.SelectedValue);
// this.drpMaterialGroup.DataBind();
// Funs.FineUIPleaseSelect(this.drpMaterialGroup);
//}
}
}

51
HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGLServer.BaseInfo {
namespace FineUIPro.Web.HJGLServer.BaseInfo
{
public partial class Material {
public partial class Material
{
/// <summary>
/// form1 控件。
@ -84,24 +86,6 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo {
/// </remarks>
protected global::FineUIPro.DropDownList drpSteType;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -165,24 +149,6 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo {
/// </remarks>
protected global::FineUIPro.TextBox txtSte_Name;
/// <summary>
/// drpMaterialClass 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMaterialClass;
/// <summary>
/// drpMaterialGroup 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMaterialGroup;
/// <summary>
/// ddlSteType 控件。
/// </summary>
@ -201,6 +167,15 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo {
/// </remarks>
protected global::FineUIPro.TextBox txtHardQuaStandard;
/// <summary>
/// cbIsCracking 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsCracking;
/// <summary>
/// cbIsUse 控件。
/// </summary>

442
HJGL_DS/Model/Model.cs
View File

@ -24850,6 +24850,8 @@ namespace Model
private System.Nullable<bool> _IsUse;
private System.Nullable<bool> _IsCracking;
private EntitySet<HJGL_BO_Batch> _HJGL_BO_Batch;
private EntitySet<HJGL_BS_MaterialCompare> _HJGL_BS_MaterialCompare;
@ -24894,6 +24896,8 @@ namespace Model
partial void OnHardQuaStandardChanged();
partial void OnIsUseChanging(System.Nullable<bool> value);
partial void OnIsUseChanged();
partial void OnIsCrackingChanging(System.Nullable<bool> value);
partial void OnIsCrackingChanged();
#endregion
public HJGL_BS_Steel()
@ -25092,6 +25096,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCracking", DbType="Bit")]
public System.Nullable<bool> IsCracking
{
get
{
return this._IsCracking;
}
set
{
if ((this._IsCracking != value))
{
this.OnIsCrackingChanging(value);
this.SendPropertyChanging();
this._IsCracking = value;
this.SendPropertyChanged("IsCracking");
this.OnIsCrackingChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_BO_Batch_HJGL_BS_Steel", Storage="_HJGL_BO_Batch", ThisKey="STE_ID", OtherKey="STE_ID", DeleteRule="NO ACTION")]
public EntitySet<HJGL_BO_Batch> HJGL_BO_Batch
{
@ -131749,8 +131773,6 @@ namespace Model
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -131772,7 +131794,6 @@ namespace Model
public Weld_ProjectPlan()
{
this._Base_Project = default(EntityRef<Base_Project>);
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -131831,10 +131852,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -131938,40 +131955,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_ProjectPlan_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_ProjectPlan.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_ProjectPlan.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -132225,8 +132208,6 @@ namespace Model
private EntityRef<Weld_UsingPlan> _Weld_UsingPlan;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -132275,7 +132256,6 @@ namespace Model
this._Weld_Storeman = default(EntityRef<Weld_Storeman>);
this._Weld_UsingMat = default(EntityRef<Weld_UsingMat>);
this._Weld_UsingPlan = default(EntityRef<Weld_UsingPlan>);
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -132354,10 +132334,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -132795,40 +132771,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_RecycleMat.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_RecycleMat.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -132892,8 +132834,6 @@ namespace Model
private EntityRef<Weld_UsingPlan> _Weld_UsingPlan;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -132934,7 +132874,6 @@ namespace Model
this._Weld_Storeman = default(EntityRef<Weld_Storeman>);
this._Weld_UsingMat = default(EntityRef<Weld_UsingMat>);
this._Weld_UsingPlan = default(EntityRef<Weld_UsingPlan>);
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -133013,10 +132952,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -133374,40 +133309,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMatTop_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_RecycleMatTop.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_RecycleMatTop.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -134328,8 +134229,6 @@ namespace Model
private System.Nullable<decimal> _Weight;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -134346,7 +134245,6 @@ namespace Model
public Weld_StockInit()
{
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -134381,10 +134279,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -134434,40 +134328,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_StockInit_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_StockInit.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_StockInit.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -135378,8 +135238,6 @@ namespace Model
private EntityRef<Weld_UsingPlan> _Weld_UsingPlan;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -135435,7 +135293,6 @@ namespace Model
this._Base_Project = default(EntityRef<Base_Project>);
this._Weld_Storeman = default(EntityRef<Weld_Storeman>);
this._Weld_UsingPlan = default(EntityRef<Weld_UsingPlan>);
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -135514,10 +135371,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -136003,40 +135856,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingMat_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_UsingMat.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_UsingMat.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -136146,8 +135965,6 @@ namespace Model
private EntitySet<Weld_UsingMat> _Weld_UsingMat;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -136211,7 +136028,6 @@ namespace Model
this._Weld_RecycleMat = new EntitySet<Weld_RecycleMat>(new Action<Weld_RecycleMat>(this.attach_Weld_RecycleMat), new Action<Weld_RecycleMat>(this.detach_Weld_RecycleMat));
this._Weld_RecycleMatTop = new EntitySet<Weld_RecycleMatTop>(new Action<Weld_RecycleMatTop>(this.attach_Weld_RecycleMatTop), new Action<Weld_RecycleMatTop>(this.detach_Weld_RecycleMatTop));
this._Weld_UsingMat = new EntitySet<Weld_UsingMat>(new Action<Weld_UsingMat>(this.attach_Weld_UsingMat), new Action<Weld_UsingMat>(this.detach_Weld_UsingMat));
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -136246,10 +136062,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -136778,40 +136590,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingPlan_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_UsingPlan.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_UsingPlan.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -137101,7 +136879,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(10)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(50)")]
public string SteelType
{
get
@ -137482,18 +137260,6 @@ namespace Model
private System.Nullable<bool> _IsLock;
private EntitySet<Weld_ProjectPlan> _Weld_ProjectPlan;
private EntitySet<Weld_RecycleMat> _Weld_RecycleMat;
private EntitySet<Weld_RecycleMatTop> _Weld_RecycleMatTop;
private EntitySet<Weld_StockInit> _Weld_StockInit;
private EntitySet<Weld_UsingMat> _Weld_UsingMat;
private EntitySet<Weld_UsingPlan> _Weld_UsingPlan;
private EntityRef<Weld_WeldType> _Weld_WeldType;
#region 可扩展性方法定义
@ -137526,12 +137292,6 @@ namespace Model
public Weld_WeldInfo()
{
this._Weld_ProjectPlan = new EntitySet<Weld_ProjectPlan>(new Action<Weld_ProjectPlan>(this.attach_Weld_ProjectPlan), new Action<Weld_ProjectPlan>(this.detach_Weld_ProjectPlan));
this._Weld_RecycleMat = new EntitySet<Weld_RecycleMat>(new Action<Weld_RecycleMat>(this.attach_Weld_RecycleMat), new Action<Weld_RecycleMat>(this.detach_Weld_RecycleMat));
this._Weld_RecycleMatTop = new EntitySet<Weld_RecycleMatTop>(new Action<Weld_RecycleMatTop>(this.attach_Weld_RecycleMatTop), new Action<Weld_RecycleMatTop>(this.detach_Weld_RecycleMatTop));
this._Weld_StockInit = new EntitySet<Weld_StockInit>(new Action<Weld_StockInit>(this.attach_Weld_StockInit), new Action<Weld_StockInit>(this.detach_Weld_StockInit));
this._Weld_UsingMat = new EntitySet<Weld_UsingMat>(new Action<Weld_UsingMat>(this.attach_Weld_UsingMat), new Action<Weld_UsingMat>(this.detach_Weld_UsingMat));
this._Weld_UsingPlan = new EntitySet<Weld_UsingPlan>(new Action<Weld_UsingPlan>(this.attach_Weld_UsingPlan), new Action<Weld_UsingPlan>(this.detach_Weld_UsingPlan));
this._Weld_WeldType = default(EntityRef<Weld_WeldType>);
OnCreated();
}
@ -137680,7 +137440,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(10)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(50)")]
public string SteelType
{
get
@ -137760,84 +137520,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_ProjectPlan_Weld_WeldInfo", Storage="_Weld_ProjectPlan", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_ProjectPlan> Weld_ProjectPlan
{
get
{
return this._Weld_ProjectPlan;
}
set
{
this._Weld_ProjectPlan.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_WeldInfo", Storage="_Weld_RecycleMat", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_RecycleMat> Weld_RecycleMat
{
get
{
return this._Weld_RecycleMat;
}
set
{
this._Weld_RecycleMat.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMatTop_Weld_WeldInfo", Storage="_Weld_RecycleMatTop", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_RecycleMatTop> Weld_RecycleMatTop
{
get
{
return this._Weld_RecycleMatTop;
}
set
{
this._Weld_RecycleMatTop.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_StockInit_Weld_WeldInfo", Storage="_Weld_StockInit", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_StockInit> Weld_StockInit
{
get
{
return this._Weld_StockInit;
}
set
{
this._Weld_StockInit.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingMat_Weld_WeldInfo", Storage="_Weld_UsingMat", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_UsingMat> Weld_UsingMat
{
get
{
return this._Weld_UsingMat;
}
set
{
this._Weld_UsingMat.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingPlan_Weld_WeldInfo", Storage="_Weld_UsingPlan", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_UsingPlan> Weld_UsingPlan
{
get
{
return this._Weld_UsingPlan;
}
set
{
this._Weld_UsingPlan.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_WeldInfo_Weld_WeldType", Storage="_Weld_WeldType", ThisKey="WeldTypeId", OtherKey="WeldTypeId", IsForeignKey=true)]
public Weld_WeldType Weld_WeldType
{
@ -137891,78 +137573,6 @@ namespace Model
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
private void attach_Weld_ProjectPlan(Weld_ProjectPlan entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_ProjectPlan(Weld_ProjectPlan entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_RecycleMat(Weld_RecycleMat entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_RecycleMat(Weld_RecycleMat entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_RecycleMatTop(Weld_RecycleMatTop entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_RecycleMatTop(Weld_RecycleMatTop entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_StockInit(Weld_StockInit entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_StockInit(Weld_StockInit entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_UsingMat(Weld_UsingMat entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_UsingMat(Weld_UsingMat entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_UsingPlan(Weld_UsingPlan entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_UsingPlan(Weld_UsingPlan entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_WeldType")]