From cc22d0e0aefb179be11219b843dc80235d5876b2 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Mon, 25 Nov 2024 19:09:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=90=E6=96=99=E7=AE=A1=E7=90=86=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 65024 -> 66048 bytes SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx | 8 ++++---- SGGL/FineUIPro.Web/CLGL/InputMaster.aspx | 8 ++++++-- SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs | 14 +++++++++++++- .../File/Fastreport/组件打印.frx | 8 ++++---- .../HJGL/PreDesign/PrePipeline.aspx.cs | 3 +++ 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index 0df3bca815196f37d13cc8e63de2c350df2017dc..2874464fa5ff0a1b4a3ae08944c9750828fb03a1 100644 GIT binary patch delta 1484 zcmchX&rcIU6vsQ;E&UCpEm(dC1s5bhp@kM`qOeLus30_$AmD)#QKL~4Qk059V@SMk zVV{41G{$f=?8Rf%iw6@9a?t3(gV7@%BoQOvcfclvm|%=L$!F)inRzd7zB99l@7lzy z__$kOB9#fH*7u9zcz)YkR-(~pQWO`aSeVv?R|Wz878=dxNLC-5tkd|Q*@%gye<=!BJ2N>oCX$JF9lSwX`5QNH&PB z2Fx@9KL~&(&UJ$FdC4dh@gCJ^7{dgbds4<- zU&Z5c!jpW#=x8(=40xIwqb(kPAbQ>tZ1y*K8d@#{gJUhe(XoJ^uDbh`ffS|OvQjQn zVz`Pb1(zz9CzxVyw=(|9_zU7y^3Aa>ny~j;v^;<2a0ji~`whB`A&NQXmLysHw>4JB zScoR7w^##B)XeDkJMgOO9=)K{g)Cfpe&f@{Q><=Byx#T8y~p za-@p)Ort)H%>1qT%eFP9Wp{!4X5b>D#9)f#L7C*C>$EzQtHlwLcKD9|>@xq+Y1Dhe z@vOZkk{p$3{L?w=yJAY zyx@WTJb2SITuBUj@!)~z#RE5w-n@8IV&r15^*>0Vnixs+;3U7!%(uhr^xs`l55&|~ z!SmAw)=2dRr#U|J==0N#cdT9zgcQviZnGZRG`uyrG0&pWQmNZ~6qCX;_&_re6P?XA zjQHgm^kyi5GLXOv8CVi*-E-EmY4CY4*<`eXPu!TlXG7wmt%EqFW&Q%?eIURY~D^ecWPo%16d@I+|pwU zk1HpDuR(7lMU!mgD3+;8l$YY`n*3rPtI{Q+<_ejGO6+@44TCxYHY>sZj+9PkIc zqiu;+Z@}Nu-qF_D;twX;X{9zw(U^7krCs zwR6f&Q~gg?dzHUAu5&vFy*f6@bY*1CkRC2fClrcL9wg;nm458wD@Jo4hAA>_)n}Hq Rp7e%9k!7Tm*<$Ih;&<0DqaFYN diff --git a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx index cf9dfd03..bde8c373 100644 --- a/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InPlanMasterEdit.aspx @@ -54,10 +54,10 @@ - + diff --git a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx index f6ec52fc..6c2ec783 100644 --- a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx +++ b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx @@ -22,6 +22,10 @@ .f-grid-row.red { background-color: darkgoldenrod; } + .f-grid-row-summary .f-grid-cell-inner { + font-weight: bold; + color: red; + } @@ -40,7 +44,7 @@ ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id" SortDirection="DESC" OnSort="Grid1_Sort" EnableColumnLines="true" EnableCheckBoxSelect="True" AllowPaging="true" IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" - EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" OnRowCommand="Grid1_RowCommand"> + EnableRowDoubleClickEvent="true" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick" OnRowCommand="Grid1_RowCommand"> @@ -128,7 +132,7 @@ runat="server" BoxFlex="1" DataKeyNames="Id" AllowCellEditing="true" ClicksToEdit="2" DataIDField="Id" AllowSorting="true" SortField="Id" SortDirection="DESC" EnableColumnLines="true" - AllowPaging="true" IsDatabasePaging="true" PageSize="10000"> + AllowPaging="true" IsDatabasePaging="true" PageSize="10000" EnableSummary="true" SummaryPosition="Bottom"> diff --git a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs index 2d8fd973..c4849863 100644 --- a/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs +++ b/SGGL/FineUIPro.Web/CLGL/InputMaster.aspx.cs @@ -10,6 +10,7 @@ using System.Text; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using Newtonsoft.Json.Linq; namespace FineUIPro.Web.CLGL { @@ -73,16 +74,27 @@ namespace FineUIPro.Web.CLGL var tb = BLL.TwInputdetailService.GetListData(table, Grid2); Grid2.DataSource = tb; Grid2.DataBind(); + var planNumTotal = 0m; + var actNumTotal = 0m; for (int i = 0; i < Grid2.Rows.Count; i++) { var model = Grid2.Rows[i].DataItem as Model.Tw_InOutDetailOutput; + planNumTotal += (model.PlanNum ??0m ); + actNumTotal += (model.ActNum ??0m ); if (model.ActNum != model.PlanNum) { Grid2.Rows[i].RowCssClass = "red"; } } - } + JObject summary = new JObject(); + //summary.Add("Major", "全部合计"); + summary.Add("PlanNum", planNumTotal.ToString("F2")); + summary.Add("ActNum", actNumTotal.ToString("F2")); + + + Grid2.SummaryData = summary; + } #endregion #region GV 数据操作 diff --git a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx index 9873fb20..5777f8af 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/组件打印.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -99,7 +99,7 @@ namespace FastReport } - + @@ -149,7 +149,7 @@ namespace FastReport - + @@ -163,7 +163,7 @@ namespace FastReport - + diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs index 02e810cc..f401d8ea 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PrePipeline.aspx.cs @@ -241,7 +241,9 @@ namespace FineUIPro.Web.HJGL.PreDesign /// 数据绑定 /// private void BindGrid() + { + if (tvControlItem.SelectedNode==null) return; string strSql = @" SELECT distinct com.PipelineComponentId,com.PipelineComponentCode,com.BoxNumber,com.Remark, com.PipelineId, punit.UnitName AS PreUnit,aunit.UnitName AS AssembleUnit,com.IsPrint, com.QRCode,com.State,com.ProductionState,pipe.PlanStartDate,pipe.FlowingSection,com.DrawingName,com.ReceiveDate, @@ -255,6 +257,7 @@ namespace FineUIPro.Web.HJGL.PreDesign WHERE 1=1 "; List listStr = new List(); + if (tvControlItem.SelectedNode.CommandName.Split('|').Length == 2) { strSql += " and pipe.UnitWorkId =@UnitWorkId";