diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 25628b52..cfab5f93 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index 8e4a5332..728892c4 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -545,6 +545,7 @@ + diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 6558e382..16dd7609 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -2901,6 +2901,12 @@ /// 确定分包商审批 /// public const string SetSubReview = "11503AD6-742D-406D-96F1-17BA3B9E7580"; + /// + /// 招标工作台账 + /// + public const string BidDocumentsStandingBookMenuId = "11f4f882-28a9-4610-a657-6a58336097d2"; + + #endregion diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index a6c972c4..7178c5fd 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -377,6 +377,54 @@ namespace BLL return strList; } + /// + /// jsonֵַеӢ˫ű˫ + /// + /// jsonַ + /// + public static string JsonReplaceSign(string strJson) + { + //ȡÿַ + char[] temp = strJson.ToCharArray(); + //ȡַ鳤 + int n = temp.Length; + //ѭַ + for (int i = 0; i < n; i++) + { + //jsonֵ:+" + if (temp[i] == ':' && temp[i + 1] == '"') + { + //ѭֵڵַ+2 㵽valueֵ + for (int j = i + 2; j < n; j++) + { + //жǷӢ˫ + if (temp[j] == '"') + { + //ųjsonԵ˫ + if (temp[j + 1] != ',' && temp[j + 1] != '}') + { + //滻˫ + temp[j] = ''; + } + else if (temp[j + 1] == ',' || temp[j + 1] == '}') + { + break; + } + } + //else if (temp[j] == '-') + //{ + // temp[j] = ' '; + //} + //else if (true) + //{ + // // ҪַжϾͿ + //} + } + } + } + return new String(temp); + } + /// /// /// diff --git a/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs b/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs new file mode 100644 index 00000000..ac08f4ca --- /dev/null +++ b/SGGL/BLL/PHTGL/BiddingManagement/BidDocStandingBookService.cs @@ -0,0 +1,176 @@ +using FineUIPro; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Text; + + +namespace BLL +{ + + public static class BidDocStandingBookService + { + public static Model.SGGLDB db = Funs.DB; + + + #region 获取列表 + /// + /// 记录数 + /// + public static int count + { + get; + set; + } + public static List GetPHTGL_BidDocumentsStandingBookByModle(Model.PHTGL_BidDocumentsStandingBook table) + { + var q = from x in db.PHTGL_BidDocumentsStandingBook + where + (string.IsNullOrEmpty(table.BidDocumentsStandingBookId) || x.BidDocumentsStandingBookId.Contains(table.BidDocumentsStandingBookId)) && + (string.IsNullOrEmpty(table.EPCCode) || x.EPCCode.Contains(table.EPCCode)) && + (string.IsNullOrEmpty(table.ProjectShortName) || x.ProjectShortName.Contains(table.ProjectShortName)) && + (string.IsNullOrEmpty(table.ProjectCode) || x.ProjectCode.Contains(table.ProjectCode)) && + (string.IsNullOrEmpty(table.BidType) || x.BidType.Contains(table.BidType)) && + (string.IsNullOrEmpty(table.ActionPlanCode) || x.ActionPlanCode.Contains(table.ActionPlanCode)) && + (string.IsNullOrEmpty(table.BidDocumentsCode) || x.BidDocumentsCode.Contains(table.BidDocumentsCode)) && + (string.IsNullOrEmpty(table.BidProject) || x.BidProject.Contains(table.BidProject)) && + (string.IsNullOrEmpty(table.ShortListApprovalCode) || x.ShortListApprovalCode.Contains(table.ShortListApprovalCode)) && + (string.IsNullOrEmpty(table.ProposedInviter) || x.ProposedInviter.Contains(table.ProposedInviter)) && + (string.IsNullOrEmpty(table.ApprovePersonFormCode) || x.ApprovePersonFormCode.Contains(table.ApprovePersonFormCode)) && + (string.IsNullOrEmpty(table.BidWinner) || x.BidWinner.Contains(table.BidWinner)) && + (string.IsNullOrEmpty(table.SetSubReviewCode) || x.SetSubReviewCode.Contains(table.SetSubReviewCode)) + select x + ; + + return q.ToList(); + } + + /// 获取分页列表 + /// + /// 页码 + /// 每页数量 + /// + public static IEnumerable getListData(Model.PHTGL_BidDocumentsStandingBook table, Grid Grid1) + { + var q = GetPHTGL_BidDocumentsStandingBookByModle(table); + count = q.Count(); + if (count == 0) + { + return null; + } + q= q.Take(Grid1.PageSize * Grid1.PageIndex).Skip(Grid1.PageSize * (Grid1.PageIndex)).ToList(); + // q = SortConditionHelper.SortingAndPaging(q, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); + return from x in q + select new + { + x.BidDocumentsStandingBookId, + x.EPCCode, + x.ProjectShortName, + x.ProjectCode, + x.IsOnLine, + x.BidType, + x.ActionPlanCode, + x.BidDocumentsCode, + x.BidProject, + x.ShortListApprovalCode, + x.ProposedInviter, + x.Bidding_SendTime, + x.Bidding_StartTime, + x.ApprovePersonFormCode, + x.BidWinner, + x.SetSubReviewCode, + + }; + } + #endregion + + public static Model.PHTGL_BidDocumentsStandingBook GetPHTGL_BidDocumentsStandingBookById(string BidDocumentsStandingBookId) + { + return db.PHTGL_BidDocumentsStandingBook.FirstOrDefault(x => x.BidDocumentsStandingBookId == BidDocumentsStandingBookId); + } + + + public static void AddPHTGL_BidDocumentsStandingBook(Model.PHTGL_BidDocumentsStandingBook newtable) + { + + Model.PHTGL_BidDocumentsStandingBook table = new Model.PHTGL_BidDocumentsStandingBook + { + BidDocumentsStandingBookId = newtable.BidDocumentsStandingBookId, + EPCCode = newtable.EPCCode, + ProjectShortName = newtable.ProjectShortName, + ProjectCode = newtable.ProjectCode, + IsOnLine = newtable.IsOnLine, + BidType = newtable.BidType, + ActionPlanCode = newtable.ActionPlanCode, + BidDocumentsCode = newtable.BidDocumentsCode, + BidProject = newtable.BidProject, + ShortListApprovalCode = newtable.ShortListApprovalCode, + ProposedInviter = newtable.ProposedInviter, + Bidding_SendTime = newtable.Bidding_SendTime, + Bidding_StartTime = newtable.Bidding_StartTime, + ApprovePersonFormCode = newtable.ApprovePersonFormCode, + BidWinner = newtable.BidWinner, + SetSubReviewCode = newtable.SetSubReviewCode, + }; + db.PHTGL_BidDocumentsStandingBook.InsertOnSubmit(table); + db.SubmitChanges(); + } + + public static void AddBulkPHTGL_BidDocumentsStandingBook(List newtables) + { + + db.PHTGL_BidDocumentsStandingBook.InsertAllOnSubmit(newtables); + db.SubmitChanges(); + } + + + public static void UpdatePHTGL_BidDocumentsStandingBook(Model.PHTGL_BidDocumentsStandingBook newtable) + { + + Model.PHTGL_BidDocumentsStandingBook table = db.PHTGL_BidDocumentsStandingBook.FirstOrDefault(x => x.BidDocumentsStandingBookId == newtable.BidDocumentsStandingBookId); + if (table != null) + { + table.BidDocumentsStandingBookId = newtable.BidDocumentsStandingBookId; + table.EPCCode = newtable.EPCCode; + table.ProjectShortName = newtable.ProjectShortName; + table.ProjectCode = newtable.ProjectCode; + table.IsOnLine = newtable.IsOnLine; + table.BidType = newtable.BidType; + table.ActionPlanCode = newtable.ActionPlanCode; + table.BidDocumentsCode = newtable.BidDocumentsCode; + table.BidProject = newtable.BidProject; + table.ShortListApprovalCode = newtable.ShortListApprovalCode; + table.ProposedInviter = newtable.ProposedInviter; + table.Bidding_SendTime = newtable.Bidding_SendTime; + table.Bidding_StartTime = newtable.Bidding_StartTime; + table.ApprovePersonFormCode = newtable.ApprovePersonFormCode; + table.BidWinner = newtable.BidWinner; + table.SetSubReviewCode = newtable.SetSubReviewCode; + db.SubmitChanges(); + } + + } + public static void DeletePHTGL_BidDocumentsStandingBookById(string BidDocumentsStandingBookId) + { + + Model.PHTGL_BidDocumentsStandingBook table = db.PHTGL_BidDocumentsStandingBook.FirstOrDefault(x => x.BidDocumentsStandingBookId == BidDocumentsStandingBookId); + if (table != null) + { + db.PHTGL_BidDocumentsStandingBook.DeleteOnSubmit(table); + db.SubmitChanges(); + } + + } + + public static void DeleteALLPHTGL_BidDocumentsStandingBook() + { + if (db.PHTGL_BidDocumentsStandingBook != null) + { + db.PHTGL_BidDocumentsStandingBook.DeleteAllOnSubmit(db.PHTGL_BidDocumentsStandingBook); + db.SubmitChanges(); + } + } + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/Controls/_3DLook.ascx.cs b/SGGL/FineUIPro.Web/Controls/_3DLook.ascx.cs index a4d4eb99..bccf51b0 100644 --- a/SGGL/FineUIPro.Web/Controls/_3DLook.ascx.cs +++ b/SGGL/FineUIPro.Web/Controls/_3DLook.ascx.cs @@ -1,4 +1,5 @@ -using Newtonsoft.Json; +using BLL; +using Newtonsoft.Json; using System; namespace FineUIPro.Web.Controls @@ -42,7 +43,7 @@ namespace FineUIPro.Web.Controls public void BindData() { string jsonParameter = JsonConvert.SerializeObject(data); - + jsonParameter = Funs.JsonReplaceSign(jsonParameter); PageContext.RegisterStartupScript(String.Format("BindData('{0}','{1}','{2}');", jsonParameter, this.Url_item, this.Url)); } diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index 79b18dc0..fbacf344 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1132,6 +1132,7 @@ + @@ -11582,6 +11583,13 @@ BidDocumentsStandingBook.aspx + + BidDocumentsStandingBookEdit.aspx + ASPXCodeBehind + + + BidDocumentsStandingBookEdit.aspx + ContractFile.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx index 189daf5e..0a39b2ea 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx @@ -32,9 +32,9 @@ - @@ -63,7 +63,7 @@ diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index db5abe91..a0ea877f 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using FineUIPro.Web.HJGL.WeldingManage; using Model; using System; using System.Collections.Generic; @@ -12,6 +13,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery { public partial class JointQuery : PageBase { + public int pageSize = 20; public decimal JointComplete { get @@ -145,26 +147,28 @@ namespace FineUIPro.Web.HJGL.InfoQuery { foreach (var q in unitWork1) { - if (q != null) + int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); + var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); + TreeNode tn1 = new TreeNode(); + tn1.NodeID = q.UnitWorkId; + tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; + tn1.ToolTip = "施工单位：" + u.UnitName; + tn1.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); + tn1.EnableClickEvent = true; + tn1.EnableExpandEvent = true; + rootNode1.Nodes.Add(tn1); + if (a > 0) { - int a = (from x in Funs.DB.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); - TreeNode tn1 = new TreeNode(); - tn1.NodeID = q.UnitWorkId; - tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "管线"; - tn1.ToolTip = "施工单位：" + u.UnitName; - tn1.CommandName = "单位工程"; - tn1.EnableExpandEvent = true; - rootNode1.Nodes.Add(tn1); - if (a > 0) - { - // BindNodes(tn1); - TreeNode newNode = new TreeNode(); - newNode.Text = "加载管线..."; - newNode.NodeID = "加载管线..."; - tn1.Nodes.Add(newNode); - } + // BindNodes(tn1); + TreeNode newNode = new TreeNode(); + newNode.Text = "加载管线..."; + newNode.NodeID = "加载管线..."; + tn1.Nodes.Add(newNode); } + //if (a > 0) + //{ + // BindNodes(tn1); + //} } } if (unitWork2.Count() > 0) @@ -185,9 +189,9 @@ namespace FineUIPro.Web.HJGL.InfoQuery tn2.Expanded = true; } tn2.ToolTip = "施工单位：" + u.UnitName; - tn2.CommandName = "单位工程"; - tn2.EnableExpandEvent = true; + tn2.CommandName = 1 + "|" + Funs.GetEndPageNumber(a, pageSize); tn2.EnableClickEvent = true; + tn2.EnableExpandEvent = true; rootNode2.Nodes.Add(tn2); if (a > 0) { @@ -199,35 +203,6 @@ namespace FineUIPro.Web.HJGL.InfoQuery } } } - //if (unitWork1.Count() > 0) - //{ - // 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.View_HJGL_JointInfoQuery where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == q.UnitWorkId select x).Count(); - // var u = BLL.UnitService.GetUnitByUnitId(q.UnitId); - // TreeNode tn1 = new TreeNode(); - // tn1.NodeID = q.UnitWorkId; - // tn1.Text = q.UnitWorkName + "【" + a.ToString() + "】" + "焊口"; - // tn1.ToolTip = "施工单位：" + u.UnitName; - // tn1.EnableClickEvent = true; - // rootNode1.Nodes.Add(tn1); - // } - //} - //if (unitWork2.Count() > 0) - //{ - // foreach (var q in unitWork2) - // { - // int a = (from x in Funs.DB.View_HJGL_JointInfoQuery where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == 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.ToolTip = "施工单位：" + u.UnitName; - // tn2.EnableClickEvent = true; - // rootNode2.Nodes.Add(tn2); - // } - //} } #endregion @@ -239,57 +214,78 @@ namespace FineUIPro.Web.HJGL.InfoQuery /// protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { - this.BindGrid(); - Model.Parameter3D parameter3D = new Model.Parameter3D(); - Model.ColorModel colorModel = new Model.ColorModel(); - colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); - parameter3D.ColorModel = colorModel; - parameter3D.TagNum = ""; - parameter3D.ButtonType = "2.1"; - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); - - - if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + if (e.CommandName == "加载") { - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); - parameter3D.Crater_data = "0"; - parameter3D.Completed_weldedjunction = Completed_weldedjunction; - parameter3D.Incomplete_weldjunction = Incomplete_weldjunction; - + string CommandName = e.Node.ParentNode.CommandName; + e.Node.ParentNode.CommandName = (int.Parse(CommandName.Split('|')[0]) + 1) + "|" + int.Parse(CommandName.Split('|')[1]); + TreeNode treeNode = e.Node.ParentNode; + treeNode.Nodes.Remove(e.Node); + BindNodes(e.Node.ParentNode); } - else if (this.tvControlItem.SelectedNode.CommandName == "管线") + else { - var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID); - if (model != null&&!string.IsNullOrEmpty(model.UnitWorkId)) + this.BindGrid(); + Model.Parameter3D parameter3D = new Model.Parameter3D(); + Model.ColorModel colorModel = new Model.ColorModel(); + colorModel = BLL.Project_SysSetService.GetColorModel(this.CurrUser.LoginProjectId); + parameter3D.ColorModel = colorModel; + parameter3D.TagNum = ""; + parameter3D.ButtonType = "2.1"; + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + + if (this.tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2) { - parameter3D.Crater_data = "1"; - parameter3D.TagNum = "/" + model.PipelineCode; - parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId); + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); + parameter3D.Crater_data = "0"; + parameter3D.Completed_weldedjunction = Completed_weldedjunction; + parameter3D.Incomplete_weldjunction = Incomplete_weldjunction; } + else if (this.tvControlItem.SelectedNode.CommandName == "管线") + { + var model = PipelineService.GetPipelineByPipelineId(tvControlItem.SelectedNodeID); + if (model != null && !string.IsNullOrEmpty(model.UnitWorkId)) + { + parameter3D.Crater_data = "1"; + parameter3D.TagNum = "/" + model.PipelineCode; + parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(model.UnitWorkId); + } + + } + parameter3D.Transparency = colorModel.PipelineComplete; + parameter3D.Finished_color = colorModel.JointCompleteColor; + parameter3D.Incomplete_color = colorModel.JointNOCompleteColor; + + ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName; + ctlAuditFlow.data = parameter3D; + ctlAuditFlow.BindData(); } - parameter3D.Transparency = colorModel.PipelineComplete; - parameter3D.Finished_color = colorModel.JointCompleteColor; - parameter3D.Incomplete_color = colorModel.JointNOCompleteColor; - - ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) + parameter3D.ModelName; - ctlAuditFlow.data = parameter3D; - ctlAuditFlow.BindData(); + } protected void tvControlItem_TreeNodeExpanded(object sender, TreeNodeEventArgs e) { - e.Node.Nodes.Clear(); - if (e.Node.CommandName == "单位工程") - { - var pipeline = (from x in Funs.DB.HJGL_Pipeline - where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == e.Node.NodeID - && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) - orderby x.PipelineCode - select x).ToList(); - var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + if (e.Node.Nodes[0].NodeID == "加载管线...") + { + e.Node.Nodes.Clear(); + BindNodes(e.Node); + } + } + private void BindNodes(TreeNode node) + { + var pipeline = (from x in Funs.DB.HJGL_Pipeline + where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitWorkId == node.NodeID + && x.PipelineCode.Contains(this.tvPipeCode.Text.Trim()) + orderby x.PipelineCode + select x).ToList(); + var hJGL_WeldJoints = (from x in Funs.DB.HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x).ToList(); + int pageindex = int.Parse(node.CommandName.Split('|')[0]); + int pageCount = int.Parse(node.CommandName.Split('|')[1]); + if (pageindex <= pageCount) + { + pipeline = pipeline.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); foreach (var item in pipeline) { var jotCount = (from x in hJGL_WeldJoints where x.PipelineId == item.PipelineId /*&& x.IsTwoJoint == null*/ select x).Count(); @@ -298,7 +294,17 @@ namespace FineUIPro.Web.HJGL.InfoQuery newNode.NodeID = item.PipelineId; newNode.CommandName = "管线"; newNode.EnableClickEvent = true; - e.Node.Nodes.Add(newNode); + node.Nodes.Add(newNode); + } + if (pageindex < pageCount) + { + TreeNode newNode = new TreeNode(); + newNode.Text = "加载"; + newNode.NodeID = SQLHelper.GetNewID(); + newNode.CommandName = "加载"; + newNode.Icon = Icon.ArrowDown; + newNode.EnableClickEvent = true; + node.Nodes.Add(newNode); } } } @@ -335,7 +341,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery //this.Grid1.RecordCount = tb.Rows.Count; Model.View_HJGL_WeldJoint model =new Model.View_HJGL_WeldJoint(); model.ProjectId = this.CurrUser.LoginProjectId; - if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + if (this.tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2 ) { model.UnitWorkId = this.tvControlItem.SelectedNodeID; @@ -346,18 +352,23 @@ namespace FineUIPro.Web.HJGL.InfoQuery } model.WeldJointCode = this.txtWeldJointCode.Text; var list= BLL.WeldJointService.GetViewWeldJointsBymodel(model); - get3DParmeter_weldjoint(list);//获取三维所需焊口参数 - var q = list.Where(x => !string.IsNullOrEmpty(x.WeldingDate)); - var q2 = list.Where(x =>x.JointAttribute == "预制口"); - var sumcount= list.Count; - this.Grid1.RecordCount = list.Count; + if (!string.IsNullOrEmpty(ctlAuditFlow.Url)) + { + get3DParmeter_weldjoint(list);//获取三维所需焊口参数 + var q = list.Where(x => !string.IsNullOrEmpty(x.WeldingDate)); + var q2 = list.Where(x => x.JointAttribute == "预制口"); + var sumcount = list.Count; + this.Grid1.RecordCount = list.Count; - this.JointComplete = q.Count(); - this.JointNoComplete = sumcount - JointComplete; - this.JointPre = q2.Count(); - this.JointNoPre = sumcount - JointPre; - //var table = this.GetPagedDataTable(Grid1, list); - Grid1.DataSource = list; + this.JointComplete = q.Count(); + this.JointNoComplete = sumcount - JointComplete; + this.JointPre = q2.Count(); + this.JointNoPre = sumcount - JointPre; + } + + var table = this.GetPagedDataTable(Grid1, list); + Grid1.DataSource = table; + Grid1.RecordCount = list.Count; Grid1.DataBind(); } @@ -465,6 +476,21 @@ 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; + + } + else if (this.tvControlItem.SelectedNode.CommandName == "管线") + { + model.PipelineId = this.tvControlItem.SelectedNodeID; + } + model.WeldJointCode = this.txtWeldJointCode.Text; + var list = BLL.WeldJointService.GetViewWeldJointsBymodel(model); + + Response.ClearContent(); string filename = Funs.GetNewFileName(); Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("焊口台账总览" + filename, System.Text.Encoding.UTF8) + ".xls"); @@ -534,7 +560,7 @@ namespace FineUIPro.Web.HJGL.InfoQuery parameter3D.TagNum = string.Join(",", weldjointcodes); parameter3D.ButtonType = "2.1"; parameter3D.Crater_data = "1"; - if (this.tvControlItem.SelectedNode.CommandName == "单位工程") + if (this.tvControlItem.SelectedNode.CommandName.Split('|').Count() == 2) { parameter3D.ModelName = HJGL_DataImportService.Getlatest3DModelNameByUnitWorkId(tvControlItem.SelectedNodeID); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx index 1583cdf1..c8245462 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx @@ -67,6 +67,7 @@ EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="txtMaterialCode_TextChanged" Width="240px" LabelWidth="80px" LabelAlign="Right"> + <%--0) + { + var proSum = (from x in q + where x.JointAttribute == "预制口" + group x by x.UnitWorkId into g + select new + { + SizeSum = g.Sum(x => x.Size) + }).FirstOrDefault().SizeSum; + var AllSum = (from x in q + group x by x.UnitWorkId into g + select new + { + SizeSum = g.Sum(x => x.Size) + }).FirstOrDefault().SizeSum; + var a = (decimal)100 * proSum / AllSum; + var rate = Math.Round((decimal)a, 1); + return rate.ToString()+"%"; + } + return ""; + } + void GetRateByPipelineid(string pipelineid) + { + var db = Funs.DB; + var q = (from x in db.View_HJGL_WeldJoint + group x by x.PipelineId into g + where g.Key == pipelineid + select new + { + SizeSum = g.Sum(x => x.Size) + }).FirstOrDefault().SizeSum; + + } + #endregion #region 焊口信息 维护事件 /// /// Grid双击事件 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs index a393ff95..31092418 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.WeldingManage { - - - public partial class WeldJointList { - +namespace FineUIPro.Web.HJGL.WeldingManage +{ + + + public partial class WeldJointList + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// tvPipeCode 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox tvPipeCode; - + /// /// hdUnitWorkId 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hdUnitWorkId; - + /// /// btnTreeFind 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnTreeFind; - + /// /// tvControlItem 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// Panel2 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel2; - + /// /// panelCenterRegion 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Toolbar3 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// txtWeldJointCode 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWeldJointCode; - + /// /// txtMaterialCode 控件。 /// @@ -137,7 +139,16 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtMaterialCode; - + + /// + /// lbSinglePreRate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSinglePreRate; + /// /// ToolbarFill1 控件。 /// @@ -146,7 +157,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// btnNew 控件。 /// @@ -155,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnNew; - + /// /// btnPrint 控件。 /// @@ -164,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnPrint; - + /// /// btnImport 控件。 /// @@ -173,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + /// /// btnUpdateImport 控件。 /// @@ -182,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnUpdateImport; - + /// /// btnPDMSImport 控件。 /// @@ -191,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnPDMSImport; - + /// /// btnMatImport 控件。 /// @@ -200,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnMatImport; - + /// /// Grid1 控件。 /// @@ -209,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Label1 控件。 /// @@ -218,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label Label1; - + /// /// panelBottomRegion 控件。 /// @@ -227,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelBottomRegion; - + /// /// TabStrip1 控件。 /// @@ -236,7 +247,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TabStrip TabStrip1; - + /// /// TabJoint 控件。 /// @@ -245,7 +256,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tab TabJoint; - + /// /// Grid3 控件。 /// @@ -254,7 +265,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid3; - + /// /// TabPipeMat 控件。 /// @@ -263,7 +274,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tab TabPipeMat; - + /// /// Grid2 控件。 /// @@ -272,7 +283,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid2; - + /// /// Window1 控件。 /// @@ -281,7 +292,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + /// /// Window2 控件。 /// @@ -290,7 +301,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window2; - + /// /// Window3 控件。 /// @@ -299,7 +310,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window3; - + /// /// Window4 控件。 /// @@ -308,7 +319,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window4; - + /// /// Window5 控件。 /// @@ -317,7 +328,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window5; - + /// /// Menu1 控件。 /// @@ -326,7 +337,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuPipeLineEdit 控件。 /// @@ -335,7 +346,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuPipeLineEdit; - + /// /// btnMenuPipeLineDelete 控件。 /// @@ -344,7 +355,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuPipeLineDelete; - + /// /// Menu2 控件。 /// @@ -353,7 +364,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu2; - + /// /// btnDelMat 控件。 /// @@ -362,7 +373,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnDelMat; - + /// /// Menu3 控件。 /// @@ -371,7 +382,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu3; - + /// /// btnMenuEdit 控件。 /// @@ -380,7 +391,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + /// /// btnMenuInsert 控件。 /// @@ -389,7 +400,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuInsert; - + /// /// btnView 控件。 /// @@ -398,7 +409,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnView; - + /// /// btnMenuDelete 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx index 9f27be2d..c2ae5fae 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx @@ -91,43 +91,43 @@ - - - - - - - - - - - - - 0) { if (buttonList.Contains(Const.BtnAdd)) diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx new file mode 100644 index 00000000..be39f9dd --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx @@ -0,0 +1,129 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="BidDocumentsStandingBookEdit.aspx.cs" Inherits="FineUIPro.Web.PHTGL.Filing.BidDocumentsStandingBookEdit" %> + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs new file mode 100644 index 00000000..06e33895 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.cs @@ -0,0 +1,131 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using BLL; + +namespace FineUIPro.Web.PHTGL.Filing +{ + public partial class BidDocumentsStandingBookEdit: PageBase + { + #region + /// + /// 主键 + /// + public string BidDocumentsStandingBookId + { + get + { + return (string)ViewState["BidDocumentsStandingBookId"]; + } + set + { + ViewState["BidDocumentsStandingBookId"] = value; + } + } + #endregion + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + ////权限按钮方法 + this.GetButtonPower(); + this.BidDocumentsStandingBookId = Request.Params["BidDocumentsStandingBookId"]; + if (!string.IsNullOrEmpty(this.BidDocumentsStandingBookId)) + { + Model.PHTGL_BidDocumentsStandingBook model = BLL.BidDocStandingBookService.GetPHTGL_BidDocumentsStandingBookById(this.BidDocumentsStandingBookId); + if (model != null) + { + this.txtEPCCode.Text = model.EPCCode; + this.txtProjectShortName.Text = model.ProjectShortName; + this.txtProjectCode.Text = model.ProjectCode; + if (model.IsOnLine.HasValue) + { + this.txtIsOnLine.Text = model.IsOnLine.Value.ToString(); + } + this.txtBidType.Text = model.BidType; + this.txtActionPlanCode.Text = model.ActionPlanCode; + this.txtBidDocumentsCode.Text = model.BidDocumentsCode; + this.txtBidProject.Text = model.BidProject; + this.txtShortListApprovalCode.Text = model.ShortListApprovalCode; + this.txtProposedInviter.Text = model.ProposedInviter; + if (model.Bidding_SendTime != null) + { + this.txtBidding_SendTime.Text = string.Format("{0:yyyy-MM-dd}", model.Bidding_SendTime); + } + if (model.Bidding_StartTime != null) + { + this.txtBidding_StartTime.Text = string.Format("{0:yyyy-MM-dd}", model.Bidding_StartTime); + } + this.txtApprovePersonFormCode.Text = model.ApprovePersonFormCode; + this.txtBidWinner.Text = model.BidWinner; + this.txtSetSubReviewCode.Text = model.SetSubReviewCode; + + } + } + } + } + + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + Model.PHTGL_BidDocumentsStandingBook table = new Model.PHTGL_BidDocumentsStandingBook(); + table.EPCCode = this.txtEPCCode.Text; + table.ProjectShortName = this.txtProjectShortName.Text; + table.ProjectCode = this.txtProjectCode.Text; + table.IsOnLine = Funs.GetNewInt(this.txtIsOnLine.Text); + table.BidType = this.txtBidType.Text; + table.ActionPlanCode = this.txtActionPlanCode.Text; + table.BidDocumentsCode = this.txtBidDocumentsCode.Text; + table.BidProject = this.txtBidProject.Text; + table.ShortListApprovalCode = this.txtShortListApprovalCode.Text; + table.ProposedInviter = this.txtProposedInviter.Text; + table.Bidding_SendTime = this.txtBidding_SendTime.SelectedDate; + table.Bidding_StartTime = this.txtBidding_StartTime.SelectedDate; + table.ApprovePersonFormCode = this.txtApprovePersonFormCode.Text; + table.BidWinner = this.txtBidWinner.Text; + table.SetSubReviewCode = this.txtSetSubReviewCode.Text; + if (string.IsNullOrEmpty(this.BidDocumentsStandingBookId)) + { + table.BidDocumentsStandingBookId = SQLHelper.GetNewID(typeof(Model.PHTGL_BidDocumentsStandingBook)); + BLL.BidDocStandingBookService.AddPHTGL_BidDocumentsStandingBook(table); + + } + else + { + table.BidDocumentsStandingBookId = this.BidDocumentsStandingBookId; + BLL.BidDocStandingBookService.UpdatePHTGL_BidDocumentsStandingBook(table); + } + PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference()); + } + + #region 获取按钮权限 + /// + /// 获取按钮权限 + /// + /// + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.BidDocumentsStandingBookMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnSave.Hidden = false; + } + } + } + #endregion + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs new file mode 100644 index 00000000..de4619a9 --- /dev/null +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx.designer.cs @@ -0,0 +1,215 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.PHTGL.Filing +{ + + + public partial class BidDocumentsStandingBookEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtEPCCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEPCCode; + + /// + /// txtProjectShortName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectShortName; + + /// + /// txtProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectCode; + + /// + /// txtIsOnLine 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtIsOnLine; + + /// + /// txtBidType 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtBidType; + + /// + /// txtActionPlanCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtActionPlanCode; + + /// + /// txtBidDocumentsCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtBidDocumentsCode; + + /// + /// txtBidProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtBidProject; + + /// + /// txtShortListApprovalCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtShortListApprovalCode; + + /// + /// txtProposedInviter 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProposedInviter; + + /// + /// txtBidding_SendTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtBidding_SendTime; + + /// + /// txtBidding_StartTime 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtBidding_StartTime; + + /// + /// txtApprovePersonFormCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtApprovePersonFormCode; + + /// + /// txtBidWinner 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtBidWinner; + + /// + /// txtSetSubReviewCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSetSubReviewCode; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + } +} diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx.cs index e8b4ff86..2a5fa0e1 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL_AVEVA.aspx.cs @@ -7,9 +7,8 @@ namespace FineUIPro.Web protected void Page_Load(object sender, EventArgs e) { ctlAuditFlow.Url = BLL.Project_SysSetService.GetAvevaNetUrl(this.CurrUser.LoginProjectId); - ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId) ; - PipelineService.RestPipelineAndJoints(this.CurrUser.LoginProjectId); - + ctlAuditFlow.Url_item = BLL.Project_SysSetService.GetAvevaNetUrl_Item(this.CurrUser.LoginProjectId); + // PipelineService.RestPipelineAndJoints(this.CurrUser.LoginProjectId); } } } \ No newline at end of file diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index e9946239..0e727bd7 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -914,6 +914,9 @@ namespace Model partial void InsertPHTGL_BidDocumentsReview(PHTGL_BidDocumentsReview instance); partial void UpdatePHTGL_BidDocumentsReview(PHTGL_BidDocumentsReview instance); partial void DeletePHTGL_BidDocumentsReview(PHTGL_BidDocumentsReview instance); + partial void InsertPHTGL_BidDocumentsStandingBook(PHTGL_BidDocumentsStandingBook instance); + partial void UpdatePHTGL_BidDocumentsStandingBook(PHTGL_BidDocumentsStandingBook instance); + partial void DeletePHTGL_BidDocumentsStandingBook(PHTGL_BidDocumentsStandingBook instance); partial void InsertPHTGL_Contract(PHTGL_Contract instance); partial void UpdatePHTGL_Contract(PHTGL_Contract instance); partial void DeletePHTGL_Contract(PHTGL_Contract instance); @@ -3856,6 +3859,14 @@ namespace Model } } + public System.Data.Linq.Table PHTGL_BidDocumentsStandingBook + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table PHTGL_Contract { get @@ -142315,6 +142326,428 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PHTGL_BidDocumentsStandingBook")] + public partial class PHTGL_BidDocumentsStandingBook : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _BidDocumentsStandingBookId; + + private string _EPCCode; + + private string _ProjectShortName; + + private string _ProjectCode; + + private System.Nullable _IsOnLine; + + private string _BidType; + + private string _ActionPlanCode; + + private string _BidDocumentsCode; + + private string _BidProject; + + private string _ShortListApprovalCode; + + private string _ProposedInviter; + + private System.Nullable _Bidding_SendTime; + + private System.Nullable _Bidding_StartTime; + + private string _ApprovePersonFormCode; + + private string _BidWinner; + + private string _SetSubReviewCode; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnBidDocumentsStandingBookIdChanging(string value); + partial void OnBidDocumentsStandingBookIdChanged(); + partial void OnEPCCodeChanging(string value); + partial void OnEPCCodeChanged(); + partial void OnProjectShortNameChanging(string value); + partial void OnProjectShortNameChanged(); + partial void OnProjectCodeChanging(string value); + partial void OnProjectCodeChanged(); + partial void OnIsOnLineChanging(System.Nullable value); + partial void OnIsOnLineChanged(); + partial void OnBidTypeChanging(string value); + partial void OnBidTypeChanged(); + partial void OnActionPlanCodeChanging(string value); + partial void OnActionPlanCodeChanged(); + partial void OnBidDocumentsCodeChanging(string value); + partial void OnBidDocumentsCodeChanged(); + partial void OnBidProjectChanging(string value); + partial void OnBidProjectChanged(); + partial void OnShortListApprovalCodeChanging(string value); + partial void OnShortListApprovalCodeChanged(); + partial void OnProposedInviterChanging(string value); + partial void OnProposedInviterChanged(); + partial void OnBidding_SendTimeChanging(System.Nullable value); + partial void OnBidding_SendTimeChanged(); + partial void OnBidding_StartTimeChanging(System.Nullable value); + partial void OnBidding_StartTimeChanged(); + partial void OnApprovePersonFormCodeChanging(string value); + partial void OnApprovePersonFormCodeChanged(); + partial void OnBidWinnerChanging(string value); + partial void OnBidWinnerChanged(); + partial void OnSetSubReviewCodeChanging(string value); + partial void OnSetSubReviewCodeChanged(); + #endregion + + public PHTGL_BidDocumentsStandingBook() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BidDocumentsStandingBookId", DbType="VarChar(100) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string BidDocumentsStandingBookId + { + get + { + return this._BidDocumentsStandingBookId; + } + set + { + if ((this._BidDocumentsStandingBookId != value)) + { + this.OnBidDocumentsStandingBookIdChanging(value); + this.SendPropertyChanging(); + this._BidDocumentsStandingBookId = value; + this.SendPropertyChanged("BidDocumentsStandingBookId"); + this.OnBidDocumentsStandingBookIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EPCCode", DbType="VarChar(100)")] + public string EPCCode + { + get + { + return this._EPCCode; + } + set + { + if ((this._EPCCode != value)) + { + this.OnEPCCodeChanging(value); + this.SendPropertyChanging(); + this._EPCCode = value; + this.SendPropertyChanged("EPCCode"); + this.OnEPCCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectShortName", DbType="VarChar(100)")] + public string ProjectShortName + { + get + { + return this._ProjectShortName; + } + set + { + if ((this._ProjectShortName != value)) + { + this.OnProjectShortNameChanging(value); + this.SendPropertyChanging(); + this._ProjectShortName = value; + this.SendPropertyChanged("ProjectShortName"); + this.OnProjectShortNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectCode", DbType="VarChar(100)")] + public string ProjectCode + { + get + { + return this._ProjectCode; + } + set + { + if ((this._ProjectCode != value)) + { + this.OnProjectCodeChanging(value); + this.SendPropertyChanging(); + this._ProjectCode = value; + this.SendPropertyChanged("ProjectCode"); + this.OnProjectCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsOnLine", DbType="Int")] + public System.Nullable IsOnLine + { + get + { + return this._IsOnLine; + } + set + { + if ((this._IsOnLine != value)) + { + this.OnIsOnLineChanging(value); + this.SendPropertyChanging(); + this._IsOnLine = value; + this.SendPropertyChanged("IsOnLine"); + this.OnIsOnLineChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BidType", DbType="VarChar(100)")] + public string BidType + { + get + { + return this._BidType; + } + set + { + if ((this._BidType != value)) + { + this.OnBidTypeChanging(value); + this.SendPropertyChanging(); + this._BidType = value; + this.SendPropertyChanged("BidType"); + this.OnBidTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ActionPlanCode", DbType="VarChar(100)")] + public string ActionPlanCode + { + get + { + return this._ActionPlanCode; + } + set + { + if ((this._ActionPlanCode != value)) + { + this.OnActionPlanCodeChanging(value); + this.SendPropertyChanging(); + this._ActionPlanCode = value; + this.SendPropertyChanged("ActionPlanCode"); + this.OnActionPlanCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BidDocumentsCode", DbType="VarChar(100)")] + public string BidDocumentsCode + { + get + { + return this._BidDocumentsCode; + } + set + { + if ((this._BidDocumentsCode != value)) + { + this.OnBidDocumentsCodeChanging(value); + this.SendPropertyChanging(); + this._BidDocumentsCode = value; + this.SendPropertyChanged("BidDocumentsCode"); + this.OnBidDocumentsCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BidProject", DbType="VarChar(100)")] + public string BidProject + { + get + { + return this._BidProject; + } + set + { + if ((this._BidProject != value)) + { + this.OnBidProjectChanging(value); + this.SendPropertyChanging(); + this._BidProject = value; + this.SendPropertyChanged("BidProject"); + this.OnBidProjectChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ShortListApprovalCode", DbType="VarChar(100)")] + public string ShortListApprovalCode + { + get + { + return this._ShortListApprovalCode; + } + set + { + if ((this._ShortListApprovalCode != value)) + { + this.OnShortListApprovalCodeChanging(value); + this.SendPropertyChanging(); + this._ShortListApprovalCode = value; + this.SendPropertyChanged("ShortListApprovalCode"); + this.OnShortListApprovalCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProposedInviter", DbType="VarChar(100)")] + public string ProposedInviter + { + get + { + return this._ProposedInviter; + } + set + { + if ((this._ProposedInviter != value)) + { + this.OnProposedInviterChanging(value); + this.SendPropertyChanging(); + this._ProposedInviter = value; + this.SendPropertyChanged("ProposedInviter"); + this.OnProposedInviterChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Bidding_SendTime", DbType="DateTime")] + public System.Nullable Bidding_SendTime + { + get + { + return this._Bidding_SendTime; + } + set + { + if ((this._Bidding_SendTime != value)) + { + this.OnBidding_SendTimeChanging(value); + this.SendPropertyChanging(); + this._Bidding_SendTime = value; + this.SendPropertyChanged("Bidding_SendTime"); + this.OnBidding_SendTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Bidding_StartTime", DbType="DateTime")] + public System.Nullable Bidding_StartTime + { + get + { + return this._Bidding_StartTime; + } + set + { + if ((this._Bidding_StartTime != value)) + { + this.OnBidding_StartTimeChanging(value); + this.SendPropertyChanging(); + this._Bidding_StartTime = value; + this.SendPropertyChanged("Bidding_StartTime"); + this.OnBidding_StartTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApprovePersonFormCode", DbType="VarChar(100)")] + public string ApprovePersonFormCode + { + get + { + return this._ApprovePersonFormCode; + } + set + { + if ((this._ApprovePersonFormCode != value)) + { + this.OnApprovePersonFormCodeChanging(value); + this.SendPropertyChanging(); + this._ApprovePersonFormCode = value; + this.SendPropertyChanged("ApprovePersonFormCode"); + this.OnApprovePersonFormCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BidWinner", DbType="VarChar(100)")] + public string BidWinner + { + get + { + return this._BidWinner; + } + set + { + if ((this._BidWinner != value)) + { + this.OnBidWinnerChanging(value); + this.SendPropertyChanging(); + this._BidWinner = value; + this.SendPropertyChanged("BidWinner"); + this.OnBidWinnerChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SetSubReviewCode", DbType="VarChar(100)")] + public string SetSubReviewCode + { + get + { + return this._SetSubReviewCode; + } + set + { + if ((this._SetSubReviewCode != value)) + { + this.OnSetSubReviewCodeChanging(value); + this.SendPropertyChanging(); + this._SetSubReviewCode = value; + this.SendPropertyChanged("SetSubReviewCode"); + this.OnSetSubReviewCodeChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.PHTGL_Contract")] public partial class PHTGL_Contract : INotifyPropertyChanging, INotifyPropertyChanged { diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj index d0b44dec..a240e131 100644 --- a/SGGL/WebAPI/WebAPI.csproj +++ b/SGGL/WebAPI/WebAPI.csproj @@ -50,8 +50,9 @@ bin\WebAPI.xml - - ..\..\..\..\Development\DepCode\reference-bll\Reference BLL\Aspose.Words.dll + + False + bin\Aspose.Words.dll