diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj index dd9fef3..78fefbf 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj @@ -1156,6 +1156,7 @@ + @@ -5884,6 +5885,13 @@ RepairHotProessTrustEdit.aspx + + DataInEdit.aspx + ASPXCodeBehind + + + DataInEdit.aspx + JoinMarking.aspx ASPXCodeBehind diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index e3436b8..6e29203 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Release|Any CPU + Debug|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx new file mode 100644 index 0000000..8dc9e31 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx @@ -0,0 +1,158 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DataInEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.JoinMarking.DataInEdit" %> + + + + + 导入信息维护 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.cs new file mode 100644 index 0000000..e745f19 --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.cs @@ -0,0 +1,570 @@ +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using BLL; +namespace FineUIPro.Web.HJGL.JoinMarking +{ + + + public partial class DataInEdit : PageBase + { + #region 定义项 + /// + /// 临时表主键 + /// + public string TempId + { + get + { + return (string)ViewState["TempId"]; + } + set + { + ViewState["TempId"] = value; + } + } + #endregion + + #region 加载页面 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.TempId = Request.Params["TempId"]; + var dataInTemp = BLL.DataInTempService.GetDataInTempByTempId(this.TempId); + if (dataInTemp != null) + { + this.txtValue1.Text = dataInTemp.Value1; + this.txtValue2.Text = dataInTemp.Value2; + this.txtValue3.Text = dataInTemp.Value3; + this.txtValue4.Text = dataInTemp.Value4; + this.txtValue5.Text = dataInTemp.Value5; + this.txtValue6.Text = dataInTemp.Value6; + this.txtValue7.Text = dataInTemp.Value7; + this.txtValue8.Text = dataInTemp.Value8; + this.txtValue9.Text = dataInTemp.Value9; + this.txtValue10.Text = dataInTemp.Value10; + this.txtValue11.Text = dataInTemp.Value11; + this.txtValue12.Text = dataInTemp.Value12; + this.txtValue13.Text = dataInTemp.Value13; + this.txtValue14.Text = dataInTemp.Value14; + this.txtValue15.Text = dataInTemp.Value15; + this.txtValue16.Text = dataInTemp.Value16; + this.txtValue17.Text = dataInTemp.Value17; + this.txtValue18.Text = dataInTemp.Value18; + this.txtValue19.Text = dataInTemp.Value19; + this.txtValue20.Text = dataInTemp.Value20; + this.txtValue21.Text = dataInTemp.Value21; + this.txtValue22.Text = dataInTemp.Value22; + this.txtValue23.Text = dataInTemp.Value23; + this.txtValue24.Text = dataInTemp.Value24; + this.txtValue25.Text = dataInTemp.Value25; + this.txtValue26.Text = dataInTemp.Value26; + this.txtValue27.Text = dataInTemp.Value27; + this.txtValue28.Text = dataInTemp.Value28; + this.txtValue29.Text = dataInTemp.Value29; + this.txtValue30.Text = dataInTemp.Value30; + this.txtValue31.Text = dataInTemp.Value31; + this.txtValue32.Text = dataInTemp.Value32; + this.txtValue33.Text = dataInTemp.Value33; + this.txtValue34.Text = dataInTemp.Value34; + this.txtValue35.Text = dataInTemp.Value35; + this.lbErrCout.Text = dataInTemp.ToopValue; + if (dataInTemp.Type == "1") + { + this.SimpleForm2.Hidden = true; + this.SimpleForm3.Hidden = false; + } + else + { + this.SimpleForm2.Hidden = false; + this.SimpleForm3.Hidden = true; + } + } + } + } + #endregion + + #region 提交按钮 + /// + /// 提交按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + var dataInTemp = BLL.DataInTempService.GetDataInTempByTempId(this.TempId); + if (this.ckAll.Checked) + { + var allDataInTemp = from x in Funs.DB.HJGL_Sys_DataInTemp where x.ProjectId == this.CurrUser.LoginProjectId && x.UserId == this.CurrUser.UserId select x; + if (dataInTemp.Value1 != this.txtValue1.Text.Trim()) + { + var tempValue1 = allDataInTemp.Where(x => x.Value1 == dataInTemp.Value1 || (x.Value1 == null && dataInTemp.Value1 == null)); + if (tempValue1 != null) + { + foreach (var item in tempValue1) + { + item.Value1 = this.txtValue1.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value2 != this.txtValue2.Text.Trim()) + { + var tempValue2 = allDataInTemp.Where(x => x.Value2 == dataInTemp.Value2 || (x.Value2 == null && dataInTemp.Value2 == null)); + if (tempValue2 != null) + { + foreach (var item in tempValue2) + { + item.Value2 = this.txtValue2.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value3 != this.txtValue3.Text.Trim()) + { + var tempValue3 = allDataInTemp.Where(x => x.Value3 == dataInTemp.Value3 || (x.Value3 == null && dataInTemp.Value3 == null)); + if (tempValue3 != null) + { + foreach (var item in tempValue3) + { + item.Value3 = this.txtValue3.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value5 != this.txtValue5.Text.Trim()) + { + var tempValue5 = allDataInTemp.Where(x => x.Value5 == dataInTemp.Value5 || (x.Value5 == null && dataInTemp.Value5 == null)); + if (tempValue5 != null) + { + foreach (var item in tempValue5) + { + item.Value5 = this.txtValue5.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value6 != this.txtValue6.Text.Trim()) + { + var tempValue6 = allDataInTemp.Where(x => x.Value6 == dataInTemp.Value6 || (x.Value6 == null && dataInTemp.Value6 == null)); + if (tempValue6 != null) + { + foreach (var item in tempValue6) + { + item.Value6 = this.txtValue6.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value7 != this.txtValue7.Text.Trim()) + { + var tempValue7 = allDataInTemp.Where(x => x.Value7 == dataInTemp.Value7 || (x.Value7 == null && dataInTemp.Value7 == null)); + if (tempValue7 != null) + { + foreach (var item in tempValue7) + { + item.Value7 = this.txtValue7.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value8 != this.txtValue8.Text.Trim()) + { + var tempValue8 = allDataInTemp.Where(x => x.Value8 == dataInTemp.Value8 || (x.Value8 == null && dataInTemp.Value8 == null)); + if (tempValue8 != null) + { + foreach (var item in tempValue8) + { + item.Value8 = this.txtValue8.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value9 != this.txtValue9.Text.Trim()) + { + var tempValue9 = allDataInTemp.Where(x => x.Value9 == dataInTemp.Value9 || (x.Value9 == null && dataInTemp.Value9 == null)); + if (tempValue9 != null) + { + foreach (var item in tempValue9) + { + item.Value9 = this.txtValue9.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value10 != this.txtValue10.Text.Trim()) + { + var tempValue10 = allDataInTemp.Where(x => x.Value10 == dataInTemp.Value10 || (x.Value10 == null && dataInTemp.Value10 == null)); + if (tempValue10 != null) + { + foreach (var item in tempValue10) + { + item.Value10 = this.txtValue10.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value11 != this.txtValue11.Text.Trim()) + { + var tempValue11 = allDataInTemp.Where(x => x.Value11 == dataInTemp.Value11 || (x.Value11 == null && dataInTemp.Value11 == null)); + if (tempValue11 != null) + { + foreach (var item in tempValue11) + { + item.Value11 = this.txtValue11.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value12 != this.txtValue12.Text.Trim()) + { + var tempValue12 = allDataInTemp.Where(x => x.Value12 == dataInTemp.Value12 || (x.Value12 == null && dataInTemp.Value12 == null)); + if (tempValue12 != null) + { + foreach (var item in tempValue12) + { + item.Value12 = this.txtValue12.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value13 != this.txtValue13.Text.Trim()) + { + var tempValue13 = allDataInTemp.Where(x => x.Value13 == dataInTemp.Value13 || (x.Value13 == null && dataInTemp.Value13 == null)); + if (tempValue13 != null) + { + foreach (var item in tempValue13) + { + item.Value13 = this.txtValue13.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value14 != this.txtValue14.Text.Trim()) + { + var tempValue14 = allDataInTemp.Where(x => x.Value14 == dataInTemp.Value14 || (x.Value14 == null && dataInTemp.Value14 == null)); + if (tempValue14 != null) + { + foreach (var item in tempValue14) + { + item.Value14 = this.txtValue14.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value15 != this.txtValue15.Text.Trim()) + { + var tempValue15 = allDataInTemp.Where(x => x.Value15 == dataInTemp.Value15 || (x.Value15 == null && dataInTemp.Value15 == null)); + if (tempValue15 != null) + { + foreach (var item in tempValue15) + { + item.Value15 = this.txtValue15.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value16 != this.txtValue16.Text.Trim()) + { + var tempValue16 = allDataInTemp.Where(x => x.Value16 == dataInTemp.Value16 || (x.Value16 == null && dataInTemp.Value16 == null)); + if (tempValue16 != null) + { + foreach (var item in tempValue16) + { + item.Value16 = this.txtValue16.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value17 != this.txtValue17.Text.Trim()) + { + var tempValue17 = allDataInTemp.Where(x => x.Value17 == dataInTemp.Value17 || (x.Value17 == null && dataInTemp.Value17 == null)); + if (tempValue17 != null) + { + foreach (var item in tempValue17) + { + item.Value17 = this.txtValue17.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value18 != this.txtValue18.Text.Trim()) + { + var tempValue18 = allDataInTemp.Where(x => x.Value18 == dataInTemp.Value18 || (x.Value18 == null && dataInTemp.Value18 == null)); + if (tempValue18 != null) + { + foreach (var item in tempValue18) + { + item.Value18 = this.txtValue18.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value19 != this.txtValue19.Text.Trim()) + { + var tempValue19 = allDataInTemp.Where(x => x.Value19 == dataInTemp.Value19 || (x.Value19 == null && dataInTemp.Value19 == null)); + if (tempValue19 != null) + { + foreach (var item in tempValue19) + { + item.Value19 = this.txtValue19.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value20 != this.txtValue20.Text.Trim()) + { + var tempValue20 = allDataInTemp.Where(x => x.Value20 == dataInTemp.Value20 || (x.Value20 == null && dataInTemp.Value20 == null)); + if (tempValue20 != null) + { + foreach (var item in tempValue20) + { + item.Value20 = this.txtValue20.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value21 != this.txtValue21.Text.Trim()) + { + var tempValue21 = allDataInTemp.Where(x => x.Value21 == dataInTemp.Value21 || (x.Value21 == null && dataInTemp.Value21 == null)); + if (tempValue21 != null) + { + foreach (var item in tempValue21) + { + item.Value21 = this.txtValue21.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value22 != this.txtValue22.Text.Trim()) + { + var tempValue22 = allDataInTemp.Where(x => x.Value22 == dataInTemp.Value22 || (x.Value22 == null && dataInTemp.Value22 == null)); + if (tempValue22 != null) + { + foreach (var item in tempValue22) + { + item.Value22 = this.txtValue22.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value23 != this.txtValue23.Text.Trim()) + { + var tempValue23 = allDataInTemp.Where(x => x.Value23 == dataInTemp.Value23 || (x.Value23 == null && dataInTemp.Value23 == null)); + if (tempValue23 != null) + { + foreach (var item in tempValue23) + { + item.Value23 = this.txtValue23.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value24 != this.txtValue24.Text.Trim()) + { + var tempValue24 = allDataInTemp.Where(x => x.Value24 == dataInTemp.Value24 || (x.Value24 == null && dataInTemp.Value24 == null)); + if (tempValue24 != null) + { + foreach (var item in tempValue24) + { + item.Value24 = this.txtValue24.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value25 != this.txtValue25.Text.Trim()) + { + var tempValue25 = allDataInTemp.Where(x => x.Value25 == dataInTemp.Value25 || (x.Value25 == null && dataInTemp.Value25 == null)); + if (tempValue25 != null) + { + foreach (var item in tempValue25) + { + item.Value25 = this.txtValue25.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value26 != this.txtValue26.Text.Trim()) + { + var tempValue26 = allDataInTemp.Where(x => x.Value26 == dataInTemp.Value26 || (x.Value26 == null && dataInTemp.Value26 == null)); + if (tempValue26 != null) + { + foreach (var item in tempValue26) + { + item.Value26 = this.txtValue26.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value27 != this.txtValue27.Text.Trim()) + { + var tempValue27 = allDataInTemp.Where(x => x.Value27 == dataInTemp.Value27 || (x.Value27 == null && dataInTemp.Value27 == null)); + if (tempValue27 != null) + { + foreach (var item in tempValue27) + { + item.Value27 = this.txtValue27.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value28 != this.txtValue28.Text.Trim()) + { + var tempValue28 = allDataInTemp.Where(x => x.Value28 == dataInTemp.Value28 || (x.Value28 == null && dataInTemp.Value28 == null)); + if (tempValue28 != null) + { + foreach (var item in tempValue28) + { + item.Value28 = this.txtValue28.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value29 != this.txtValue29.Text.Trim()) + { + var tempValue29 = allDataInTemp.Where(x => x.Value29 == dataInTemp.Value29 || (x.Value29 == null && dataInTemp.Value29 == null)); + if (tempValue29 != null) + { + foreach (var item in tempValue29) + { + item.Value29 = this.txtValue29.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value30 != this.txtValue30.Text.Trim()) + { + var tempValue30 = allDataInTemp.Where(x => x.Value30 == dataInTemp.Value30 || (x.Value30 == null && dataInTemp.Value30 == null)); + if (tempValue30 != null) + { + foreach (var item in tempValue30) + { + item.Value30 = this.txtValue30.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value31 != this.txtValue31.Text.Trim()) + { + var tempValue31 = allDataInTemp.Where(x => x.Value31 == dataInTemp.Value31 || (x.Value31 == null && dataInTemp.Value31 == null)); + if (tempValue31 != null) + { + foreach (var item in tempValue31) + { + item.Value31 = this.txtValue31.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value32 != this.txtValue32.Text.Trim()) + { + var tempValue32 = allDataInTemp.Where(x => x.Value32 == dataInTemp.Value32 || (x.Value32 == null && dataInTemp.Value32 == null)); + if (tempValue32 != null) + { + foreach (var item in tempValue32) + { + item.Value32 = this.txtValue32.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value33 != this.txtValue33.Text.Trim()) + { + var tempValue33 = allDataInTemp.Where(x => x.Value33 == dataInTemp.Value33 || (x.Value33 == null && dataInTemp.Value33 == null)); + if (tempValue33 != null) + { + foreach (var item in tempValue33) + { + item.Value33 = this.txtValue33.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value34 != this.txtValue34.Text.Trim()) + { + var tempValue34 = allDataInTemp.Where(x => x.Value34 == dataInTemp.Value34 || (x.Value34 == null && dataInTemp.Value34 == null)); + if (tempValue34 != null) + { + foreach (var item in tempValue34) + { + item.Value34 = this.txtValue34.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + if (dataInTemp.Value35 != this.txtValue35.Text.Trim()) + { + var tempValue35 = allDataInTemp.Where(x => x.Value35 == dataInTemp.Value35 || (x.Value35 == null && dataInTemp.Value35 == null)); + if (tempValue35 != null) + { + foreach (var item in tempValue35) + { + item.Value35 = this.txtValue35.Text.Trim(); + Funs.DB.SubmitChanges(); + } + } + } + } + else + { + Model.HJGL_Sys_DataInTemp newDataInTemp = new Model.HJGL_Sys_DataInTemp(); + newDataInTemp.ProjectId = this.CurrUser.LoginProjectId; + newDataInTemp.UserId = this.CurrUser.UserId; + newDataInTemp.Time = System.DateTime.Now; + newDataInTemp.Value1 = this.txtValue1.Text.Trim(); + newDataInTemp.Value2 = this.txtValue2.Text.Trim(); + newDataInTemp.Value3 = this.txtValue3.Text.Trim(); + newDataInTemp.Value4 = this.txtValue4.Text.Trim(); + newDataInTemp.Value5 = this.txtValue5.Text.Trim(); + newDataInTemp.Value6 = this.txtValue6.Text.Trim(); + newDataInTemp.Value7 = this.txtValue7.Text.Trim(); + newDataInTemp.Value8 = this.txtValue8.Text.Trim(); + newDataInTemp.Value9 = this.txtValue9.Text.Trim(); + newDataInTemp.Value10 = this.txtValue10.Text.Trim(); + newDataInTemp.Value11 = this.txtValue11.Text.Trim(); + newDataInTemp.Value12 = this.txtValue12.Text.Trim(); + newDataInTemp.Value13 = this.txtValue13.Text.Trim(); + newDataInTemp.Value14 = this.txtValue14.Text.Trim(); + newDataInTemp.Value15 = this.txtValue15.Text.Trim(); + newDataInTemp.Value16 = this.txtValue16.Text.Trim(); + newDataInTemp.Value17 = this.txtValue17.Text.Trim(); + newDataInTemp.Value18 = this.txtValue18.Text.Trim(); + newDataInTemp.Value19 = this.txtValue19.Text.Trim(); + newDataInTemp.Value20 = this.txtValue20.Text.Trim(); + newDataInTemp.Value21 = this.txtValue21.Text.Trim(); + newDataInTemp.Value22 = this.txtValue22.Text.Trim(); + newDataInTemp.Value23 = this.txtValue23.Text.Trim(); + newDataInTemp.Value24 = this.txtValue24.Text.Trim(); + newDataInTemp.Value25 = this.txtValue25.Text.Trim(); + newDataInTemp.Value26 = this.txtValue26.Text.Trim(); + newDataInTemp.Value27 = this.txtValue27.Text.Trim(); + newDataInTemp.Value28 = this.txtValue28.Text.Trim(); + newDataInTemp.Value29 = this.txtValue29.Text.Trim(); + newDataInTemp.Value30 = this.txtValue30.Text.Trim(); + newDataInTemp.Value31 = this.txtValue31.Text.Trim(); + newDataInTemp.Value32 = this.txtValue32.Text.Trim(); + newDataInTemp.Value33 = this.txtValue33.Text.Trim(); + newDataInTemp.Value34 = this.txtValue34.Text.Trim(); + newDataInTemp.Value35 = this.txtValue35.Text.Trim(); + + if (!string.IsNullOrEmpty(this.TempId)) + { + newDataInTemp.TempId = this.TempId; + newDataInTemp.ToopValue = null; + BLL.DataInTempService.UpdateDataInTemp(newDataInTemp); + } + } + Alert.ShowInTop("信息修改完成！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + #endregion + } +} \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.designer.cs new file mode 100644 index 0000000..9b77bdf --- /dev/null +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/DataInEdit.aspx.designer.cs @@ -0,0 +1,431 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.HJGL.JoinMarking +{ + + + public partial class DataInEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// ckAll 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckAll; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// lbErrCout 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea lbErrCout; + + /// + /// txtValue1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue1; + + /// + /// txtValue2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue2; + + /// + /// txtValue3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue3; + + /// + /// txtValue4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue4; + + /// + /// txtValue5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue5; + + /// + /// txtValue7 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue7; + + /// + /// txtValue8 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue8; + + /// + /// txtValue13 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue13; + + /// + /// txtValue15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtValue15; + + /// + /// txtValue18 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue18; + + /// + /// txtValue19 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue19; + + /// + /// txtValue20 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtValue20; + + /// + /// txtValue21 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtValue21; + + /// + /// txtValue28 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue28; + + /// + /// txtValue23 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue23; + + /// + /// txtValue24 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue24; + + /// + /// SimpleForm2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm2; + + /// + /// txtValue9 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue9; + + /// + /// txtValue10 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue10; + + /// + /// txtValue11 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtValue11; + + /// + /// txtValue12 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue12; + + /// + /// txtValue6 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue6; + + /// + /// txtValue14 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue14; + + /// + /// txtValue16 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue16; + + /// + /// txtValue17 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue17; + + /// + /// txtValue22 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue22; + + /// + /// txtValue25 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue25; + + /// + /// txtValue26 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue26; + + /// + /// txtValue27 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue27; + + /// + /// txtValue29 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtValue29; + + /// + /// txtValue30 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue30; + + /// + /// txtValue31 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue31; + + /// + /// txtValue32 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtValue32; + + /// + /// txtValue33 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtValue33; + + /// + /// labelTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label labelTemp; + + /// + /// SimpleForm3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm3; + + /// + /// txtValue34 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtValue34; + + /// + /// txtValue35 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtValue35; + } +} diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JoinMarking.aspx b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JoinMarking.aspx index 8dee127..9b8b8c0 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JoinMarking.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/JoinMarking.aspx @@ -5,7 +5,7 @@ - <asp:Literal runat="server" Text="<%$ Resources:Lan,PipelineManage_PageTitle%>"/> + <asp:Literal runat="server" Text="焊口标注"/>
@@ -13,11 +13,11 @@ - diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx index 49bd44b..95e3037 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx @@ -48,152 +48,123 @@
- - + runat="server" Text="编辑" Icon="TableEdit"> + ConfirmText="删除选中行？" ConfirmTarget="Top" runat="server" Text="删除" Icon="Delete"> diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs index 231c30c..7f7ace4 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFMarking.aspx.cs @@ -837,7 +837,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking newDataInTemp.Time = System.DateTime.Now; newDataInTemp.Type = this.IsPDMS; newDataInTemp.RowNo = i + 2; - newDataInTemp.Value1 = unit.UnitCode; + newDataInTemp.Value1 = unit!=null? unit.UnitCode:null; newDataInTemp.Value3 = iso.ISO_IsoNo; newDataInTemp.Value4 = item.Value("label"); newDataInTemp.Value46 = item.Value("x"); diff --git a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs index bdea548..a2ca513 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/JoinMarking/PDFShow.aspx.cs @@ -86,7 +86,7 @@ namespace FineUIPro.Web.HJGL.JoinMarking UnitName = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == iso.BSU_ID)?.UnitName; } - var jotids = Funs.DB.HJGL_PW_IsoInfo.Where(x => x.ISO_ID == ISO_ID && x.AttachSourceId == FileId).Select(x => x.JOT_ID).ToList(); + var jotids = Funs.DB.HJGL_PW_JointInfo.Where(x => x.ISO_ID == ISO_ID && x.AttachSourceId == FileId).Select(x => x.JOT_ID).ToList(); string sqlData = @"select a.JOT_ID ,a.JOT_JointNo,c.WED_Code,JOT_Location,b.JOT_WeldDate ,'/' DetectionTypeCode ,'/' IsRepair,'/' IsHotProcess,x,y,x2,y2 ,(case a.JOT_JointStatus diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx index c9f2549..0393ebd 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PipelineManage.aspx @@ -124,6 +124,10 @@ + - + diff --git a/HJGL_DS/Model/Model.cs b/HJGL_DS/Model/Model.cs index 39d9dcb..7618bbc 100644 --- a/HJGL_DS/Model/Model.cs +++ b/HJGL_DS/Model/Model.cs @@ -48670,6 +48670,16 @@ namespace Model private System.Nullable _IsGold; + private string _AttachSourceId; + + private string _X; + + private string _Y; + + private string _X2; + + private string _Y2; + private EntityRef _HJGL_BO_BatchDetail; private EntitySet _HJGL_BO_PreWeldReportMain; @@ -48924,6 +48934,16 @@ namespace Model partial void OnJot_WeldingDateChanged(); partial void OnIsGoldChanging(System.Nullable value); partial void OnIsGoldChanged(); + partial void OnAttachSourceIdChanging(string value); + partial void OnAttachSourceIdChanged(); + partial void OnXChanging(string value); + partial void OnXChanged(); + partial void OnYChanging(string value); + partial void OnYChanged(); + partial void OnX2Changing(string value); + partial void OnX2Changed(); + partial void OnY2Changing(string value); + partial void OnY2Changed(); #endregion public HJGL_PW_JointInfo() @@ -50936,6 +50956,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttachSourceId", DbType="NVarChar(50)")] + public string AttachSourceId + { + get + { + return this._AttachSourceId; + } + set + { + if ((this._AttachSourceId != value)) + { + this.OnAttachSourceIdChanging(value); + this.SendPropertyChanging(); + this._AttachSourceId = value; + this.SendPropertyChanged("AttachSourceId"); + this.OnAttachSourceIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="x", Storage="_X", DbType="NVarChar(50)")] + public string X + { + get + { + return this._X; + } + set + { + if ((this._X != value)) + { + this.OnXChanging(value); + this.SendPropertyChanging(); + this._X = value; + this.SendPropertyChanged("X"); + this.OnXChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="y", Storage="_Y", DbType="NVarChar(50)")] + public string Y + { + get + { + return this._Y; + } + set + { + if ((this._Y != value)) + { + this.OnYChanging(value); + this.SendPropertyChanging(); + this._Y = value; + this.SendPropertyChanged("Y"); + this.OnYChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="x2", Storage="_X2", DbType="NVarChar(50)")] + public string X2 + { + get + { + return this._X2; + } + set + { + if ((this._X2 != value)) + { + this.OnX2Changing(value); + this.SendPropertyChanging(); + this._X2 = value; + this.SendPropertyChanged("X2"); + this.OnX2Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="y2", Storage="_Y2", DbType="NVarChar(1)")] + public string Y2 + { + get + { + return this._Y2; + } + set + { + if ((this._Y2 != value)) + { + this.OnY2Changing(value); + this.SendPropertyChanging(); + this._Y2 = value; + this.SendPropertyChanged("Y2"); + this.OnY2Changed(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_BO_BatchDetail_HJGL_PW_JointInfo", Storage="_HJGL_BO_BatchDetail", ThisKey="JOT_ID", OtherKey="JOT_ID", IsUnique=true, IsForeignKey=false, DeleteRule="NO ACTION")] public HJGL_BO_BatchDetail HJGL_BO_BatchDetail { @@ -131797,6 +131917,8 @@ namespace Model private EntityRef _Base_Project; + private EntityRef _Weld_WeldInfo; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -131818,6 +131940,7 @@ namespace Model public Weld_ProjectPlan() { this._Base_Project = default(EntityRef); + this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -131876,6 +131999,10 @@ 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; @@ -131979,6 +132106,40 @@ 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; @@ -132232,6 +132393,8 @@ namespace Model private EntityRef _Weld_UsingPlan; + private EntityRef _Weld_WeldInfo; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -132280,6 +132443,7 @@ namespace Model this._Weld_Storeman = default(EntityRef); this._Weld_UsingMat = default(EntityRef); this._Weld_UsingPlan = default(EntityRef); + this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -132358,6 +132522,10 @@ 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,6 +132963,40 @@ 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; @@ -132858,6 +133060,8 @@ namespace Model private EntityRef _Weld_UsingPlan; + private EntityRef _Weld_WeldInfo; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -132898,6 +133102,7 @@ namespace Model this._Weld_Storeman = default(EntityRef); this._Weld_UsingMat = default(EntityRef); this._Weld_UsingPlan = default(EntityRef); + this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -132976,6 +133181,10 @@ 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; @@ -133333,6 +133542,40 @@ 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; @@ -134253,6 +134496,8 @@ namespace Model private System.Nullable _Weight; + private EntityRef _Weld_WeldInfo; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -134269,6 +134514,7 @@ namespace Model public Weld_StockInit() { + this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -134303,6 +134549,10 @@ 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; @@ -134352,6 +134602,40 @@ 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; @@ -135262,6 +135546,8 @@ namespace Model private EntityRef _Weld_UsingPlan; + private EntityRef _Weld_WeldInfo; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -135317,6 +135603,7 @@ namespace Model this._Base_Project = default(EntityRef); this._Weld_Storeman = default(EntityRef); this._Weld_UsingPlan = default(EntityRef); + this._Weld_WeldInfo = default(EntityRef); OnCreated(); } @@ -135395,6 +135682,10 @@ 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; @@ -135880,6 +136171,40 @@ 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; @@ -135989,6 +136314,8 @@ namespace Model private EntitySet _Weld_UsingMat; + private EntityRef _Weld_WeldInfo; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -136052,6 +136379,7 @@ 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(); } @@ -136086,6 +136414,10 @@ 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; @@ -136614,6 +136946,40 @@ 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; @@ -136903,7 +137269,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(10)")] public string SteelType { get @@ -137284,6 +137650,18 @@ 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 可扩展性方法定义 @@ -137316,6 +137694,12 @@ 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(); } @@ -137464,7 +137848,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(10)")] public string SteelType { get @@ -137544,6 +137928,84 @@ 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 { @@ -137597,6 +138059,78 @@ 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")] diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 8cd7f1f..ef14066 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - Release|Any CPU + Debug|Any CPU FolderProfile true