From 6488cc6981721d9186a37a6b7bfd7ef5d7d1477e Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 30 Jun 2023 10:47:07 +0800 Subject: [PATCH] 2023-06-30 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 253440 -> 253952 bytes .../HJGL/WeldingManage/WeldJointList.aspx | 11 ++++- .../HJGL/WeldingManage/WeldJointList.aspx.cs | 15 ++++++ .../WeldJointList.aspx.designer.cs | 45 ++++++++++++++---- 4 files changed, 60 insertions(+), 11 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index c2c0eec08dd8cb3a9103a661c320dbf0a8bb102e..ae886eaac53a58bcd7a40f14a88877af1d37bf6e 100644 GIT binary patch delta 3073 zcmeI!X>e0j6u|Mkmmn#;G-;bI&`{b^+R#!-N|%(Xpp9BBg`jcACA8FCs|2iTqky1B zCAlbd0ku{XTxrm{pjL|rSZzf?QQY+t=m)1?7{}uOrm2LXIKv0WafUbZOK#75@8sNf z?wj7gCUc<6yuzc6(&=>R$V4P3uU!eNGnEk{M;)Kw*}G-UAM1B36U9QcS2J*d83#B- zk~vTK_3d>Dv49K?;7?eHB_bK7*!ko59*v~f-|~8+GMG%>Bkw&R<`|1YO$JLr>>@kg z1K8l38&{QM^*>iNa-~n>roXew%p9^(`RhYfrZARO%5!pB#@JX^DPtpLEUrQslSlOa zkgsUiD%&)*L+jR?qVvv+Wr{wmesiBDA4t|A!NlHSF7;>Fge9$1Y*rn@pXN1Y9CAyV zN0Sd&mM_a0>_mDnY^yPjjf+M6wxH5c-l~L}d~zxZQwit0HQDO4xa)*JzfV(RfrAMP zg5l&EqwLyHOifV4qU1W0l1p$x+zHX2?9udxWk{KAQsna;>bNX)L=^#jWPkd0#iYn5 zVU67uJz2ybF0p@Ht#Ip^d6w5`i#sj)vpkwCW@yO`&U}2ZBcq#aIY-ErQme`7XUAvi zsx^paYfrQvGNU}mW*5z=t-_M+GRk)%7G#-E>l5yrC1PupE9`I&)^=D|9K&_RIashP z?O?WiyRcd9M<{A?Pqga}l>$?jhwa<)DoX0h>U|Yu#ih>DseCjx6#M2klovOaG&o(Z z%6XN(dS~QUdx~;&7nd8v#woUzeXNR67!3_3B*F{}l8}rPSdoe}q$2}kFcz7xVH~nB z9@)r2E+!xk6OoSs*cDxiZW4n+6k#%oaXhBL0Vhf@6{RRcIV#{nC8nVYC*VY!gz1=p zlW_{F;l`;r4X2|GqKFSiAq*cFVQ!@3uQKFiBP03e}c7`Ki0G7)!7ecViir;~w0L`w+zacmNM# z1wsfzU?m>H!&rq@Jc38@7#_!Jticm_Qoh(vF=)fnXvZ^Hi)Zm1)?q!K#|wB7FX3gp zf(__E1RL=xUPC8d#~XMPZ($SO#yfZyUGl|#kHP!s#%6qgE%*>yu?^et5qj`3K0z<~ z@F{lSGklJn*o80fC3fR0e2qQ$2H)a4e4ok35BL#3;b;7Uy$JcNVa=fZ#!$YSW1{b- z`&h^RHyxAvv5?Olc36hnEcA-%=}V)Vg<*DE5x*;_gl*NP=w>*ZL~;qpolJDUCi-d< zBZ)J9Pik|k!s#tsTle5o delta 2023 zcmeH|OH30%7{_;}tt_|&q=105yedki+S(!%@o~U}fJ#jo---pr_j`RmATco>dXSC> zt{7tCQ8vbl2NF1FG_fRx#G8qUujoa&kO=tyw%t-*CVF<0UuWjqZ?-e@|9`vPgIV3r zv+f7e%Oy!#0*bUga~tb9*A(SjS%nzkrE+liXaD1OtVCSmZ^Ur1N2sQLW)*$rrGZS$ zn4FrL%0`<5mVyb4^U$KvuSJP|7TPL6`4c^1TURLtWuOAkBq!QRK(h)GE%m=LNm_+* zHE@H~U=8p9FIWqFzz=G`I#3JhKmgQ(^`HT402{$3Nn(=tm9e{PCq}!#ZmbOd1?RwdZ~6N&28RG+ULl2Rmfs&{5JE8TDH5#a=Pyd@CF8DScCPoMvr&*(;_WMe2sD^$p`bT_(KH^#8|? z8GQ>_1k%7qpt1b-ELza06e8J3jIXsIrj*VJ7Dl43m(FmFueQ$b>2$aI+H2kZ8n4G4 z@OG?o*K~%DbR6ys_yWFm?Yqmy9{PE-ym0~XSH7O@(3Nn(J+0roA76!rf=^iAXYd7( zN57+`B}P}5idbN?$gYgLWu_12xTP{EhB>|@D}oC7sw}Z5{TLJ0uZsQEmIm^BnSG(v z(FzOk#cG-FR5i5$)<}vQi?3{Xgxo^qYfo96P#qATL;QqEW;ka)lhn^=67i%ZPs`l= zW656$C%hro9ard?E5t@03vcsNVQ< @@ -95,10 +99,13 @@ - - + + + + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 37562ac5..6ed9864d 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -26,6 +26,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// 安装口总达因 /// public static string FieldSumSize = "0"; + + /// + /// 预制口总数量 + /// + public static string ShopSum = "0"; + /// + /// 安装口总数量 + /// + public static string FieldSum = "0"; protected void Page_Load(object sender, EventArgs e) { @@ -253,6 +262,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage } this.lbShopSize.Text = ShopSumSize; this.lbFiledSize.Text = FieldSumSize; + this.lbShopSum.Text = ShopSum; + this.lbFiledSum.Text = FieldSum; } } @@ -462,6 +473,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage where x.JointAttribute == "安装口" select x ).Count(); + ShopSum = ShopNum.ToString(); + FieldSum = FieldSum.ToString(); AllNum = ShopNum + FieldNum; if (AllNum > 0) @@ -543,6 +556,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage where x.JointAttribute == "安装口" select x ).Count(); + ShopSum = ShopNum.ToString(); + FieldSum = FieldSum.ToString(); AllNum = ShopNum + FieldNum; if (AllNum > 0) diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs index 933cb925..85574aad 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.designer.cs @@ -221,15 +221,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.Label lbSinglePreRate; - /// - /// lbSinglePreRateByWeldJoint 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label lbSinglePreRateByWeldJoint; - /// /// lbShopSize 控件。 /// @@ -248,6 +239,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.Label lbFiledSize; + /// + /// Label2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label2; + + /// + /// lbSinglePreRateByWeldJoint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbSinglePreRateByWeldJoint; + + /// + /// lbShopSum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbShopSum; + + /// + /// lbFiledSum 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbFiledSum; + /// /// Grid1 控件。 ///