diff --git a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs index b763fe1..d27f5f6 100644 --- a/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs +++ b/HJGL_DS/BLL/HJGL/WeldingManage/HJGL_PW_JointInfoService.cs @@ -1339,5 +1339,19 @@ namespace BLL { return (from x in Funs.DB.HJGL_PW_JointInfo where x.ISO_ID == iso_id select x).Count(); } + + /// + /// 根据项目Id获取支管连接焊缝和角焊缝 + /// + /// + /// + public static List GetJointInfoByProjectId(string projectId) + { + return (from x in Funs.DB.HJGL_PW_JointInfo + join y in Funs.DB.HJGL_BS_JointType on x.JOTY_ID equals y.JOTY_ID + where x.ProjectId == projectId + && (y.JOTY_Name.Contains("支管连接焊缝") || y.JOTY_Name.Contains("角焊缝")) + select x).ToList(); + } } } diff --git a/HJGL_DS/BLL/JGZL/TeamWeldingInspectionItemService.cs b/HJGL_DS/BLL/JGZL/TeamWeldingInspectionItemService.cs index 1697313..4368b3c 100644 --- a/HJGL_DS/BLL/JGZL/TeamWeldingInspectionItemService.cs +++ b/HJGL_DS/BLL/JGZL/TeamWeldingInspectionItemService.cs @@ -32,6 +32,17 @@ namespace BLL return (from x in Funs.DB.JGZL_TeamWeldingInspectionItem where x.TeamWeldingInspectionId == teamWeldingInspectionId select x).ToList(); } + /// + /// 根据管线号、焊口号获取支管连接焊接接头、角焊接头组对焊接检查记录 + /// + /// + /// + /// + public static Model.JGZL_TeamWeldingInspectionItem GetTeamWeldingInspectionItemByIsoNoAndJointNo(string isoNo,string jotNo) + { + return Funs.DB.JGZL_TeamWeldingInspectionItem.FirstOrDefault(e => e.PipelineNo == isoNo && e.WeldingJointNo == jotNo); + } + /// /// 添加 /// diff --git a/HJGL_DS/BLL/JGZL/TeamWeldingInspectionService.cs b/HJGL_DS/BLL/JGZL/TeamWeldingInspectionService.cs index b390c25..8c578a3 100644 --- a/HJGL_DS/BLL/JGZL/TeamWeldingInspectionService.cs +++ b/HJGL_DS/BLL/JGZL/TeamWeldingInspectionService.cs @@ -23,6 +23,16 @@ namespace BLL return Funs.DB.JGZL_TeamWeldingInspection.FirstOrDefault(e => e.TeamWeldingInspectionId == teamWeldingInspectionId); } + /// + /// 根据项目Id获取支管连接焊接接头、角焊接头组对焊接检查记录主表 + /// + /// + /// + public static Model.JGZL_TeamWeldingInspection GetTeamWeldingInspectionByProjectId(string projectId) + { + return Funs.DB.JGZL_TeamWeldingInspection.FirstOrDefault(e => e.ProjectId == projectId); + } + /// /// 添加 /// diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx index 7fb1a51..251c29d 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/支管连接焊接接头、角焊接头组对焊接检查记录.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + diff --git a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊口检测委托单.frx b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊口检测委托单.frx index c9ddb74..2d5e8c9 100644 --- a/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊口检测委托单.frx +++ b/HJGL_DS/FineUIPro.Web/File/Fastreport/JGZL/管道焊口检测委托单.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -42,7 +42,7 @@ namespace FastReport } - + @@ -68,27 +68,27 @@ namespace FastReport - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + @@ -131,7 +131,7 @@ namespace FastReport - + @@ -208,21 +208,21 @@ namespace FastReport - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -240,22 +240,22 @@ namespace FastReport - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -274,21 +274,21 @@ namespace FastReport - - - - - - + + + + + + - - - - + + + + - - + + diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx index e70e7bc..bec998a 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx +++ b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx @@ -37,9 +37,11 @@ + + @@ -49,15 +51,15 @@ + SortField="CheckDate,PipelineNo,WeldingJointNo" SortDirection="ASC" OnPreDataBound="Grid1_PreDataBound" + EnableTextSelection="True" AutoScroll="true"> - - - + + + + @@ -66,26 +68,125 @@ - - - - - - - - + FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" Width="100px"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + <%-- - - + --%> + <%-- @@ -97,36 +198,36 @@ - + --%> - + --%> - + <%-- - + --%> - + --%> diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs index afe8885..ab74934 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs @@ -9,11 +9,65 @@ using System.Web.UI; using System.Web.UI.WebControls; using System.IO; using System.Text; +using Model; +using Newtonsoft.Json.Linq; namespace FineUIPro.Web.JGZL { public partial class TeamWeldingInspection : PageBase { + #region 定义项 + /// + /// 主键 + /// + private string TeamWeldingInspectionItemId + { + get + { + return (string)ViewState["TeamWeldingInspectionItemId"]; + } + set + { + ViewState["TeamWeldingInspectionItemId"] = value; + } + } + + /// + /// 项目Id + /// + private string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + + /// + /// 外键—TeamWeldingInspectionId + /// + public string TeamWeldingInspectionId + { + get + { + return (string)ViewState["TeamWeldingInspectionId"]; + } + set + { + ViewState["TeamWeldingInspectionId"] = value; + } + } + + /// + /// 定义集合 + /// + private static List itemLists = new List(); + #endregion + #region 加载页面 /// /// 加载页面 @@ -24,7 +78,7 @@ namespace FineUIPro.Web.JGZL { if (!IsPostBack) { - this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + //this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); this.drpProjectId.DataTextField = "ProjectCode"; this.drpProjectId.DataValueField = "ProjectId"; @@ -35,27 +89,135 @@ namespace FineUIPro.Web.JGZL this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId; this.InitTreeMenu();//加载树 this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + this.ProjectId = this.tvControlItem.SelectedNodeID; + var project = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId); + if (project != null) + { + this.txtProjectName.Text = project.ProjectName; + this.txtProjectCode.Text = project.ProjectCode; + } - this.drpUsingUnitTeam.DataTextField = "UsingUnitTeam"; - this.drpUsingUnitTeam.DataValueField = "UsingUnitTeam"; - this.drpUsingUnitTeam.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection - where x.ProjectId == this.drpProjectId.SelectedValue - select x.UsingUnitTeam).Distinct().ToList(); - this.drpUsingUnitTeam.DataBind(); - Funs.FineUIPleaseSelect(this.drpUsingUnitTeam); - - this.drpInstallationArea.DataTextField = "InstallationArea"; - this.drpInstallationArea.DataValueField = "InstallationArea"; - this.drpInstallationArea.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection - where x.ProjectId == this.drpProjectId.SelectedValue - select x.InstallationArea).Distinct().ToList(); - this.drpInstallationArea.DataBind(); - Funs.FineUIPleaseSelect(this.drpInstallationArea); - - this.BindGrid(); + var teamWeldingInspection = BLL.TeamWeldingInspectionService.GetTeamWeldingInspectionByProjectId(this.ProjectId); + if (teamWeldingInspection != null) + { + this.TeamWeldingInspectionId = teamWeldingInspection.TeamWeldingInspectionId; + txtUsingUnitTeam.Text = teamWeldingInspection.UsingUnitTeam; + txtInstallationArea.Text = teamWeldingInspection.InstallationArea; + } + DataInfo(); + //this.BindGrid(); } } + + private void EmptyText() + { + this.TeamWeldingInspectionId = string.Empty; + this.txtUsingUnitTeam.Text = string.Empty; + this.txtInstallationArea.Text = string.Empty; + this.txtProjectCode.Text = string.Empty; + this.txtProjectName.Text = string.Empty; + //itemLists.Clear(); + //this.Grid1.DataSource = itemLists; + //this.Grid1.DataBind(); + } + + private void DataInfo() + { + EmptyText(); + itemLists.Clear(); + if (!string.IsNullOrEmpty(this.ProjectId)) + { + var teamWeldingInspection = BLL.TeamWeldingInspectionService.GetTeamWeldingInspectionByProjectId(this.ProjectId); + if (teamWeldingInspection != null) + { + this.TeamWeldingInspectionId = teamWeldingInspection.TeamWeldingInspectionId; + this.txtUsingUnitTeam.Text = teamWeldingInspection.UsingUnitTeam; + this.txtInstallationArea.Text = teamWeldingInspection.InstallationArea; + var pro = BLL.Base_ProjectService.GetProjectByProjectId(teamWeldingInspection.ProjectId); + if (pro != null) + { + this.txtProjectCode.Text = pro.ProjectCode; + this.txtProjectName.Text = pro.ProjectName; + } + itemLists = BLL.TeamWeldingInspectionItemService.GetTeamWeldingInspectionItemList(this.TeamWeldingInspectionId); + } + else + { + var pro = BLL.Base_ProjectService.GetProjectByProjectId(this.ProjectId); + if (pro != null) + { + this.txtProjectCode.Text = pro.ProjectCode; + this.txtProjectName.Text = pro.ProjectName; + } + } + var jointInfo = BLL.HJGL_PW_JointInfoService.GetJointInfoByProjectId(this.ProjectId); + foreach (var item in jointInfo) + { + string ISO_IsoNo = string.Empty; + if (!string.IsNullOrEmpty(item.ISO_ID)) + { + var iso = BLL.HJGL_PW_IsoInfoService.GetIsoInfoByIsoInfoId(item.ISO_ID); + if (iso != null) + { + ISO_IsoNo = iso.ISO_IsoNo;//管道编号 + } + } + + var teamWeldingInspectionItem = BLL.TeamWeldingInspectionItemService.GetTeamWeldingInspectionItemByIsoNoAndJointNo(ISO_IsoNo, item.JOT_JointNo); + if (teamWeldingInspectionItem != null) + { + //itemLists.Add(teamWeldingInspectionItem); + } + else + { + Model.JGZL_TeamWeldingInspectionItem newItem = new JGZL_TeamWeldingInspectionItem(); + newItem.TeamWeldingInspectionItemId = SQLHelper.GetNewID(typeof(Model.JGZL_TeamWeldingInspectionItem)); + if (!string.IsNullOrEmpty(item.DReportID)) + { + var dreort = BLL.HJGL_WeldReportService.GetWeldReportByDReportID(item.DReportID); + if (dreort != null) + { + newItem.CheckDate = dreort.JOT_WeldDate;//检查日期 + } + } + if (!string.IsNullOrEmpty(item.STE_ID)) + { + var ste = BLL.HJGL_MaterialService.GetSteelBySteID(item.STE_ID); + if (ste != null) + { + newItem.Material = ste.STE_Code;//材质 + } + } + newItem.PipelineNo = ISO_IsoNo; //管道编号 + newItem.WeldingJointNo = item.JOT_JointNo; //焊口编号 + if (!string.IsNullOrEmpty(item.JOT_WeldSilk)) + { + var silk = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldSilk); + if (silk != null) + { + newItem.WeldingWire = silk.WMT_MatCode;//所用焊丝牌号 + } + } + if (!string.IsNullOrEmpty(item.JOT_WeldMat)) + { + var weldMat = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldMat); + if (weldMat != null) + { + newItem.WeldingRod = weldMat.WMT_MatCode;//所用焊条牌号 + } + } + itemLists.Add(newItem); + } + } + if (!string.IsNullOrEmpty(this.txtIsoNoS.Text)) + { + itemLists = itemLists.Where(e => e.PipelineNo.Contains(this.txtIsoNoS.Text)).ToList(); ; + } + } + this.Grid1.DataSource = itemLists; + this.Grid1.DataBind(); + } #endregion #region 加载树项目 @@ -101,26 +263,9 @@ namespace FineUIPro.Web.JGZL { if (this.tvControlItem.SelectedNodeID != "0") { - this.drpUsingUnitTeam.Items.Clear(); - this.drpUsingUnitTeam.DataTextField = "UsingUnitTeam"; - this.drpUsingUnitTeam.DataValueField = "UsingUnitTeam"; - this.drpUsingUnitTeam.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection - where x.ProjectId == this.tvControlItem.SelectedNodeID - select x.UsingUnitTeam).Distinct().ToList(); - this.drpUsingUnitTeam.DataBind(); - Funs.FineUIPleaseSelect(this.drpUsingUnitTeam); - this.drpUsingUnitTeam.SelectedIndex = 0; - - this.drpInstallationArea.Items.Clear(); - this.drpInstallationArea.DataTextField = "InstallationArea"; - this.drpInstallationArea.DataValueField = "InstallationArea"; - this.drpInstallationArea.DataSource= (from x in Funs.DB.JGZL_TeamWeldingInspection - where x.ProjectId == this.tvControlItem.SelectedNodeID - select x.InstallationArea).Distinct().ToList(); - this.drpInstallationArea.DataBind(); - Funs.FineUIPleaseSelect(this.drpInstallationArea); - - this.BindGrid(); + //this.BindGrid(); + this.ProjectId = this.tvControlItem.SelectedNodeID; + DataInfo(); } } #endregion @@ -129,58 +274,26 @@ namespace FineUIPro.Web.JGZL /// /// 数据绑定 /// - private void BindGrid() - { - //string projectIds = BLL.Base_ProjectService.GetStrOnProjectIds(this.CurrUser.UserId, "1"); - string strSql = @"select i.TeamWeldingInspectionItemId, - i.TeamWeldingInspectionId, - i.CheckDate, - t.UsingUnitTeam, - t.InstallationArea, - i.PipelineNo, - i.WeldingJointNo, - iso.ISO_IsoNo, - joint.JOT_JointNo, - t.ProjectId - from JGZL_TeamWeldingInspectionItem i - left join JGZL_TeamWeldingInspection t on t.TeamWeldingInspectionId = i.TeamWeldingInspectionId - left join HJGL_PW_IsoInfo iso on iso.ISO_ID = i.PipelineNo - left join HJGL_PW_JointInfo joint on joint.JOT_ID= i.WeldingJointNo where 1=1"; - List listStr = new List(); - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - strSql += " AND t.ProjectId = @ProjectId"; - listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); - } - //else + //private void BindGrid() + //{ + //string strSql = @"select * + // from JGZL_TeamWeldingInspectionItem i + // left join JGZL_TeamWeldingInspection t on t.TeamWeldingInspectionId = i.TeamWeldingInspectionId where 1=1"; + //List listStr = new List(); + //if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) //{ - // strSql += " AND CHARINDEX(ProjectId,@ProjectId)>0 "; - // listStr.Add(new SqlParameter("@ProjectId", projectIds)); + // strSql += " AND t.ProjectId = @ProjectId"; + // listStr.Add(new SqlParameter("@ProjectId", this.tvControlItem.SelectedNodeID)); //} - if (this.drpUsingUnitTeam.SelectedValue!=BLL.Const._Null&&!string.IsNullOrEmpty(this.drpUsingUnitTeam.SelectedValue)) - { - strSql += " AND t.UsingUnitTeam = @UsingUnitTeam"; - listStr.Add(new SqlParameter("@UsingUnitTeam", this.drpUsingUnitTeam.SelectedValue)); - } - if (this.drpInstallationArea.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpInstallationArea.SelectedValue)) - { - strSql += " AND t.InstallationArea = @InstallationArea"; - listStr.Add(new SqlParameter("@InstallationArea", this.drpInstallationArea.SelectedValue)); - } - if (!string.IsNullOrEmpty(this.txtCheckDate.Text)) - { - strSql += " AND i.CheckDate = @checkDate"; - listStr.Add(new SqlParameter("@checkDate", Funs.GetNewDateTime(this.txtCheckDate.Text))); - } - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); + //SqlParameter[] parameter = listStr.ToArray(); + //DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); // 2.获取当前分页数据 - Grid1.RecordCount = tb.Rows.Count; + //Grid1.RecordCount = tb.Rows.Count; //tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; - Grid1.DataBind(); - } + //var table = this.GetPagedDataTable(Grid1, tb); + //Grid1.DataSource = table; + //Grid1.DataBind(); + //} #endregion #region 分页排序 @@ -190,10 +303,10 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) - { - BindGrid(); - } + //protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + //{ + // BindGrid(); + //} #endregion #region 排序 @@ -202,10 +315,10 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void Grid1_Sort(object sender, GridSortEventArgs e) - { - BindGrid(); - } + //protected void Grid1_Sort(object sender, GridSortEventArgs e) + //{ + // BindGrid(); + //} #endregion #region 分页选择下拉改变事件 @@ -214,11 +327,11 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) - { - Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); - BindGrid(); - } + //protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + //{ + // Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + // BindGrid(); + //} #endregion #endregion @@ -230,8 +343,11 @@ namespace FineUIPro.Web.JGZL /// protected void drpProjectId_SelectedIndexChanged(object sender, EventArgs e) { + this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue; + this.ProjectId = this.tvControlItem.SelectedNodeID; this.InitTreeMenu(); - this.BindGrid(); + //this.BindGrid(); + DataInfo(); } /// @@ -239,10 +355,10 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void TextBox_TextChanged(object sender, EventArgs e) - { - this.BindGrid(); - } + //protected void TextBox_TextChanged(object sender, EventArgs e) + //{ + // this.BindGrid(); + //} #endregion #region 打印 @@ -254,19 +370,8 @@ namespace FineUIPro.Web.JGZL protected void btnPrint_Click(object sender, EventArgs e) { string projectId = this.tvControlItem.SelectedNodeID; - if (projectId != null) { - if (string.IsNullOrEmpty(this.drpUsingUnitTeam.SelectedText) || this.drpUsingUnitTeam.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择使用单位/班组！", MessageBoxIcon.Warning); - return; - } - if (string.IsNullOrEmpty(this.drpInstallationArea.SelectedText) || this.drpInstallationArea.SelectedValue == BLL.Const._Null) - { - Alert.ShowInTop("请选择装置名称/施工区域！", MessageBoxIcon.Warning); - return; - } string initTemplatePath = ""; string rootPath = Server.MapPath("~/"); BLL.Common.FastReportService.ResetData(); @@ -278,8 +383,6 @@ namespace FineUIPro.Web.JGZL t.InstallationArea, i.PipelineNo, i.WeldingJointNo, - iso.ISO_IsoNo, - joint.JOT_JointNo, t.ProjectId, i.Material, (case when i.InstallationMethod='安放式' then '√' else '' end) as InstallationMethod, @@ -296,83 +399,87 @@ namespace FineUIPro.Web.JGZL i.VTInspector from JGZL_TeamWeldingInspectionItem i left join JGZL_TeamWeldingInspection t on t.TeamWeldingInspectionId = i.TeamWeldingInspectionId - left join HJGL_PW_IsoInfo iso on iso.ISO_ID = i.PipelineNo - left join HJGL_PW_JointInfo joint on joint.JOT_ID= i.WeldingJointNo where t.ProjectId=@ProjectId and t.UsingUnitTeam=@usingUnitTeam and t.InstallationArea=@installationArea "; + where t.ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", projectId)); - listStr.Add(new SqlParameter("@usingUnitTeam", this.drpUsingUnitTeam.SelectedValue)); - listStr.Add(new SqlParameter("@installationArea", this.drpInstallationArea.SelectedValue)); - if (!string.IsNullOrEmpty(this.txtCheckDate.Text)) - { - strSql += " and i.CheckDate=@checkDate"; - listStr.Add(new SqlParameter("@checkDate", Funs.GetNewDateTime(this.txtCheckDate.Text.Trim()))); - } + //if (!string.IsNullOrEmpty(this.txtCheckDate.Text)) + //{ + // strSql += " and i.CheckDate=@checkDate"; + // listStr.Add(new SqlParameter("@checkDate", Funs.GetNewDateTime(this.txtCheckDate.Text.Trim()))); + //} SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - - DataTable dt = new DataTable(); - dt.TableName = "Data"; - dt.Columns.Add("Num"); - dt.Columns.Add("CheckDate"); - dt.Columns.Add("ISO_IsoNo"); - dt.Columns.Add("JOT_JointNo"); - dt.Columns.Add("Material"); - dt.Columns.Add("InstallationMethod"); - dt.Columns.Add("InstallationMethod2"); - dt.Columns.Add("WeldingWire"); - dt.Columns.Add("WeldingRod"); - dt.Columns.Add("TeamGap"); - dt.Columns.Add("TeamPlumber"); - dt.Columns.Add("TeamWelder"); - dt.Columns.Add("TeamInspector"); - dt.Columns.Add("GTAWWelder"); - dt.Columns.Add("GTAWInspector"); - dt.Columns.Add("SMAWWelder"); - dt.Columns.Add("VTInspector"); - - DataView dv = tb.DefaultView;//获取表视图 - dv.Sort = "CheckDate ASC";//按照ID倒序排序 - tb = dv.ToTable();//转为表 - DataRow[] rows = tb.DefaultView.ToTable().Select(); - int i = 0; - foreach (var row in rows) + if (tb.Rows.Count == itemLists.Count) { - var newRow = dt.NewRow(); - newRow["Num"] = (i + 1).ToString(); - string CheckDate = string.Format("{0:yyyy-MM-dd}", row["CheckDate"]); - newRow["CheckDate"] = CheckDate; - newRow["ISO_IsoNo"] = row["ISO_IsoNo"].ToString(); - newRow["JOT_JointNo"] = row["JOT_JointNo"].ToString(); - newRow["Material"] = row["Material"].ToString(); - newRow["InstallationMethod"] = row["InstallationMethod"].ToString(); - newRow["InstallationMethod2"] = row["InstallationMethod2"].ToString(); - newRow["WeldingWire"] = row["WeldingWire"].ToString(); - newRow["WeldingRod"] = row["WeldingRod"].ToString(); - newRow["TeamGap"] = row["TeamGap"].ToString(); - newRow["TeamPlumber"] = row["TeamPlumber"].ToString(); - newRow["TeamWelder"] = row["TeamWelder"].ToString(); - newRow["TeamInspector"] = row["TeamInspector"].ToString(); - newRow["GTAWWelder"] = row["GTAWWelder"].ToString(); - newRow["GTAWInspector"] = row["GTAWInspector"].ToString(); - newRow["SMAWWelder"] = row["SMAWWelder"].ToString(); - newRow["VTInspector"] = row["VTInspector"].ToString(); - dt.Rows.Add(newRow); - i++; + DataTable dt = new DataTable(); + dt.TableName = "Data"; + dt.Columns.Add("Num"); + dt.Columns.Add("CheckDate"); + dt.Columns.Add("ISO_IsoNo"); + dt.Columns.Add("JOT_JointNo"); + dt.Columns.Add("Material"); + dt.Columns.Add("InstallationMethod"); + dt.Columns.Add("InstallationMethod2"); + dt.Columns.Add("WeldingWire"); + dt.Columns.Add("WeldingRod"); + dt.Columns.Add("TeamGap"); + dt.Columns.Add("TeamPlumber"); + dt.Columns.Add("TeamWelder"); + dt.Columns.Add("TeamInspector"); + dt.Columns.Add("GTAWWelder"); + dt.Columns.Add("GTAWInspector"); + dt.Columns.Add("SMAWWelder"); + dt.Columns.Add("VTInspector"); + + DataView dv = tb.DefaultView;//获取表视图 + dv.Sort = "PipelineNo,WeldingJointNo ASC";//按照ID倒序排序 + tb = dv.ToTable();//转为表 + DataRow[] rows = tb.DefaultView.ToTable().Select(); + int i = 0; + foreach (var row in rows) + { + var newRow = dt.NewRow(); + newRow["Num"] = (i + 1).ToString(); + string CheckDate = string.Format("{0:yyyy-MM-dd}", row["CheckDate"]); + newRow["CheckDate"] = CheckDate; + newRow["ISO_IsoNo"] = row["PipelineNo"].ToString(); + newRow["JOT_JointNo"] = row["WeldingJointNo"].ToString(); + newRow["Material"] = row["Material"].ToString(); + newRow["InstallationMethod"] = row["InstallationMethod"].ToString(); + newRow["InstallationMethod2"] = row["InstallationMethod2"].ToString(); + newRow["WeldingWire"] = row["WeldingWire"].ToString(); + newRow["WeldingRod"] = row["WeldingRod"].ToString(); + newRow["TeamGap"] = row["TeamGap"].ToString(); + newRow["TeamPlumber"] = row["TeamPlumber"].ToString(); + newRow["TeamWelder"] = row["TeamWelder"].ToString(); + newRow["TeamInspector"] = row["TeamInspector"].ToString(); + newRow["GTAWWelder"] = row["GTAWWelder"].ToString(); + newRow["GTAWInspector"] = row["GTAWInspector"].ToString(); + newRow["SMAWWelder"] = row["SMAWWelder"].ToString(); + newRow["VTInspector"] = row["VTInspector"].ToString(); + dt.Rows.Add(newRow); + i++; + } + BLL.Common.FastReportService.AddFastreportTable(dt); + + Dictionary keyValuePairs = new Dictionary(); + keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); + keyValuePairs.Add("ProjectCode", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectCode); + keyValuePairs.Add("UsingUnitTeam", this.txtUsingUnitTeam.Text); + keyValuePairs.Add("InstallationArea", this.txtInstallationArea.Text); + BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); + + initTemplatePath = "File\\Fastreport\\JGZL\\支管连接焊接接头、角焊接头组对焊接检查记录.frx"; + if (File.Exists(rootPath + initTemplatePath)) + { + PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + } } - BLL.Common.FastReportService.AddFastreportTable(dt); - - Dictionary keyValuePairs = new Dictionary(); - keyValuePairs.Add("ProjectName", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectName); - keyValuePairs.Add("ProjectCode", BLL.Base_ProjectService.GetProjectByProjectId(projectId).ProjectCode); - keyValuePairs.Add("UsingUnitTeam", this.drpUsingUnitTeam.SelectedText); - keyValuePairs.Add("InstallationArea", this.drpInstallationArea.SelectedText); - BLL.Common.FastReportService.AddFastreportParameter(keyValuePairs); - - initTemplatePath = "File\\Fastreport\\JGZL\\支管连接焊接接头、角焊接头组对焊接检查记录.frx"; - if (File.Exists(rootPath + initTemplatePath)) + else { - PageContext.RegisterStartupScript(WindowPrint.GetShowReference(String.Format("../common/ReportPrint/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath))); + Alert.ShowInTop("请先保存数据！", MessageBoxIcon.Warning); + return; } } else @@ -393,7 +500,44 @@ namespace FineUIPro.Web.JGZL { if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TeamWeldingInspectionEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); + JArray teamGroupData = Grid1.GetMergedData(); + List list = new List(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + list.Add(values); + } + + JObject defaultObj = new JObject + { + { "TeamWeldingInspectionItemId", Guid.NewGuid() }, + { "TeamWeldingInspectionId", this.TeamWeldingInspectionId }, + { "CheckDate", "" }, + { "Material", "" }, + { "PipelineNo", "" }, + { "WeldingJointNo", "" }, + { "InstallationMethod", "" }, + { "WeldingWire", "" }, + { "WeldingRod", "" }, + { "TeamGap", "" }, + { "TeamPlumber", "" }, + { "TeamWelder", "" }, + { "TeamInspector", "" }, + { "GTAWWelder", "" }, + { "GTAWInspector", "" }, + { "SMAWWelder", "" }, + { "VTInspector", "" }, + { + "Delete3", + String.Format("", + GetDeleteScriptGrid1(), IconHelper.GetResolvedIconUrl(Icon.Delete)) + } + }; + list.Add(defaultObj); + Grid1.DataSource = list; + Grid1.DataBind(); + + //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TeamWeldingInspectionEdit.aspx?projectId={0}", this.tvControlItem.SelectedNodeID, "新增 - "))); } else { @@ -402,136 +546,153 @@ namespace FineUIPro.Web.JGZL } } + protected void Grid1_PreDataBound(object sender, EventArgs e) + { + // 设置LinkButtonField的点击客户端事件 + LinkButtonField deleteField = Grid1.FindColumn("Delete3") as LinkButtonField; + deleteField.OnClientClick = GetDeleteScriptGrid1(); + } + + /// + /// 删除提示 + /// + /// + private string GetDeleteScriptGrid1() + { + return Confirm.GetShowReference("删除选中行？", String.Empty, MessageBoxIcon.Question, + Grid1.GetDeleteSelectedRowsReference(), String.Empty); + } + /// /// 双击编辑 /// /// /// - protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) - { - if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_TeamWeldingInspectionMenuId, BLL.Const.BtnModify)) - { - if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) - { - if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) - { - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TeamWeldingInspectionEdit.aspx?teamWeldingInspectionItemId={0}", this.Grid1.SelectedRowID, "编辑 - "))); - } - else - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - } - else - { - Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); - return; - } - } - else - { - ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } + //protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + //{ + // if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_TeamWeldingInspectionMenuId, BLL.Const.BtnModify)) + // { + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // if (!string.IsNullOrEmpty(this.Grid1.SelectedRowID)) + // { + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TeamWeldingInspectionEdit.aspx?teamWeldingInspectionItemId={0}", this.Grid1.SelectedRowID, "编辑 - "))); + // } + // else + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } + // } + // else + // { + // Alert.ShowInTop("请选择项目！", MessageBoxIcon.Warning); + // return; + // } + // } + // else + // { + // ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // } + //} /// /// 右键编辑 /// /// /// - protected void btnMenuEdit_Click(object sender, EventArgs e) - { - if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_TeamWeldingInspectionMenuId, BLL.Const.BtnModify)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } - PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TeamWeldingInspectionEdit.aspx?teamWeldingInspectionItemId={0}", Grid1.SelectedRowID, "维护 - "))); - } - else - { - Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } + //protected void btnMenuEdit_Click(object sender, EventArgs e) + //{ + // if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.JGZL_TeamWeldingInspectionMenuId, BLL.Const.BtnModify)) + // { + // if (Grid1.SelectedRowIndexArray.Length == 0) + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } + // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TeamWeldingInspectionEdit.aspx?teamWeldingInspectionItemId={0}", Grid1.SelectedRowID, "维护 - "))); + // } + // else + // { + // Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // } + //} /// /// 右键删除 /// /// /// - protected void btnMenuDelete_Click(object sender, EventArgs e) - { - if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_TeamWeldingInspectionMenuId, Const.BtnDelete)) - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); - return; - } + //protected void btnMenuDelete_Click(object sender, EventArgs e) + //{ + // if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.JGZL_TeamWeldingInspectionMenuId, Const.BtnDelete)) + // { + // if (Grid1.SelectedRowIndexArray.Length == 0) + // { + // Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + // return; + // } - bool isShow = true; - if (Grid1.SelectedRowIndexArray.Length > 1) - { - isShow = false; - } - bool isDelete = false; - foreach (int rowIndex in Grid1.SelectedRowIndexArray) - { - string rowID = Grid1.DataKeys[rowIndex][0].ToString(); - var item = BLL.TeamWeldingInspectionItemService.GetTeamWeldingInspectionItemById(rowID); - if (item != null) - { - if (judgementDelete(rowID, isShow)) - { - string id = item.TeamWeldingInspectionId; - isDelete = true; - BLL.TeamWeldingInspectionItemService.DeleteTeamWeldingInspectionItemById(rowID); - var lists = BLL.TeamWeldingInspectionItemService.GetTeamWeldingInspectionItemList(id); - if (lists.Count == 0) - { - BLL.TeamWeldingInspectionService.DeleteTeamWeldingInspectionById(id); - } - BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除支管连接焊接接头、角焊接头组对焊接检查记录"); - } - } - } - if (isDelete) - { - ShowNotify("删除成功！", MessageBoxIcon.Success); - } - this.BindGrid(); - } - else - { - Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); - } - } + // bool isShow = true; + // if (Grid1.SelectedRowIndexArray.Length > 1) + // { + // isShow = false; + // } + // bool isDelete = false; + // foreach (int rowIndex in Grid1.SelectedRowIndexArray) + // { + // string rowID = Grid1.DataKeys[rowIndex][0].ToString(); + // var item = BLL.TeamWeldingInspectionItemService.GetTeamWeldingInspectionItemById(rowID); + // if (item != null) + // { + // if (judgementDelete(rowID, isShow)) + // { + // string id = item.TeamWeldingInspectionId; + // isDelete = true; + // BLL.TeamWeldingInspectionItemService.DeleteTeamWeldingInspectionItemById(rowID); + // var lists = BLL.TeamWeldingInspectionItemService.GetTeamWeldingInspectionItemList(id); + // if (lists.Count == 0) + // { + // BLL.TeamWeldingInspectionService.DeleteTeamWeldingInspectionById(id); + // } + // BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除支管连接焊接接头、角焊接头组对焊接检查记录"); + // } + // } + // } + // if (isDelete) + // { + // ShowNotify("删除成功！", MessageBoxIcon.Success); + // } + // this.BindGrid(); + // } + // else + // { + // Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + // } + //} #region 判断是否可删除 /// /// 判断是否可以删除 /// /// - private bool judgementDelete(string id, bool isShow) - { - string content = string.Empty; + //private bool judgementDelete(string id, bool isShow) + //{ + // string content = string.Empty; - if (string.IsNullOrEmpty(content)) - { - return true; - } - else - { - if (isShow) - { - Alert.ShowInTop(content, MessageBoxIcon.Error); - } - return false; - } - } + // if (string.IsNullOrEmpty(content)) + // { + // return true; + // } + // else + // { + // if (isShow) + // { + // Alert.ShowInTop(content, MessageBoxIcon.Error); + // } + // return false; + // } + //} #endregion #endregion @@ -541,29 +702,29 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void Window1_Close(object sender, WindowCloseEventArgs e) - { - this.InitTreeMenu();//加载树 - this.BindGrid(); - this.drpUsingUnitTeam.Items.Clear(); - this.drpUsingUnitTeam.DataTextField = "UsingUnitTeam"; - this.drpUsingUnitTeam.DataValueField = "UsingUnitTeam"; - this.drpUsingUnitTeam.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection - where x.ProjectId == this.tvControlItem.SelectedNodeID - select x.UsingUnitTeam).Distinct().ToList(); - this.drpUsingUnitTeam.DataBind(); - Funs.FineUIPleaseSelect(this.drpUsingUnitTeam); - this.drpUsingUnitTeam.SelectedIndex = 0; + //protected void Window1_Close(object sender, WindowCloseEventArgs e) + //{ + // this.InitTreeMenu();//加载树 + // this.BindGrid(); + // this.drpUsingUnitTeam.Items.Clear(); + // this.drpUsingUnitTeam.DataTextField = "UsingUnitTeam"; + // this.drpUsingUnitTeam.DataValueField = "UsingUnitTeam"; + // this.drpUsingUnitTeam.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection + // where x.ProjectId == this.tvControlItem.SelectedNodeID + // select x.UsingUnitTeam).Distinct().ToList(); + // this.drpUsingUnitTeam.DataBind(); + // Funs.FineUIPleaseSelect(this.drpUsingUnitTeam); + // this.drpUsingUnitTeam.SelectedIndex = 0; - this.drpInstallationArea.Items.Clear(); - this.drpInstallationArea.DataTextField = "InstallationArea"; - this.drpInstallationArea.DataValueField = "InstallationArea"; - this.drpInstallationArea.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection - where x.ProjectId == this.tvControlItem.SelectedNodeID - select x.InstallationArea).Distinct().ToList(); - this.drpInstallationArea.DataBind(); - Funs.FineUIPleaseSelect(this.drpInstallationArea); - } + // this.drpInstallationArea.Items.Clear(); + // this.drpInstallationArea.DataTextField = "InstallationArea"; + // this.drpInstallationArea.DataValueField = "InstallationArea"; + // this.drpInstallationArea.DataSource = (from x in Funs.DB.JGZL_TeamWeldingInspection + // where x.ProjectId == this.tvControlItem.SelectedNodeID + // select x.InstallationArea).Distinct().ToList(); + // this.drpInstallationArea.DataBind(); + // Funs.FineUIPleaseSelect(this.drpInstallationArea); + //} #endregion #region 查询 @@ -572,10 +733,100 @@ namespace FineUIPro.Web.JGZL /// /// /// - protected void drpUsingUnitTeam_SelectedIndexChanged(object sender, EventArgs e) + //protected void drpUsingUnitTeam_SelectedIndexChanged(object sender, EventArgs e) + //{ + // BindGrid(); + //} + #endregion + + #region 保存 + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) { - BindGrid(); + if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, + Const.JGZL_TeamWeldingInspectionMenuId, Const.BtnSave)) + { + Model.JGZL_TeamWeldingInspection newTeamWeldingInspection = new JGZL_TeamWeldingInspection(); + newTeamWeldingInspection.UsingUnitTeam = this.txtUsingUnitTeam.Text; + newTeamWeldingInspection.InstallationArea = this.txtInstallationArea.Text; + if (!string.IsNullOrEmpty(this.TeamWeldingInspectionId)) + { + newTeamWeldingInspection.TeamWeldingInspectionId = this.TeamWeldingInspectionId; + BLL.TeamWeldingInspectionService.UpdateTeamWeldingInspection(newTeamWeldingInspection); + } + else + { + newTeamWeldingInspection.ProjectId = this.tvControlItem.SelectedNodeID; + newTeamWeldingInspection.CompileMan = this.CurrUser.UserId; + newTeamWeldingInspection.CompileDate = DateTime.Now; + newTeamWeldingInspection.TeamWeldingInspectionId = SQLHelper.GetNewID(typeof(Model.JGZL_TeamWeldingInspection)); + this.TeamWeldingInspectionId = newTeamWeldingInspection.TeamWeldingInspectionId; + BLL.TeamWeldingInspectionService.AddTeamWeldingInspection(newTeamWeldingInspection); + } + saveItem(); + ShowNotify("保存成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + else + { + Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning); + return; + } + } + + void saveItem() + { + BLL.TeamWeldingInspectionItemService.DeleteTeamWeldingInspectionItem(this.TeamWeldingInspectionId); + itemLists.Clear(); + JArray teamGroupData = Grid1.GetMergedData(); + foreach (JObject teamGroupRow in teamGroupData) + { + JObject values = teamGroupRow.Value("values"); + int rowIndex = teamGroupRow.Value("index"); + Model.JGZL_TeamWeldingInspectionItem newDetail = new Model.JGZL_TeamWeldingInspectionItem + { + TeamWeldingInspectionItemId = values.Value("TeamWeldingInspectionItemId"), + TeamWeldingInspectionId = this.TeamWeldingInspectionId, + CheckDate =Funs.GetNewDateTime( values.Value("CheckDate")), + Material = values.Value("Material"), + PipelineNo = values.Value("PipelineNo"), + WeldingJointNo = values.Value("WeldingJointNo"), + InstallationMethod = values.Value("InstallationMethod"), + WeldingWire = values.Value("WeldingWire"), + WeldingRod = values.Value("WeldingRod"), + TeamGap = values.Value("TeamGap"), + TeamPlumber = values.Value("TeamPlumber"), + TeamWelder = values.Value("TeamWelder"), + TeamInspector = values.Value("TeamInspector"), + GTAWWelder = values.Value("GTAWWelder"), + GTAWInspector = values.Value("GTAWInspector"), + SMAWWelder = values.Value("SMAWWelder"), + VTInspector = values.Value("VTInspector"), + }; + itemLists.Add(newDetail); + } + try + { + if (itemLists.Count > 0) + { + Funs.DB.JGZL_TeamWeldingInspectionItem.InsertAllOnSubmit(itemLists); + } + Funs.DB.SubmitChanges(); + } + catch (Exception) + { + return; + } } #endregion + + protected void txtIsoNoS_TextChanged(object sender, EventArgs e) + { + DataInfo(); + } } } \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.designer.cs b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.designer.cs index b487b31..33dc03b 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.designer.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.designer.cs @@ -95,6 +95,15 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.Toolbar Toolbar2; + /// + /// txtIsoNoS 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIsoNoS; + /// /// ToolbarFill1 控件。 /// @@ -113,6 +122,15 @@ namespace FineUIPro.Web.JGZL /// protected global::FineUIPro.Button btnAdd; + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + /// /// btnPrint 控件。 /// @@ -141,31 +159,40 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.Toolbar Toolbar3; /// - /// drpUsingUnitTeam 控件。 + /// txtUsingUnitTeam 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpUsingUnitTeam; + protected global::FineUIPro.TextBox txtUsingUnitTeam; /// - /// drpInstallationArea 控件。 + /// txtInstallationArea 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpInstallationArea; + protected global::FineUIPro.TextBox txtInstallationArea; /// - /// txtCheckDate 控件。 + /// txtProjectName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DatePicker txtCheckDate; + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// txtProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectCode; /// /// ToolbarFill2 控件。 @@ -177,40 +204,139 @@ namespace FineUIPro.Web.JGZL protected global::FineUIPro.ToolbarFill ToolbarFill2; /// - /// ToolbarSeparator1 控件。 + /// txtCheckDate 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + protected global::FineUIPro.DatePicker txtCheckDate; /// - /// ToolbarText1 控件。 + /// txtMaterial 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.ToolbarText ToolbarText1; + protected global::FineUIPro.TextBox txtMaterial; /// - /// ddlPageSize 控件。 + /// txtPipelineNo 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList ddlPageSize; + protected global::FineUIPro.TextBox txtPipelineNo; /// - /// Window1 控件。 + /// txtWeldingJointNo 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Window Window1; + protected global::FineUIPro.TextBox txtWeldingJointNo; + + /// + /// drpInstallationMethod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpInstallationMethod; + + /// + /// txtWeldingWire 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldingWire; + + /// + /// txtWeldingRod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldingRod; + + /// + /// txtTeamGap 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTeamGap; + + /// + /// txtTeamPlumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTeamPlumber; + + /// + /// txtTeamWelder 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTeamWelder; + + /// + /// txtTeamInspector 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtTeamInspector; + + /// + /// txtGTAWWelder 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtGTAWWelder; + + /// + /// txtGTAWInspector 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtGTAWInspector; + + /// + /// txtSMAWWelder 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSMAWWelder; + + /// + /// txtVTInspector 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtVTInspector; /// /// WindowPrint 控件。 @@ -220,32 +346,5 @@ namespace FineUIPro.Web.JGZL /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowPrint; - - /// - /// Menu1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Menu Menu1; - - /// - /// btnMenuEdit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuEdit; - - /// - /// btnMenuDelete 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuDelete; } }