From 2d50250b72fb70d13e9da3dbe9e5a6e1c16a5def Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 6 Nov 2023 10:20:36 +0800 Subject: [PATCH] 2023-11-06 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 265216 -> 265216 bytes .../HJGL/WeldingManage/WeldJointList.aspx.cs | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 801c4d5de45dc8e6dd94442ea011224700b588c2..12d33752132c24fc031836cc38cb65b44926d573 100644 GIT binary patch delta 2785 zcmeI!TWr%+90%~8^Y37c|F*8XP{v9gO}bQfS3a04bz(arA0WehrLyYAX@ z2|g^w(Vs~nDj`J|H6}(%Rv&zrJP}R62ct&fgC-g^KKQWdW?=PuYG;}S5_sUj#Q*Z? zIsN_5`S*9u|M&lA?n^57CDlw#&PIho!C@sB45CpmNQ7)i2DLw-;2QJrq1d9|liO9_ zvSI}13u%mxu?w`w+vIg(6yO3uN{G)Vo8*qQA}|Qzh#{ujRJ8#;F+?2c=*tiVu@Dd9 zG8s?`BANSPahRQW(JJp3!6ckS6O@p$7!Y}E!MOt18XhCgslt67+Wd&P0sSgUD9B?Q zz4Jxfe9?OMahGU{T;ggTF}SYCOXRwGh=nUbEIJjxnP!Y!UP^ezdbDEcX&_doK`XW+ zwCaDhAlmq#C2qnX@l%hoL|IAgNg5WUjF|3^`pz@Y+Q9WV8)JoJk3SeKmLjezZmFk6 zNlWpc$A&6J+^p3Tv=HZh*!aXZWs$s~#T2@lgPqji8Y z{9OzlLw_9Tx8zQ_2pzGjh=)@2+fu$@vM4GkBFd8(IW$x3JS}S47A@EJ=jrgEUWTP74fa=dOf}w@HgIhM-&{U-f~vb{HWI36JTnp9^I{a zI0>h~3d8U+oCX`%!2u)Sgi#oSahQNfm;x8L z;fYt~MT_pCwUhOK?cf&tXKTl&<-XlYU;8@WUL_58zeeWVo3y|CL*Jq3wQo$n+43o; zcaAjp8*QI3U!RIPj+z5z4WDOc9di!GeRN~6j||6D{<-72bpc;4?_#sroX_QB2uq+k zM``@=)_1?Ydgj2&$M1``l7fQvIy1+sUc7emEvEhfV?}?t-ejn-=*vyzmHJ9k<$&I_ z%~)1uvRJka7)+u6<``34mYin}=R3^`#fIx6ZZ=!M`ICMQYyo8nzsI}>-s35O6dnJS zT`=%jgLK9F+4nrv+g`|(fy}R@AK2V&iAM+cPtppT{YHu-!yRkD`m;0>PxH59ydQig zIRfs#BqY5gaWZ&Lc-^nEbgy{>mjkcglTJuf|3{a%iz_Fn?8_Ff`$tI|*c+5?$bSO^ CXZ&6O delta 2030 zcmcJPZA@EL7{`0gy@k@Xw3L@Fz!+uNHP~W#+sdomGEp&#anq1U;#$Z)IFO=k-56W1 z+p;BYW?RqPU1AosD2boUXrv#v89o?;Li}LN5~DF@y6g=NxFHVwKb0%R@WCZ|lV6{6 zp8Gt#=lq}N9Ob-KId47P;xOrSIt~_>mX=_247>q~fF0P9dCn0Q=l$kO-Iqp8SJ}gG z>Re)o53zT}9PczCaj6VGvLeq?DZ-Ls9)x2rMdDc}m~4N{h!KTo&qmBEfF9(6EU*dG z09wp_EpXY={Qj9hNzAewpuMMWn}Ieb>%zQh+2?_EgU!IY?9*avF|PylpaE*eW1T)%2xv`rqUJM*zaigqX z!#$Q8X3QlbmYoJ_PugYrD9l=>%*+N4>9yj`Rn`g)mzD~vub1_UNO??z%Q0*0WlxDn zFbnEogwiTS*D9(2Vm|8~V| z9g;*9A1m9zOe8jKf*vZtNO&X5RMe4H)Nw*w41OXm?0#B&TG5vDZ@Mfes`)>Cyo=#F z(?K?-qY-(h3!du#*MCo^0N(Zj!pMciQVf*orW|0GK)l?r=% zMpkmDNjMTp@xOOjymXd@#9V2N4T#8wP7~eR+6gDY^>p>MCFdJEnfT1^7UAZTi6$N| zp4HPGS10D%53v0rQgR~EE~99P4mr`0m3YA*2A@BbJhf|(t**jLS9p^3E?E*memFWF zWjvAO;YBv$e>qFtKFPb!eav%(chacNn7JV}T+WZO(K61*EBIwbt*ZuhOReg!3#?f6 zej%AsPA9+0;!!`#6WgMXdg`z*T7Bi#-rCxL&$q|p?Fj}v^?_i$C+KUa_w>}&Z0V^B zdiOL0dXl%IpR?>ocJ6Absr3nSeS>wCw&@DB>bs_J$BH~>bG*SNCgkal(<1myuV(3b~Be#Ws}kmO#SgA-mZqOOa9ccZ=@mf=+_cg z+rHzWROp&?+9JOC@HsI(Rjh{okjheT-jkwCO?)dUDdjgwVd^sjtXmDe#oVethnrGo Lf0z2C4`kDy`yb(C diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 10b5c993..7486a93c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -426,20 +426,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage select new { SizeSum = g.Sum(x => x.Size) - }).FirstOrDefault().SizeSum; + }).FirstOrDefault()?.SizeSum; var FieldSum = (from x in q where x.JointAttribute == "安装口" group x by x.UnitWorkId into g select new { SizeSum = g.Sum(x => x.Size) - }).FirstOrDefault().SizeSum; + }).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; + }).FirstOrDefault()?.SizeSum; proSum = (proSum != null) ? proSum : 0; FieldSum = (FieldSum != null) ? FieldSum : 0; ShopSumSize = proSum.ToString() ;