From bd5962e9411aeefdfa15384c50b1dc95d401cc3c Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Thu, 16 Apr 2026 14:56:53 +0800 Subject: [PATCH] =?UTF-8?q?20260416=20=E6=9D=90=E8=B4=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2026-04-16_bwj.sql | 3 + .../BaseInfo/HJGL_MaterialService.cs | 2 + .../HJGL/WeldingManage/PointManage.aspx.cs | 24 +- .../HJGLServer/BaseInfo/Material.aspx | 56 +-- .../HJGLServer/BaseInfo/Material.aspx.cs | 103 ++-- .../BaseInfo/Material.aspx.designer.cs | 109 ++--- HJGL_DS/Model/Model.cs | 442 ++---------------- 7 files changed, 181 insertions(+), 558 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2026-04-16_bwj.sql diff --git a/DataBase/版本日志/HJGLDB_DS_2026-04-16_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-04-16_bwj.sql new file mode 100644 index 0000000..dc768bb --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2026-04-16_bwj.sql @@ -0,0 +1,3 @@ + +alter table HJGL_BS_Steel add IsCracking bit +go \ No newline at end of file diff --git a/HJGL_DS/BLL/HJGLServer/BaseInfo/HJGL_MaterialService.cs b/HJGL_DS/BLL/HJGLServer/BaseInfo/HJGL_MaterialService.cs index afab6c8..af0f059 100644 --- a/HJGL_DS/BLL/HJGLServer/BaseInfo/HJGL_MaterialService.cs +++ b/HJGL_DS/BLL/HJGLServer/BaseInfo/HJGL_MaterialService.cs @@ -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(); } diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs index 9b0d3e3..e9a5d97 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs @@ -1344,9 +1344,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage { EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理未合格,"; } - else if ((DateTime.Now - joint.HotResultDate.Value).Days < 1) + else { - EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,"; + 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小时,"; + } + } } } } @@ -1529,9 +1537,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage { EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理未合格,"; } - else if ((DateTime.Now - joint.HotResultDate.Value).Days < 1) + else { - EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,"; + 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小时,"; + } + } } } } diff --git a/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx b/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx index 77c83d5..baa012a 100644 --- a/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx @@ -17,8 +17,8 @@ - @@ -37,14 +37,14 @@ - + - - + <%-- @@ -53,24 +53,25 @@ - - --%> + - - - - + <%-- --%> + + + - @@ -90,30 +91,31 @@ + LabelWidth="100px" BodyPadding="5px" Width="320px"> - + runat="server" LabelWidth="140px" LabelAlign="right"> - - + --%> + LabelWidth="140px" LabelAlign="right" ShowRedStar="true" Required="true" > - + - - + + + @@ -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('提交数据（编辑）'); diff --git a/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.cs index beec42f..b61e5ed 100644 --- a/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.cs @@ -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 @@ /// /// /// - 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; + //} /// /// 获取工作阶段 @@ -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); + //} } } \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.designer.cs index b2ab646..469d8cb 100644 --- a/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGLServer.BaseInfo { - - - public partial class Material { - +namespace FineUIPro.Web.HJGLServer.BaseInfo +{ + + + public partial class Material + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// txtCode 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtCode; - + /// /// txtName 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtName; - + /// /// drpSteType 控件。 /// @@ -83,25 +85,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpSteType; - - /// - /// Label1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label1; - - /// - /// Label2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::System.Web.UI.WebControls.Label Label2; - + /// /// ToolbarSeparator1 控件。 /// @@ -110,7 +94,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -119,7 +103,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -128,7 +112,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// SimpleForm1 控件。 /// @@ -137,7 +121,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.SimpleForm SimpleForm1; - + /// /// hfFormID 控件。 /// @@ -146,7 +130,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hfFormID; - + /// /// txtSte_Code 控件。 /// @@ -155,7 +139,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSte_Code; - + /// /// txtSte_Name 控件。 /// @@ -164,25 +148,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtSte_Name; - - /// - /// drpMaterialClass 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpMaterialClass; - - /// - /// drpMaterialGroup 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpMaterialGroup; - + /// /// ddlSteType 控件。 /// @@ -191,7 +157,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlSteType; - + /// /// txtHardQuaStandard 控件。 /// @@ -200,7 +166,16 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtHardQuaStandard; - + + /// + /// cbIsCracking 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox cbIsCracking; + /// /// cbIsUse 控件。 /// @@ -209,7 +184,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.CheckBox cbIsUse; - + /// /// txtRemark 控件。 /// @@ -218,7 +193,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextArea txtRemark; - + /// /// Toolbar1 控件。 /// @@ -227,7 +202,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// btnNew 控件。 /// @@ -236,7 +211,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnDelete 控件。 /// @@ -245,7 +220,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDelete; - + /// /// ToolbarFill1 控件。 /// @@ -254,7 +229,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnSave 控件。 /// @@ -263,7 +238,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - + /// /// Menu1 控件。 /// @@ -272,7 +247,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// @@ -281,7 +256,7 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + /// /// btnMenuDelete 控件。 /// diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index f98f69f..e1eef6c 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -24850,6 +24850,8 @@ namespace Model private System.Nullable _IsUse; + private System.Nullable _IsCracking; + private EntitySet _HJGL_BO_Batch; private EntitySet _HJGL_BS_MaterialCompare; @@ -24894,6 +24896,8 @@ namespace Model partial void OnHardQuaStandardChanged(); partial void OnIsUseChanging(System.Nullable value); partial void OnIsUseChanged(); + partial void OnIsCrackingChanging(System.Nullable 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 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 { @@ -131749,8 +131773,6 @@ namespace Model private EntityRef _Base_Project; - private EntityRef _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); - this._Weld_WeldInfo = default(EntityRef); 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; - private EntityRef _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); this._Weld_UsingMat = default(EntityRef); this._Weld_UsingPlan = default(EntityRef); - this._Weld_WeldInfo = default(EntityRef); 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; - private EntityRef _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); this._Weld_UsingMat = default(EntityRef); this._Weld_UsingPlan = default(EntityRef); - this._Weld_WeldInfo = default(EntityRef); 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 _Weight; - private EntityRef _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); 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; - private EntityRef _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); this._Weld_Storeman = default(EntityRef); this._Weld_UsingPlan = default(EntityRef); - this._Weld_WeldInfo = default(EntityRef); 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; - private EntityRef _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(new Action(this.attach_Weld_RecycleMat), new Action(this.detach_Weld_RecycleMat)); this._Weld_RecycleMatTop = new EntitySet(new Action(this.attach_Weld_RecycleMatTop), new Action(this.detach_Weld_RecycleMatTop)); this._Weld_UsingMat = new EntitySet(new Action(this.attach_Weld_UsingMat), new Action(this.detach_Weld_UsingMat)); - this._Weld_WeldInfo = default(EntityRef); 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 _IsLock; - private EntitySet _Weld_ProjectPlan; - - private EntitySet _Weld_RecycleMat; - - private EntitySet _Weld_RecycleMatTop; - - private EntitySet _Weld_StockInit; - - private EntitySet _Weld_UsingMat; - - private EntitySet _Weld_UsingPlan; - private EntityRef _Weld_WeldType; #region 可扩展性方法定义 @@ -137526,12 +137292,6 @@ namespace Model public Weld_WeldInfo() { - this._Weld_ProjectPlan = new EntitySet(new Action(this.attach_Weld_ProjectPlan), new Action(this.detach_Weld_ProjectPlan)); - this._Weld_RecycleMat = new EntitySet(new Action(this.attach_Weld_RecycleMat), new Action(this.detach_Weld_RecycleMat)); - this._Weld_RecycleMatTop = new EntitySet(new Action(this.attach_Weld_RecycleMatTop), new Action(this.detach_Weld_RecycleMatTop)); - this._Weld_StockInit = new EntitySet(new Action(this.attach_Weld_StockInit), new Action(this.detach_Weld_StockInit)); - this._Weld_UsingMat = new EntitySet(new Action(this.attach_Weld_UsingMat), new Action(this.detach_Weld_UsingMat)); - this._Weld_UsingPlan = new EntitySet(new Action(this.attach_Weld_UsingPlan), new Action(this.detach_Weld_UsingPlan)); this._Weld_WeldType = default(EntityRef); 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 - { - 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 - { - 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 - { - 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 - { - 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 - { - 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 - { - 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")]