diff --git a/DataBase/版本日志/SGGLDB_V2023-02-21.sql b/DataBase/版本日志/SGGLDB_V2023-02-21.sql new file mode 100644 index 00000000..c6ba9f61 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-02-21.sql @@ -0,0 +1,2 @@ +alter table HJGL_YardPlanning add YardPlanName varchar(100); +alter table HJGL_YardPlanning add SurperId varchar(50); \ No newline at end of file diff --git a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs index 28d90280..2c0ee10e 100644 --- a/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs +++ b/SGGL/BLL/HJGL/PreDesign/HJGL_MaterialService.cs @@ -132,11 +132,11 @@ namespace BLL lib.MaterialMade, -sum( pipe.Number) AS num FROM dbo.HJGL_PipeLineMat pipe - LEFT JOIN HJGL_Pipeline_ComponentJoint comjoint - ON comjoint.PipelineComponentCode =pipe.PrefabricatedComponents + LEFT JOIN HJGL_Pipeline_Component com + ON com.PipelineComponentCode =pipe.PrefabricatedComponents LEFT JOIN HJGL_MaterialCodeLib lib ON lib.MaterialCode = pipe.MaterialCode - WHERE comjoint.State=1 + WHERE com.ProductionState=1 GROUP BY lib.MaterialCode,lib.MaterialName,lib.MaterialUnit, lib.MaterialSpec,lib.MaterialMade UNION SELECT lib.MaterialCode, diff --git a/SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs b/SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs index f435390c..d5f46421 100644 --- a/SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs +++ b/SGGL/BLL/HJGL/PreDesign/YardPlanningService.cs @@ -14,6 +14,11 @@ namespace BLL { return Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.YardPlanningId == YardPlanningId); } + public static List GetHJGL_YardPlanningBySurperId(string SurperId) + { + var q= (from x in Funs.DB.HJGL_YardPlanning where x.SurperId== SurperId select x ) .ToList(); + return q; + } public static Model.HJGL_YardPlanning GetHJGL_YardPlanningByProjectId(string projectId,string unitworkid) { @@ -44,7 +49,15 @@ namespace BLL Funs.DB.SubmitChanges(); } } - + public static void SavePic(string YardPlanningId, string imgurl) + { + var model = Funs.DB.HJGL_YardPlanning.FirstOrDefault(e => e.YardPlanningId== YardPlanningId); + if (model != null) + { + model.FlowChartPic = imgurl; + UpdateHJGL_YardPlanning(model); + } + } public static void AddHJGL_YardPlanning(Model.HJGL_YardPlanning newtable) { Model.HJGL_YardPlanning table = new Model.HJGL_YardPlanning(); @@ -53,6 +66,8 @@ namespace BLL table.Remark = newtable.Remark; table.FlowChartPic = newtable.FlowChartPic; table.UnitWorkId = newtable.UnitWorkId; + table.YardPlanName=newtable.YardPlanName; + table.SurperId = newtable.SurperId; Funs.DB.HJGL_YardPlanning.InsertOnSubmit(table); Funs.DB.SubmitChanges(); } @@ -69,6 +84,8 @@ namespace BLL table.Remark = newtable.Remark; table.FlowChartPic = newtable.FlowChartPic; table.UnitWorkId = newtable.UnitWorkId; + table.YardPlanName = newtable.YardPlanName; + table.SurperId = newtable.SurperId; Funs.DB.SubmitChanges(); } @@ -83,6 +100,31 @@ namespace BLL } } + public static void DeleteHJGL_YardPlanningBySurperId(string SurperId) + { + var q= GetHJGL_YardPlanningBySurperId(SurperId); + if (q.Count >0) + { + Funs.DB.HJGL_YardPlanning.DeleteAllOnSubmit(q); + Funs.DB.SubmitChanges(); + } + } + public static void DleteAllById(string YardPlanningId) + { + var q = GetHJGL_YardPlanningById(YardPlanningId); + var id = q.YardPlanningId; + DeleteHJGL_YardPlanningById(YardPlanningId); + var chirdList = GetHJGL_YardPlanningBySurperId(id); + if (chirdList.Count>0) + { + foreach (var item in chirdList) + { + DleteAllById(item.YardPlanningId); + } + } + + + } } } \ No newline at end of file diff --git a/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs b/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs index 8a5b030f..755c8bab 100644 --- a/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/HJGL_WeldingReportService.cs @@ -209,5 +209,6 @@ namespace BLL return decimal.Truncate(result); } + } } diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldTaskService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldTaskService.cs index 90278433..a747818e 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldTaskService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldTaskService.cs @@ -290,5 +290,7 @@ namespace BLL db.SubmitChanges(); } } + + } } diff --git a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs b/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs index 887173d6..86ea8e24 100644 --- a/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/WeldingDailyService.cs @@ -310,6 +310,15 @@ namespace BLL return list; } + public static List GetPipelineDailyListByUnitWorkId(string UnitWorkId) + { + var list = (from x in Funs.DB.HJGL_WeldingDaily + where x.UnitWorkId == UnitWorkId + orderby x.WeldingDailyCode + select x).ToList(); + + return list; + } public static Dictionary GetFileOutValueById(string WeldingDailyId) { var value = new Dictionary(); @@ -375,7 +384,7 @@ namespace BLL /// 下拉框名称 /// 是否显示请选择 /// 耗材类型 - public static void InitWeldingDailyDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease, string unitId) + public static void InitDropDownListByUnitId(FineUIPro.DropDownList dropName, bool isShowPlease, string unitId) { dropName.DataValueField = "WeldingDailyId"; dropName.DataTextField = "WeldingDailyCode"; @@ -386,6 +395,17 @@ namespace BLL Funs.FineUIPleaseSelect(dropName); } } + public static void InitDownListByUnitWortId(FineUIPro.DropDownList dropName, bool isShowPlease, string UnitWortId) + { + dropName.DataValueField = "WeldingDailyId"; + dropName.DataTextField = "WeldingDailyCode"; + dropName.DataSource = GetPipelineDailyListByUnitWorkId(UnitWortId); + dropName.DataBind(); + if (isShowPlease) + { + Funs.FineUIPleaseSelect(dropName); + } + } #endregion } } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 08a75dbb..091c8ffe 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -558,6 +558,7 @@ + @@ -7936,6 +7937,13 @@ PrePipelineEdit.aspx + + YardPlanningEdit.aspx + ASPXCodeBehind + + + YardPlanningEdit.aspx + PC_ItemEndCheck.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx index 28398273..f30af990 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx @@ -188,16 +188,16 @@ - - - View_HJGL_WeldJoint = new List(); + protected void Page_Load(object sender, EventArgs e) { ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); @@ -293,9 +295,10 @@ namespace FineUIPro.Web.HJGL.InfoQuery else if (this.tvControlItem.SelectedNode.CommandName == "管线") { } - model.PipelineId= this.tvControlItem.SelectedNodeID; + model.PipelineId= this.tvControlItem.SelectedNodeID; model.WeldJointCode = this.txtWeldJointCode.Text; var list= BLL.WeldJointService.GetViewWeldJointsBymodel(model); + View_HJGL_WeldJoint = list; Grid1.RecordCount = list.Count; // var table = this.GetPagedDataTable(Grid1, list); var table = list.Skip(Grid1.PageSize * (Grid1.PageIndex)).Take(Grid1.PageSize).ToList(); @@ -473,28 +476,68 @@ namespace FineUIPro.Web.HJGL.InfoQuery /// protected void btnOut_Click(object sender, EventArgs e) { - //Model.View_HJGL_WeldJoint model = new Model.View_HJGL_WeldJoint(); - //model.ProjectId = this.CurrUser.LoginProjectId; - //if (this.tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2) - //{ - // model.UnitWorkId = this.tvControlItem.SelectedNodeID; + if (this.tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2) + { + Model.View_HJGL_WeldJoint model = new Model.View_HJGL_WeldJoint(); + model.ProjectId = this.CurrUser.LoginProjectId; + model.UnitWorkId = this.tvControlItem.SelectedNodeID; + var list = BLL.WeldJointService.GetViewWeldJointsBymodel(model); + View_HJGL_WeldJoint = list; + } + + string path = Funs.RootPath + @"File\Excel\Temp\JointQuery.xlsx"; + path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx"); + var q = (from x in View_HJGL_WeldJoint + select new + { + 焊口号 = x.WeldJointCode, + 单位名称 = x.UnitName, + 材质1 = x.Material1Code, + 材质2 = x.Material2Code, + 达因 = x.Size, + 外径 = x.Dia, + 壁厚 = x.Thickness, + 规格 = x.Specification, + 焊缝类型 = x.WeldTypeCode, + 焊接方法 = x.WeldingMethodCode, + WPS编号 = x.WPQCode, + 坡口类型 = x.GrooveTypeCode, + 焊条 = x.WeldingRod, + 焊丝 = x.WeldingWire, + 预热温度 = x.PreTemperature, + 焊口属性 = x.JointAttribute, + 焊接日期 = x.WeldingDate, + 打底焊工号 = x.BackingWelderCode, + 盖面焊工号 = x.WelderCode, + 热处理报告编号 = x.HotProessReportNo, + 热处理检测结果 = x.HotProessResult, + 硬度报告编号 = x.HardReportNo, + 硬度检测结果 = x.HardResult, + 委托单编号 = x.TrustBatchCode, + 检测单编号 = x.NDECode, - //} - //else if (this.tvControlItem.SelectedNode.CommandName == "管线") - //{ - // model.PipelineId = this.tvControlItem.SelectedNodeID; - //} - //model.WeldJointCode = this.txtWeldJointCode.Text; - //var list = BLL.WeldJointService.GetViewWeldJointsBymodel(model); + }).ToList(); + MiniExcel.SaveAs(path, q); + string fileName = "焊口信息总览.xlsx"; + FileInfo info = new FileInfo(path); + long fileSize = info.Length; + System.Web.HttpContext.Current.Response.Clear(); + System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed"; + System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8)); + System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString()); + System.Web.HttpContext.Current.Response.TransmitFile(path, 0, fileSize); + System.Web.HttpContext.Current.Response.Flush(); + System.Web.HttpContext.Current.Response.Close(); + File.Delete(path); - Response.ClearContent(); - string filename = Funs.GetNewFileName(); - Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊口台账总览" + filename, System.Text.Encoding.UTF8) + ".xls"); - Response.ContentType = "application/excel"; - Response.ContentEncoding = System.Text.Encoding.UTF8; - Response.Write(GetGridTableHtml(Grid1)); - Response.End(); + //Response.ClearContent(); + //string filename = Funs.GetNewFileName(); + //Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊口台账总览" + filename, System.Text.Encoding.UTF8) + ".xls"); + //Response.ContentType = "application/excel"; + //Response.ContentEncoding = System.Text.Encoding.UTF8; + //Response.Write(GetGridTableHtml(Grid1)); + //Response.End(); } protected void btnOutNOComPipeline_Click(object sender, EventArgs e) { diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx index 920651ef..fe74e0aa 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx @@ -19,18 +19,25 @@ - + + + + + + + + @@ -51,43 +58,45 @@ - + + - - + - + - - + - - <%-- @@ -142,7 +151,7 @@ - + @@ -180,7 +189,7 @@ "); + + } + } + } + else if (e.CommandName == "cmd_print") + { + string Id = this.Grid1.SelectedRowID; + Print(tvControlItem.SelectedNodeID, Id); + } + + } + protected void btnSearch_Click(object sender, EventArgs e) + { + BindGrid(); + } + #endregion #region 关闭弹出窗口及刷新页面 @@ -474,17 +532,10 @@ namespace FineUIPro.Web.HJGL.PreDesign { this.BindGrid(); } - - /// - /// 查询 - /// - /// - /// - protected void Tree_TextChanged(object sender, EventArgs e) + protected void btnTreeFind_Click1(object sender, EventArgs e) { this.InitTreeMenu(); - tvControlItem.CollapseAllNodes(tvControlItem.Nodes[1].Nodes); - this.BindGrid(); + } #endregion @@ -493,10 +544,6 @@ namespace FineUIPro.Web.HJGL.PreDesign /// /// /// - protected void btnSearch_Click(object sender, EventArgs e) - { - BindGrid(); - } public string ConvertImageUrlByImage(object str, object id) { string path = string.Empty; @@ -572,31 +619,6 @@ namespace FineUIPro.Web.HJGL.PreDesign } - protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) - { - if (e.CommandName == "PreviewQRCode") - { - var ID = e.RowID; - var q = HJGL_PipelineComponentService.GetPipelineComponentById(ID); - string path = ""; - if (!string.IsNullOrEmpty(q.QRCode)) - { - path = BLL.CreateQRCodeService.CreateCode_Simple(q.QRCode, ID); - if (!string.IsNullOrEmpty(path)) - { - string filepath = Funs.SGGLUrl + path.Replace("\\", "//"); - - ClientScript.RegisterStartupScript(ClientScript.GetType(), "myscript", ""); - - } - } - } - else if (e.CommandName == "cmd_print") - { - string Id = this.Grid1.SelectedRowID; - Print(tvControlItem.SelectedNodeID, Id); - } - - } + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs index 70cff530..e5857b61 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.designer.cs @@ -77,6 +77,15 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.HiddenField hdUnitWorkId; + /// + /// btnTreeFind 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnTreeFind; + /// /// tvControlItem 控件。 /// @@ -131,6 +140,15 @@ namespace FineUIPro.Web.HJGL.PreDesign /// protected global::FineUIPro.DropDownList drpProductionState; + /// + /// drpWeldingDailyCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWeldingDailyCode; + /// /// ToolbarFill1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx index bf422a5e..eda95f12 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx @@ -11,14 +11,18 @@ - + + + + @@ -37,7 +41,7 @@ - + @@ -60,72 +64,43 @@ Target="Parent" EnableResize="true" runat="server" IsModal="true" Width="700px" Height="500px"> + + + + + + + + + + -<%-- -
- - - - - - - - - - - - - - - - - - - - - - - - - - ---%> diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs index 490f0fc9..1fdc5cf8 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.cs @@ -54,7 +54,7 @@ namespace FineUIPro.Web.HJGL.PreDesign if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) { - var unit = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); + var unit = HJGL_YardPlanningService.GetHJGL_YardPlanningById( tvControlItem.SelectedNodeID); this.imgPhoto.ImageUrl = null; if (unit != null) { @@ -119,7 +119,8 @@ namespace FineUIPro.Web.HJGL.PreDesign { foreach (var q in unitWork1) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); + //int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_YardPlanning where x.SurperId == q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn1 = new TreeNode(); tn1.NodeID = q.UnitWorkId; @@ -127,24 +128,53 @@ namespace FineUIPro.Web.HJGL.PreDesign tn1.ToolTip = "施工单位：" + u.UnitName; tn1.EnableClickEvent = true; rootNode1.Nodes.Add(tn1); + if (a > 0) + { + BoundTree(tn1.Nodes, tn1.NodeID); + } } } if (unitWork2.Count() > 0) { foreach (var q in unitWork2) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); + int a = (from x in Funs.DB.HJGL_YardPlanning where x.SurperId==q.UnitWorkId select x).Count(); var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); TreeNode tn2 = new TreeNode(); tn2.NodeID = q.UnitWorkId; // tn2.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; tn2.Text = q.UnitWorkName ; + tn2.CommandName = "主项"; tn2.ToolTip = "施工单位：" + u.UnitName; tn2.EnableClickEvent = true; rootNode2.Nodes.Add(tn2); + if (a>0) + { + BoundTree(tn2.Nodes, tn2.NodeID); + } } } } + + private void BoundTree(TreeNodeCollection nodes, string superId) + { + var mdoel = BLL.HJGL_YardPlanningService.GetHJGL_YardPlanningBySurperId(superId); + foreach (var m in mdoel) + { + TreeNode chidNode = new TreeNode + { + Text = m.YardPlanName, + NodeID = m.YardPlanningId, + Expanded = true, + Selectable = true, + EnableClickEvent= true, + }; + nodes.Add(chidNode); + this.BoundTree(chidNode.Nodes, m.YardPlanningId); + } + + } + #endregion #region 点击TreeView @@ -186,8 +216,6 @@ namespace FineUIPro.Web.HJGL.PreDesign #endregion - - /// /// 删除 /// @@ -213,10 +241,10 @@ namespace FineUIPro.Web.HJGL.PreDesign } protected void filePhoto_FileSelected(object sender, EventArgs e) { - if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) + if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID) && tvControlItem.SelectedNode.CommandName != "主项") { if (filePhoto.HasFile) - { + { string rootUrl = ConfigurationManager.AppSettings["localRoot"]; if (string.IsNullOrEmpty(rootUrl)) { @@ -244,19 +272,48 @@ namespace FineUIPro.Web.HJGL.PreDesign imgPhoto.ImageUrl = "~/FileUpload/HJGL_YardPlanning/" + fileName; - HJGL_YardPlanningService.SavePic(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, "FileUpload/HJGL_YardPlanning/" + fileName); + HJGL_YardPlanningService.SavePic( tvControlItem.SelectedNodeID, "FileUpload/HJGL_YardPlanning/" + fileName); // 清空文件上传组件（上传后要记着清空，否则点击提交表单时会再次上传！！） filePhoto.Reset(); } } else { - Alert.ShowInTop("请选择一个主项！", MessageBoxIcon.Warning); + Alert.ShowInTop("主节点无法上传，请新增节点！", MessageBoxIcon.Warning); } } + + #region 树点击事件 + protected void btnMenuAdd_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("YardPlanningEdit.aspx?YardPlanningId={0}&&Type=Add", this.tvControlItem.SelectedNodeID, "增加 - "))); + + } + + protected void btnMenuEdit_Click(object sender, EventArgs e) + { + if (this.tvControlItem.SelectedNode.CommandName == "主项") + { + ShowNotify("无法修改此节点！", MessageBoxIcon.Warning); + + } + else + { + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("YardPlanningEdit.aspx?YardPlanningId={0}&&Type=Edit", this.tvControlItem.SelectedNodeID, "增加 - "))); + + } + } + + protected void btnMenuDelete_Click(object sender, EventArgs e) + { + BLL.HJGL_YardPlanningService.DleteAllById(this.tvControlItem.SelectedNodeID); + + this.InitTreeMenu(); + + } /// /// Tree点击事件 /// @@ -266,7 +323,7 @@ namespace FineUIPro.Web.HJGL.PreDesign { if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) { - var unit = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); + var unit = HJGL_YardPlanningService.GetHJGL_YardPlanningById( tvControlItem.SelectedNodeID); this.imgPhoto.ImageUrl = null; if (unit != null) { @@ -279,162 +336,34 @@ namespace FineUIPro.Web.HJGL.PreDesign this.imgPhoto.ImageUrl = null; } } - + #endregion protected void btnAttachUrl_Click(object sender, EventArgs e) { - if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)) + if (!string.IsNullOrEmpty(tvControlItem.SelectedNodeID)&& tvControlItem.SelectedNode.CommandName!="主项") { - var model = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); + var model = HJGL_YardPlanningService.GetHJGL_YardPlanningById( tvControlItem.SelectedNodeID); if (model == null) { - HJGL_YardPlanningService.SavePic(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID, ""); - model = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); + HJGL_YardPlanningService.SavePic( tvControlItem.SelectedNodeID, ""); + // model = HJGL_YardPlanningService.GetHJGL_YardPlanningByProjectId(this.CurrUser.LoginProjectId, tvControlItem.SelectedNodeID); } PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("../../AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/HJGL_YardPlanning&menuId={1}", model.YardPlanningId, BLL.Const.HJGL_YardPlanningMenuId))); } else { - Alert.ShowInTop("请选择一个主项！", MessageBoxIcon.Warning); + Alert.ShowInTop("主节点无法上传，请新增节点！", MessageBoxIcon.Warning); } } + + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + ShowNotify("修改成功！", MessageBoxIcon.Success); + this.InitTreeMenu(); + + + } } - //public partial class EmergencyProcess : PageBase - //{ - // /// - // /// 项目id - // /// - // public string ProjectId - // { - // get - // { - // return (string)ViewState["ProjectId"]; - // } - // set - // { - // ViewState["ProjectId"] = value; - // } - // } - // #region 加载 - // /// - // /// 加载页面 - // /// - // /// - // /// - // protected void Page_Load(object sender, EventArgs e) - // { - // if (!IsPostBack) - // { - // ////权限按钮方法 - // this.GetButtonPower(); - // this.ProjectId = this.CurrUser.LoginProjectId; - // if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.ProjectId) - // { - // this.ProjectId = Request.Params["projectId"]; - // } - // // 绑定表格 - // this.BindGrid(); - // } - // } - // #endregion - - // #region GV绑定数据 - // /// - // /// 绑定数据 - // /// - // void BindGrid() - // { - // var getEmergencys = (from x in Funs.DB.Emergency_EmergencyProcess - // where x.ProjectId == this.ProjectId - // select x).ToList(); - // if (getEmergencys.Count() == 0) - // { - // var getEEmergencyProcessItems = from x in Funs.DB.Emergency_EmergencyProcess - // where x.ProjectId == null - // select x; - // foreach (var item in getEEmergencyProcessItems) - // { - // Model.Emergency_EmergencyProcess newItem = new Model.Emergency_EmergencyProcess - // { - // EmergencyProcessId = SQLHelper.GetNewID(), - // ProjectId = this.ProjectId, - // ProcessSteps = item.ProcessSteps, - // ProcessName = item.ProcessName, - // StepOperator = item.StepOperator, - // Remark = item.Remark, - // }; - // Funs.DB.Emergency_EmergencyProcess.InsertOnSubmit(newItem); - // Funs.DB.SubmitChanges(); - - // getEmergencys.Add(item); - // } - // } - - // Grid1.RecordCount = getEmergencys.Count(); - // DataTable tb = this.GetPagedDataTable(Grid1, getEmergencys); - // Grid1.DataSource = tb; - // Grid1.DataBind(); - // } - // #endregion - - // #region 编辑 - // /// - // /// 双击事件 - // /// - // /// - // /// - // protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) - // { - // this.EditData(); - // } - - // /// - // /// 右键编辑事件 - // /// - // /// - // /// - // protected void btnMenuEdit_Click(object sender, EventArgs e) - // { - // this.EditData(); - // } - - // /// - // /// 编辑数据方法 - // /// - // void EditData() - // { - // if (Grid1.SelectedRowIndexArray.Length == 0) - // { - // Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); - // return; - // } - // PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("EmergencyProcessEdit.aspx?EmergencyProcessId={0}", Grid1.SelectedRowID, "详细 - "))); - // } - // #endregion - - // #region 获取按钮权限 - // /// - // /// 获取按钮权限 - // /// - // /// - // /// - // void GetButtonPower() - // { - // if (Request.Params["value"] == "0") - // { - // return; - // } - // var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HJGL_YardPlanningMenuId); - // if (buttonList.Count() > 0) - // { - // if (buttonList.Contains(BLL.Const.BtnModify)) - // { - // this.btnMenuEdit.Hidden = false; - // } - // } - // } - // #endregion - //} } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.designer.cs index a4cb8006..f35b7c9a 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanning.aspx.designer.cs @@ -139,5 +139,59 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window WindowAtt; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuAdd 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuAdd; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + + /// + /// btnMenuDelete 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuDelete; } } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx new file mode 100644 index 00000000..aad261c3 --- /dev/null +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx @@ -0,0 +1,35 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="YardPlanningEdit.aspx.cs" Inherits="FineUIPro.Web.HJGL.PreDesign.YardPlanningEdit" %> + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx.cs index 81260c6c..bf1a34cd 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx.cs @@ -1,373 +1,74 @@ using BLL; using System; using System.Collections.Generic; -using System.Data; -using System.Data.SqlClient; using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; namespace FineUIPro.Web.HJGL.PreDesign { public partial class YardPlanningEdit : PageBase { - #region 定义项 - /// - /// 主键 - /// - public string EmergencyProcessId + public string YardPlanningId { get { - return (string)ViewState["EmergencyProcessId"]; + return (string)ViewState["YardPlanningId"]; } set { - ViewState["EmergencyProcessId"] = value; + ViewState["YardPlanningId"] = value; } } - /// - /// 项目主键 - /// - public string ProjectId - { - get - { - return (string)ViewState["ProjectId"]; - } - set - { - ViewState["ProjectId"] = value; - } - } - #endregion - - #region 加载 - /// - /// 加载页面 - /// - /// - /// protected void Page_Load(object sender, EventArgs e) { - if (!IsPostBack) + if (!IsPostBack) { - this.GetButtonPower(); - this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); - this.EmergencyProcessId = Request.Params["EmergencyProcessId"]; - if (!string.IsNullOrEmpty(this.EmergencyProcessId)) + YardPlanningId=Request.Params["YardPlanningId"]; + string Type= Request.Params["Type"]; + if (!string.IsNullOrEmpty(Type)) { - var EmergencyProcess = Funs.DB.Emergency_EmergencyProcess.FirstOrDefault(x => x.EmergencyProcessId == this.EmergencyProcessId); - if (EmergencyProcess != null) + + if (Type=="Edit") { - this.txtProcessSteps.Text = EmergencyProcess.ProcessSteps; - this.txtProcessName.Text = EmergencyProcess.ProcessName; - this.txtStepOperator.Text = EmergencyProcess.StepOperator; - //this.txtRemark.Text = EmergencyProcess.Remark; - if (EmergencyProcess.ProcessSteps == "0") - { - this.State1.Hidden = false; - this.State2.Hidden = true; - this.State2Person.Hidden = true; - BindGrid(); - } - else - { - EmergencyTeamAndTrainService.InitTeamDropDownList(drpTeam, this.CurrUser.LoginProjectId, true); - if (!string.IsNullOrEmpty(EmergencyProcess.ProcessTeam)) - { - this.drpTeam.SelectedValueArray = EmergencyProcess.ProcessTeam.Split(','); - string Users = string.Empty; - string[] array = this.drpTeam.SelectedValueArray; - List str = new List(); - foreach (var item in array) - { - if (item != BLL.Const._Null) - { - var TeamItem = (from x in Funs.DB.Emergency_EmergencyTeamItem where x.FileId == item select x).ToList(); - foreach (var teams in TeamItem) - { - Users += PersonService.GetPersonNameById(teams.PersonId) + ","; - } - } - } - if (!string.IsNullOrEmpty(Users)) - { - txtUser.Text = Users.Substring(0, Users.LastIndexOf(",")); - } - } - } + var q = BLL.HJGL_YardPlanningService.GetHJGL_YardPlanningById(YardPlanningId); + txtYardPlanName.Text = q.YardPlanName; + } + } + } + } - private void BindGrid() - { - string strSql = @"select * from Emergency_EmergencyProcessItem where EmergencyProcessId=@EmergencyProcessId"; - List listStr = new List(); - listStr.Add(new SqlParameter("@EmergencyProcessId", this.EmergencyProcessId)); - SqlParameter[] parameter = listStr.ToArray(); - DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); - Grid1.RecordCount = tb.Rows.Count; - tb = GetFilteredTable(Grid1.FilteredData, tb); - var table = this.GetPagedDataTable(Grid1, tb); - Grid1.DataSource = table; - Grid1.DataBind(); - } - #endregion - - #region 保存 - /// - /// 保存按钮 - /// - /// - /// protected void btnSave_Click(object sender, EventArgs e) { - this.SaveData(); - PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); - } - - /// - /// 保存数据 - /// - /// - void SaveData() - { - var EmergencyProcess = Funs.DB.Emergency_EmergencyProcess.FirstOrDefault(x => x.EmergencyProcessId == this.EmergencyProcessId); - if (EmergencyProcess != null) + string Type = Request.Params["Type"]; + if (!string.IsNullOrEmpty(Type)) { - - EmergencyProcess.ProcessName = this.txtProcessName.Text.Trim(); - EmergencyProcess.StepOperator = this.txtStepOperator.Text.Trim(); - //EmergencyProcess.Remark = this.txtRemark.Text.Trim(); - //队伍 - EmergencyProcess.ProcessTeam = Funs.GetStringByArray(this.drpTeam.SelectedValueArray); - Funs.DB.SubmitChanges(); - if (EmergencyProcess.ProcessSteps == "0") + if (Type == "Add") { - var getViewList = this.CollectGridInfo(); - foreach (var item in getViewList) + Model.HJGL_YardPlanning hJGL_YardPlanning = new Model.HJGL_YardPlanning { - var ProcessItem = Funs.DB.Emergency_EmergencyProcessItem.FirstOrDefault(x => x.EmergencyProcessItemId == item.EmergencyProcessItemId); - if (ProcessItem != null) - { - ProcessItem.Content = item.Content; - ProcessItem.SortId = item.SortId; - Funs.DB.SubmitChanges(); - } - else - { - Model.Emergency_EmergencyProcessItem newItem = new Model.Emergency_EmergencyProcessItem - { - EmergencyProcessItemId = item.EmergencyProcessItemId, - EmergencyProcessId = this.EmergencyProcessId, - Content = item.Content, - SortId = item.SortId, - }; - Funs.DB.Emergency_EmergencyProcessItem.InsertOnSubmit(newItem); - Funs.DB.SubmitChanges(); - } - } + YardPlanningId = SQLHelper.GetNewID(), + YardPlanName = txtYardPlanName.Text, + ProjectId = this.CurrUser.LoginProjectId, + SurperId = YardPlanningId, + + }; + HJGL_YardPlanningService.AddHJGL_YardPlanning(hJGL_YardPlanning); + } - } - - } - - //private string GetStringByArray(string[] array) - //{ - // string str = string.Empty; - // foreach (var item in array) - // { - // if (item != BLL.Const._Null) - // { - // str += item + ","; - // } - // } - // if (!string.IsNullOrEmpty(str)) - // { - // str = str.Substring(0, str.LastIndexOf(",")); - // } - // return str; - //} - #endregion - - #region 获取按钮权限 - /// - /// 获取按钮权限 - /// - /// - /// - void GetButtonPower() - { - if (Request.Params["value"] == "0") - { - return; - } - var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.ProjectEmergencyProcessMenuId); - if (buttonList.Count() > 0) - { - if (buttonList.Contains(BLL.Const.BtnModify)) + else if (Type == "Edit") { - this.btnSave.Hidden = false; + var q = BLL.HJGL_YardPlanningService.GetHJGL_YardPlanningById(YardPlanningId); + q.YardPlanName=txtYardPlanName.Text ; + HJGL_YardPlanningService.UpdateHJGL_YardPlanning(q); } - } - } - #endregion + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); - #region 确定按钮 - /// - /// 确定按钮 - /// - /// - /// - protected void btnSure_Click(object sender, EventArgs e) - { - var getViewList = this.CollectGridInfo(); - getViewList = getViewList.Where(x => x.EmergencyProcessItemId != this.hdEmergencyProcessId.Text).ToList(); - Model.Emergency_EmergencyProcessItem newView = new Model.Emergency_EmergencyProcessItem - { - EmergencyProcessItemId = SQLHelper.GetNewID(), - EmergencyProcessId = this.EmergencyProcessId, - Content = this.txtContent.Text, - SortId=this.txtSortId.Text, - }; - getViewList.Add(newView); - - this.Grid1.DataSource = getViewList; - this.Grid1.DataBind(); - this.InitText(); - } - #endregion - - #region 收集页面信息 - /// - /// 收集页面信息 - /// - /// - private List CollectGridInfo() - { - List getViewList = new List(); - for (int i = 0; i < Grid1.Rows.Count; i++) - { - Model.Emergency_EmergencyProcessItem newView = new Model.Emergency_EmergencyProcessItem - { - EmergencyProcessItemId = Grid1.Rows[i].DataKeys[0].ToString(), - EmergencyProcessId = this.EmergencyProcessId, - Content = Grid1.Rows[i].Values[1].ToString(), - SortId = Grid1.Rows[i].Values[0].ToString(), - }; - getViewList.Add(newView); - } - - return getViewList; - } - #endregion - - #region 页面清空 - /// - /// 页面清空 - /// - private void InitText() - { - this.hdEmergencyProcessId.Text = string.Empty; - this.txtContent.Text = string.Empty; - this.txtSortId.Text = string.Empty; - } - #endregion - - #region Grid 操作事件 - /// - /// 双击 - /// - /// - /// - protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) - { - this.EditData(); - } - - /// - /// 编辑 - /// - /// - /// - protected void btnMenuEdit_Click(object sender, EventArgs e) - { - this.EditData(); - } - - /// - /// 编辑事件 - /// - private void EditData() - { - if (Grid1.SelectedRowIndexArray.Length == 0) - { - Alert.ShowInParent("请至少选择一条记录！", MessageBoxIcon.Warning); - return; - } - var getViewList = this.CollectGridInfo(); - var item = getViewList.FirstOrDefault(x => x.EmergencyProcessItemId == Grid1.SelectedRowID); - if (item != null) - { - this.hdEmergencyProcessId.Text = item.EmergencyProcessItemId; - this.txtContent.Text = item.Content; - this.txtSortId.Text = item.SortId; - } - - } - - /// - /// 删除 - /// - /// - /// - protected void btnMenuDelete_Click(object sender, EventArgs e) - { - if (Grid1.SelectedRowIndexArray.Length > 0) - { - var getViewList = this.CollectGridInfo(); - foreach (int rowIndex in Grid1.SelectedRowIndexArray) - { - string rowID = Grid1.DataKeys[rowIndex][0].ToString(); - var item = getViewList.FirstOrDefault(x => x.EmergencyProcessItemId == rowID); - if (item != null) - { - getViewList.Remove(item); - } - var ProcessItem = Funs.DB.Emergency_EmergencyProcessItem.First(x => x.EmergencyProcessItemId == rowID); - if (ProcessItem != null) { - Funs.DB.Emergency_EmergencyProcessItem.DeleteOnSubmit(ProcessItem); - Funs.DB.SubmitChanges(); - } - } - - this.Grid1.DataSource = getViewList; - this.Grid1.DataBind(); - } - } - #endregion - - protected void drpTeam_SelectedIndexChanged(object sender, EventArgs e) - { - txtUser.Text = string.Empty; ; - string Users = string.Empty; - string[] array = this.drpTeam.SelectedValueArray; - List str = new List(); - foreach (var item in array) - { - if (item != BLL.Const._Null) - { - var TeamItem = (from x in Funs.DB.Emergency_EmergencyTeamItem where x.FileId == item select x).ToList(); - foreach (var teams in TeamItem) - { - Users += PersonService.GetPersonNameById(teams.PersonId)+ ","; - } - } - } - if (!string.IsNullOrEmpty(Users)) - { - txtUser.Text = Users.Substring(0, Users.LastIndexOf(",")); } } } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx.designer.cs index 51725ca5..63a8f3d1 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/YardPlanningEdit.aspx.designer.cs @@ -42,130 +42,13 @@ namespace FineUIPro.Web.HJGL.PreDesign protected global::FineUIPro.Form SimpleForm1; /// - /// txtProcessSteps 控件。 + /// txtYardPlanName 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtProcessSteps; - - /// - /// txtProcessName 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtProcessName; - - /// - /// txtStepOperator 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtStepOperator; - - /// - /// State1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow State1; - - /// - /// Form2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form Form2; - - /// - /// txtSortId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtSortId; - - /// - /// txtContent 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtContent; - - /// - /// btnSure 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSure; - - /// - /// hdEmergencyProcessId 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.HiddenField hdEmergencyProcessId; - - /// - /// Grid1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Grid Grid1; - - /// - /// State2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow State2; - - /// - /// drpTeam 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpTeam; - - /// - /// State2Person 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.FormRow State2Person; - - /// - /// txtUser 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtUser; + protected global::FineUIPro.TextBox txtYardPlanName; /// /// Toolbar1 控件。 @@ -184,41 +67,5 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnSave; - - /// - /// btnClose 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnClose; - - /// - /// Menu1 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Menu Menu1; - - /// - /// btnMenuEdit 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuEdit; - - /// - /// btnMenuDelete 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.MenuButton btnMenuDelete; } } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx index ff6ec749..2968c35c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx @@ -91,7 +91,6 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx index 74817d43..1d0b7f46 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx @@ -4,21 +4,21 @@ - +
- - + - - + + - + - - + Icon="TableGo" EnableAjax="false" DisableControlBeforePostBack="true" EnablePostBack="true"> + + @@ -30,12 +30,24 @@ AllowColumnLocking="true" EnableColumnLines="true" ClicksToEdit="2" DataIDField="PipelineCode" EnableBigData="true" AllowSorting="true" SortField="PipelineCode" SortDirection="ASC" AllowPaging="true" IsDatabasePaging="false" PageSize="300" EnableBigDataRowTip="false" ForceFit="true" - EnableTextSelection="True" > + EnableTextSelection="True"> - + + + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx.cs index bee1e0fe..59a16b99 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldMatMatchGet.aspx.cs @@ -53,7 +53,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage path = path.Replace(".xlsx", string.Format("{0:yyyy-MM-dd-HH-mm}", DateTime.Now) + ".xlsx"); var a = (from x in pipelinecode select new { PipelineCode = x }).ToList(); var b=(from x in Funs.DB .HJGL_Pipeline where pipelinecode.Contains(x.PipelineCode) - select new {管线号=x.PipelineCode ,匹配率="100%",计划安装日期=x.PlanStartDate }).ToList(); + select new {管线号=x.PipelineCode ,流水段=x.FlowingSection,匹配率="100%",计划安装日期=x.PlanStartDate }).ToList(); MiniExcel.SaveAs(path, b); string fileName = "材料匹配100%管线.xlsx"; @@ -70,9 +70,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage } void BindGrid() { - var a =( from x in pipelinecode select new { PipelineCode = x }).ToList(); + var a = (from x in pipelinecode select new { PipelineCode = x }).ToList(); + var b = (from x in Funs.DB.HJGL_Pipeline + where pipelinecode.Contains(x.PipelineCode) + select new { PipelineCode = x.PipelineCode, FlowingSection = x.FlowingSection, MatchingRate = "100%", PlanStarDate = x.PlanStartDate }).ToList(); Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); - this.Grid1.DataSource = a; + this.Grid1.DataSource = b; this.Grid1.DataBind(); Grid1.RecordCount = a.Count(); } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx index be27496e..9a32d9e5 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx @@ -36,7 +36,7 @@ + EnableTextSelection="true" OnNodeCommand="tvControlItem_NodeCommand" EnableExpandEvent="true" OnNodeExpand="tvControlItem_TreeNodeExpanded"> @@ -100,7 +100,7 @@ - - - - + + + - -