From e4f889fa7a39bf5aacb3f1295877c11bd77e1239 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 21 Mar 2023 10:21:07 +0800 Subject: [PATCH] 2023-03-21 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 29184 -> 29184 bytes .../HJGL/InfoQuery/JointQuery.aspx.cs | 3 +- .../HJGL/WeldingManage/WeldJointList.aspx.cs | 16 +- .../BidDocumentsReviewEdit.aspx.cs | 2 +- .../Filing/BidDocumentsStandingBook.aspx | 2 + .../Filing/BidDocumentsStandingBook.aspx.cs | 62 ++++++- .../BidDocumentsStandingBook.aspx.designer.cs | 9 + .../Filing/BidDocumentsStandingBookEdit.aspx | 174 ++++++++---------- .../BidDocumentsStandingBookEdit.aspx.cs | 117 ++++++++---- ...DocumentsStandingBookEdit.aspx.designer.cs | 98 ++++++---- 10 files changed, 300 insertions(+), 183 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index c22ec42342293036186aae23f1b7ce40e0ccc7c0..d27c0509430299b83f4e893d211aacae1e9952d9 100644 GIT binary patch delta 875 zcmZp8!r1VHaYGIh=Y}Qh6B8nDG74`lWtz`eFTlXS@E;9u1I46)SQ&`_0p<9CvL24G1*SEDZFm0|d>tJ4F#x%(aXs(UnjWbQaxkz;0msi znN$oC(~?rtEX;IGO^gk7O$-bSbdyXBOmz*7Q_RehQjE-!Q;asRO$lb)l;ps+*&*!! b<7S5(S;ooh^V}x$7g$f8mz@L(nmiT&i*J8h delta 1057 zcmbtT&rcIU6yBM(w#CH)ZlEG!ML<$ogzX|NAYF?ZLLe>Shg4!|OIU-F1_ctl*fr5` zA;#=GdC_Dqo=k-C4rf*5HQV@hgTxHh&8+je_%ZPG>7a<}pBDl_N?Oa#7YOOerow0aL zNi2Z;bji8tm=7N|Be{YImRzNRslqVrRQ_AyxG?J{?8j!I&0WZfnXn^)` zVWhT^Emf}(vx*wQPtY%Qz+NyVR$v2se!O|Efu+_p!$07$2XGvdQgBmhXM29pVb(iM zg_F$2_4npv~_&0%&^qkDHikPO3q z&oL_^q%$9xiN$iU9K6qtu)Z91JJ1*OYuDYA+x%x1 rU{#BOuC>4q&5t&A3vuKArul%f&AEF7d<#AB=3yRU1t0SkemVXC3=^ee diff --git a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs index 3749f6d1..5c8e25a8 100644 --- a/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/InfoQuery/JointQuery.aspx.cs @@ -294,8 +294,9 @@ 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; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 0cc563eb..1232d844 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -444,26 +444,30 @@ namespace FineUIPro.Web.HJGL.WeldingManage var q = from x in db.View_HJGL_WeldJoint where x.PipelineId == pipelineid select x; if (q != null && q.Count() > 0) { - var proSum = (from x in q + var proSumModel= (from x in q where x.JointAttribute == "预制口" group x by x.PipelineId into g select new { SizeSum = g.Sum(x => x.Size) - }).FirstOrDefault().SizeSum; - var FieldSum = (from x in q + }).FirstOrDefault(); + var proSum= (proSumModel !=null) ? proSumModel.SizeSum : 0; + var FieldSumModel = (from x in q where x.JointAttribute == "安装口" group x by x.PipelineId into g select new { SizeSum = g.Sum(x => x.Size) - }).FirstOrDefault().SizeSum; - var AllSum = (from x in q + }).FirstOrDefault(); + var FieldSum= (FieldSumModel != null) ? FieldSumModel.SizeSum : 0; + var AllSumModel = (from x in q group x by x.PipelineId into g select new { SizeSum = g.Sum(x => x.Size) - }).FirstOrDefault().SizeSum; + }).FirstOrDefault(); + var AllSum = (AllSumModel != null) ? AllSumModel.SizeSum : 0; + proSum = (proSum != null) ? proSum : 0; FieldSum = (FieldSum != null) ? FieldSum : 0; ShopSumSize = proSum.ToString(); diff --git a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.cs index d4225329..2438289f 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/BiddingManagement/BidDocumentsReviewEdit.aspx.cs @@ -112,7 +112,7 @@ namespace FineUIPro.Web.PHTGL.BiddingManagement } } } - + #region 数据绑定 /// /// 数据绑定 diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx index b215cd61..96f6cfae 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx @@ -61,6 +61,8 @@ + diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs index 8eacdc53..a2faacc1 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.cs @@ -36,7 +36,7 @@ namespace FineUIPro.Web.PHTGL.Filing if (!IsPostBack) { ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); - // btnNew.OnClientClick = Window1.GetShowReference("ContractFormationEdit.aspx", "基本信息") + "return false;"; + btnNew.OnClientClick = Window1.GetShowReference("BidDocumentsStandingBookEdit.aspx", "基本信息") + "return false;"; BLL.DepartService.InitDepartDropDownList(this.drpDepartId, false); GetButtonPower(); @@ -62,7 +62,63 @@ namespace FineUIPro.Web.PHTGL.Filing /// private void BindGrid() { - + string strSql = @"select + BidBook.BidDocumentsStandingBookId + ,ActPlan.EPCCode + ,Project.ShortName + ,Project.ProjectCode + ,(case IsOnLine + when '1' then '线上' + when '0'then '线下' end )as IsOnLine + ,BidDoc.BidType + ,ActPlan.ActionPlanCode + ,BidDoc.BidDocumentsCode + ,ActPlan.BidProject + ,BidBook.ShortListApprovalCode + ,BidBook.ProposedInviter + ,BidDoc.Bidding_SendTime + ,BidDoc.Bidding_StartTime + ,BidBook.ApprovePersonFormCode + ,BidBook.BidWinner + ,SetSub.SetSubReviewCode + from PHTGL_BidDocumentsStandingBook as BidBook + left join PHTGL_SetSubReview as SetSub on SetSub.SetSubReviewCode=BidBook.SetSubReviewCode + left join PHTGL_BidApproveUserReview as BidUser on BidUser.ApproveUserReviewID =SetSub.ApproveUserReviewID + left join PHTGL_BidDocumentsReview as BidDoc on BidDoc.BidDocumentsReviewId= BidUser.BidDocumentsReviewId + left join PHTGL_ActionPlanFormation as ActPlan on ActPlan.ActionPlanID =BidDoc.ActionPlanID + left join Base_Project as Project on Project.ProjectId=ActPlan.ProjectID where 1=1 "; + + List listStr = new List(); + + if (!(this.CurrUser.PersonId == Const.sysglyId || this.CurrUser.PersonId == Const.hfnbdId)) + { + strSql += " and ActPlan.ProjectId =@ProjectId"; + + listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); + } + if (!string.IsNullOrEmpty(drpDepartId.SelectedValue) ) + { + + + } + if (!string.IsNullOrEmpty(txtProjectCode.Text)) + { + + } + if (!string.IsNullOrEmpty(txtShortName.Text)) + { + + } + if (!string.IsNullOrEmpty(txtContractNum.Text)) + { + + } + if (!string.IsNullOrEmpty(txtContractName.Text)) + { + + } + + } #endregion @@ -257,7 +313,7 @@ namespace FineUIPro.Web.PHTGL.Filing { if (buttonList.Contains(Const.BtnAdd)) { - //btnNew.Hidden = false; + btnNew.Hidden = false; } if (buttonList.Contains(Const.BtnModify)) { diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs index 242b407b..cf9270dd 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBook.aspx.designer.cs @@ -131,6 +131,15 @@ namespace FineUIPro.Web.PHTGL.Filing /// protected global::FineUIPro.Button Button1; + /// + /// btnNew 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnNew; + /// /// btnOut 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx index be39f9dd..9906e505 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/BidDocumentsStandingBookEdit.aspx @@ -5,7 +5,7 @@ - + @@ -15,109 +15,97 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - +