From 80ad2474a5ae850308d9c7b4398471f029922d50 Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Sun, 26 May 2024 11:28:05 +0800 Subject: [PATCH] 111 --- HJGL/.vs/HJGL/v17/.suo | Bin 900608 -> 895488 bytes .../PMI/PMIDelegationReport.aspx | 4 +- .../PMI/PMIDelegationReport.aspx.cs | 14 +- .../WeldingProcess/PMI/PMISelectList.aspx | 158 +++++++++--------- .../WeldingProcess/PMI/PMISelectList.aspx.cs | 116 +++++++++++-- .../PMI/PMISelectList.aspx.designer.cs | 31 +++- 6 files changed, 218 insertions(+), 105 deletions(-) diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 74875553d99e0e29762ff120018ac2467e15565f..0d69d40670fb68ca99ebd9958cf338aee3f4df07 100644 GIT binary patch delta 14318 zcmd^m4O~@Ky7yUYf1JJdIUphuAtBO<2#E-lxMp}HBlBxW%ghj!khC!(#E<+uqLEV$ zA=}PlMutb*nL0*d?8dxy{HWJ4bBvrahhfNDR!;RgUTexRx&L**GC%G(O>^)3-goo+ zpJ%PL*Y|qX^E~TW8{er+-+|2Pez%--I2>`n>9)2u5QhXr0~3I6fc3y0;9g)W@bADj zAP8&+b^yy?TJRYQa}4=K+>3|UdggHW9x!L|S?uM8FS(1c4JMN>%R~L4$BP1@F&Q)r zco^sobOIuP&cMCg;phhH2AY75qHXgLHh?DqbCMjFdJ_UZU_1)U08Ij}2Ce~Gkd^{E z0aR3A*2^*TzeS)Q68{az0WJq30UhJc104no0rmr#KswT=g36%%K?A^Q;PMvk~qKJSKi`LBIvv4-5t70ha;y zBJ&i`cTnM6&_%%OfCnI;hCdKCYtG9TT;du{^K3vK(ZSn5H+0N|SX(b3IxK^lsd9|x z%;Gwc&;*E1h=OMpH&sQylDo}E4HsP5yHVYbS=p{A_miz`2`W3YvZA9G zTiMVGBk#E@E6SX^vI~*#`<1=nhbt=zT++%me5j6>bSD+h#2B02z3D^XP zcbhvX!Y{49h6N%x`3yCYJYVy;hU~OPmO2+XICxe(3lOdV{?&(J9b(+{y`0jJ67#MY z6T-<2$#Dl={^hKkXSiwlayF0cu)kc+T+AQNPVjU$eHG4z(akfo3u}Z(r zP)S8BGk5WHvwUHmHX3rl0O;+5&gA)5BddW;D4q&H@YQ?R*p&zu0|S7^fiA#tr0)Y= z3oHSi07QNP7i#=J9r4r-x)&6$+Qc$F)sdFiktWjd@V0N4uIl1lgVg5$3)qKNo(KIc z=nJ5~0z_8PN)*Byfd@O%eg^s+dT;KIPE|r(F~5oKmUkzTMeI$`M?12LxF6v}Z~}sD zKkrEI*+GBNLB%`q+;>*oEV?XVzDPWR#E&{&aJ2g|!k+-20!M*~=<|PoioD|a3gHtS z@#CNllqp7@uMxyPbT|=aNc$FH(LovEQwX01{sR0FkdU^U-O?bXe=C{3WUxW%K}P&j zHLoErv%bfs9Udk>3zjyMcc#i>s?E_mi=s-AG8HHTmH-a}=Kh^AwEP5f8}ksG5BS2& zdC4ga$zu+>=2xIC(TAUM^{1guRC%%053Q+qk7wz6{YSCELNxJrvcX#@BG^Do))_XK z+|kp2X*O8ka+uPVvGS`fEN0P`#WAlT@bADjK#V2`x*ag(S5KL%{2ofLa`kN}xIdr- z4)9HrayWT2jhKcp<(A@4U|XZE0S{d7ZZ9j!3()=qR_hj_u^n${W)HR)tOr4oJeaB1 zt1z1+b5?Six%QgTfq6VIng@!xb&&Bur6yREk~LN*-*ZOD&fx~@X2Vkh9C zRVDl?I#$l&Y;PnBGBfdMPlKnXS*r1+kf$?`HoY;u)eR^R$IQ-A*O>`X-N;9pMz=x}qW4R8zgxx3% zyw``l9y4@1xuaRS9V}41EU;0f9bP@2_Gj|JG^s{8NZwhBmwcw;3pC29VytIBe?leb zTWBY07*Q6&FLuN!HG;+6(FLh*qs6YE(ZFRu3~)IR3v>hGfGdD_pgWKN^Z*ipD*+F1 z6_5lZ17>a6Bu@dxd@~{gfm~n^a2qfQ7!2eAX7bdce!J11iHH;f_W_fEQs92z=fD); zA>izB%|v`EVD6q87dOA-<=hVX1ZXv|00?ZA1DknZH;?RuC02m{i{{1y5zLINPK*8$ z!Lw`biYx;pb5wOfLT?1G1JZ#Epaofbfo1`H0P{d~QOwT}7zx}Ci~#Ng?gq@frBUf) z5Eu*O0|mf%U>q<3C;|!vFi(>}rvc`&rQV*?5tsqY0v-nD0zRM;5Ivm-S^+Fz4*DQd zpGrZe9$8bMHazymbaqJ`aAv&!uW&%O|Aqq^+J3`~AEPPV-)l;+(Yw4RSkCgzX~8zN zH-ux8Y|h$VY5MMqYlu7ap|p&}54bV6>ep}f$++=`ZNopfW$oJ=)t%3;A2j+QJ}Ite z*Sl-$x`TVZ0Y49%-1tl)A~yUMP#vbis;2OIuy&?G(4Ma>^1_m zU@}98(Hv3b_YZB4WtW@jTvmKY%r)B{96&KXIfho`uw>%PT*>Cz($Ta7vCDEClN}|F zA{?;G5Guk!`WlqEmaflXSJJj#EC(HkCF^}T{H&fQi7sfC!MH!bcG192kg+EM%*|*= zqvAEavwXDw2HhK&%{HAbXS|o&oZj}BUlXrNy|zzNe9YpEThWZOS7?C29tdezGRAT@ zc`A66Y3({h-bF?{jUQ}imo!!hV>SO=(@jcq+||(brvc1t%8jM!{w$;Od1IuWIqdex z(By=MKhbfg<2IaPZA^Qc#M=DJpckrgutGkBZ0{VX4=WJHOy46u_)lhF#;_~&k=RRO*DOwOIBo)cy9eH( z%$a(qWh6_CEOz{U!k)<=*F5{l(LNoDH18HxZ>2N7X-)!Tr1950 zY5jPsH<-5OE;*43Ggy2(H(R|J`-gZ~^is7$@}RRB_EPvU><4>~^!}`8 zkCRuf@6$Z|(b~7R47uxQse5MhAG-FhEBI}viFsGO`r5Xq>U`kI93~i4uu9&AdGcl} zm%071EZ84AaU$GBY48h9bv*fEZf@I%8~RS&apNEUIR4pRe6A#x+%@N!oj)rseCzen zsltx`ZvBLfF=3$H7Rwm3?!X2G19yJ#qAYtBgExA3IlD?&u;U=3u0)+z0oMW(!6!vX z+llah0)uG4b?inua259~t=Ig^82ko}5R}<{*$!rUA6h^QGT3}G_>i||me&jdzSkd$ zh+VBaM#D?BB&a*S!H86BXpSNef^2z(pPWgYkB@vG`v+FYLavxjb^5-j9DM>OM!hAXzV>l`?zJ`8A$ZL3bwBaxiAMv>1 z5LWzaYuah|2RWG5|S`pPZT0fNbs%+BIdYQ7E%#-py zIw>Y{V8;?QBmM`VH{u_3yc6$B9cJYdDav9bJI$A$7(&)amUHn=6FS|C)~#Vt6thio zn`{3PF0^4ppELbFL&YG@=wlH+lP;)W|ACkS%iLZw%=Fa6QFe?LZ)QwOh*@-H|BRMn zS#v))bkpv}fv?|dEq=IZg!Ot01utWTc494SVN}>`O#fdNy#AH!go;Cw<0>beT**$V z1yKF{oaV^~bN>kfQERMY%}o9pZBXkfmO#OU#t*c*wdT?k_diciUbT!^ELB^!y_`h}Il+VYl7KRD0lFw$(+x z%?70CP!`*fxQA{1m)KyTj@h1C@I96&(N1h(Ez-HWF06gmwNFbev5%lr_P<~x+ABX~ zh0exi=Ha&I3)ZYeErKF?4fz&=J_5W4P*frpa_j?@b+Pv*^4`ok0edMUHEcNL?NK7^ zg0ESiv-K6@H4-}D<}F<%9uXDuu@Kh}PL&z_rws<~7xm(3JkoGRZ!sGdOO8rSF;e=(Y0s$7_I+n?{l^HqYOkH{PvN`$ zCXc1BbU9WQHCa8m%gW-imC3nzY=}Yiqop_;thnaSIi;-(efcY%}yJ|n-sQ;STP?<30;jW+h4%%cUk$! zyW~$iT(se~W2f*Vy{ux1)1n+Tidqx3Ji92sYZdB!Ldu|OQ;wsA3GzDfUMnY4!fdJ4 zTE`6<@eGfqV~@#4t+|q9y@KxhP{oAb%Qx9KZR0y7t6JjLF7&QO;%uI|edB0~IIbnx z^Y`)v&X6Fkr3C^0Z!|nZj(_)h1Y07H3H|3>rjgB3`Iu|`BjiLG( zQWEuECdJ!%PfGRNYC!|X(e4@v7bYvgdS7#By>oZ!VeC{h=jmh$E)Pqgx(Yeko^*;Y zS1b$N^*yS1OzYWLJ6o1^DArmeZ5qg9>=?K7iGq!h!0m)6sZ|ji&#Gzr&!yS+oH%Kb zUb6=#)>p#B0;?;6%}UG#RbA|uMqbC{2f;72)#h35c?iu1d_ZF|7V;nGpG2|C(j*-7 zFT_cbl_jY(;zb$DpT?Uc^5qDFF-L0dVr76&MoY5Q8?*qEcX57`&SEitsKH56OJ~7o zRD0L?OeV2vlezob-U=xgW{u(U57|qV?S$o0t8P}L$Ar$xwkKO^maHYHF0Y0gwo${s zk{Syo6x{U;kD`x8K2)rYB05`2 z^!Jnv8h-*qzW~3|@rhC<)m<%bwvT=$MeEicDUvcClPx>=Yk3T_zLwn93E8lsWZ8;P z+&^G#Mu|SjXZzA*pJXK|vK5X@gJiW`+Q!H&iZxv3RsvEp6}MH0aE8n&vR)oRCud7> zcF7{ShFO_-Ux{?Me1%uLi=ER?-sZ9v%aPU?S*5~fIYzWX{!pS3HyJp&7sd4o~HlbEH=&tZGC{*p&h-g|P6ZLE@8GpU~B=*ENcA|~H5EcXsN z_P*@#ACjYlLq*WDadsNQnms5*tqP-PNr|HPW;xnY6<)Jt{C8Im2^YJ1*n#VZ4*}Et z>IpbXW--a0ttpR4RM7{*A~@I8&o0VfwV|W59Wh3!@3@+!{@LtC|5znRiK~qwYRP8t zf0wr;u>4?W$OC^q!{+!*Zedod6diJ2U9z_*lS2|evpIPa3Q zl}Nb-E}eEihp>^$DdB(-?|(tnx`{Kn@XiUk1UT#Y&O0aJD}^%-fiyb2R*mj{8$3&s z@!iTD@WxHV-!P!WF|ETZcl8gva-n&S5I4x72b9JYD_7_^MYdmokY1?VK*6y}9z_%@ z;!7I`{dS^q6Zs01DD!wtY*dXjG31lFr)1oe6JuYT*z@iRiTDI%2$Sjh2}&H@KS3Eq zbBdLW%TKbivzEg%F$n!Eca)0ZbhQ(<%B_ro6O}Juy-?VF%FKkRArHnxcreQ0$(Rg3 zhA1@wwA3-vaic@zDpPJmuD*2pTBI`~JAeIun%!Aa>3+aHwgm&l7Zw)dbKWY!xB zr!t?EMd_!d;dbRNc^0FJhmGDe=2uEM-Ct^i+c4tlnY9Sr@J&;EW|=#ZY93M2{L@kW z;WW9{u6;u;Qmg}tMqZKTU84Aii^hW@+7yryX+KO4s`{l;X6==EyKHO)UsHx3(yR3; z?3R>$^1Bk{jB-ZX(MOb{Vbpu43_s^HcwhZCEC6qlyiTF?C;3k$!~FR$*{%B+l)Its zkYEF3Qr@2p&CXVpoy-ix$I%s4%Dw&>SgtBKb#A5c0XbaAtiF`@gi=c084yn;(-oC+ zA68DX9mq4ku|_PexPP;8|K?@F$LeDg@raT{N8VFmq|8;o;E$kq@DZh-I&kisT%3LR z5~Zia9Q$d))5`7CTCL>jQzuTDcyIZX$y4dNr1hM|=HD{2eDGBA zty6-Q=8PfhOJfxI{@@&LuSs&|htZ~&lw>nv-#~jxp1KSkPE~EpR}(nZtyEMyX^eUZ zcM!v!nKXO@Z1A`nj7Tc&r)qZ5c(s-Z7oP1YP@5Tzh;-%HImPNWCTfhOeYT39*Lj3J zuu$EK{grOS(AFVFq@7Z#!gVl7)vPi#+#2Hy8M{!9J{8+CXSvarHf~fjJEszLS&LL| zR?i!Zt9dobE?BGvB&)>9{rmL(5D$x zbGtL$PET;|SK#yu{%R^MST78|WwHfDt-4HaJ zu7F)1AK^UQ>1-{LrRIlZdgk}GA?>{d$HMYa&Lzz1t7_y^#L<7e6B4)V6$t;5^?H)+ zO?L+MMz1rTQ+1s)of2*^!q3tjFgphgB2%ibAy>gLKd74@Gk9ZY{!2u5}(%pbp&U%62Mz(iuzj>y2D{e7&P}}-cGN-V=aS7nQ`;E&$m-RnsIF3tw(DD* zdCd9(T^KRNl>?QTZTl)UpJILDlr0OrJMPr1W0=OWNh&1d24_&R4&arn$&@or2+dPY z2*WMN6{&FuMAeGb3^DOmk|tYwkaZEV@_sV1W@tf$cn^7$J?gY`9Xz_XYyHUQbH(D@ z8auzQwx$bhTB{~fdW;@!r+?<$FHzJ^HNuV z`@TxH1PbtO8r}_G2yFXQRqZJS+OjZ&pO#2XD8i+jjxY|oec5#Zf!bzYP(@nTyJF2u?N&N zyZ8%j1&#@!PBm%peH_Eo9!9Z~TDUb`m#sLRQ~gaYOzk{9*og&*x%I~>_#aw~y++gX zJ5gW?k0I}iI5THt>H8Eb9)+@XnF_Bp-~ma}KZMKY6JsEbD|)J3nxj`Uwt^O{Q*kMf zf(Y%HAw|(CpUXqOa80wloAsd6>aBAtpmQ^Ld$yfz={sCjs}8p)`f~1sxV4#*e~^Yb z&C^?)6uA*P|5!Lrv4;n>O?t=33iTFt-b_jUCQ)pX-Xc-iOx&p+yVgje{gbhzd1=}! zlC72MUo*4ElxWHuqUG45o3*v=Q#uR1JEBEd)u1QAdhOHa*D-yk5se(HVRIbOu{qWt z$Je@Maf4HEnoFgUa4ph~i7-CFN$L$}B$a%MRZZk5+BjYJ%H-{&r`aW2^%}`6dNGdn zk8@>Gu*Ha`+8P%e6mhzbSvxQd*RO!PU({axGc3V85sWer^lfqB-gUozNHHI(#En#{{_YtLIEcBhDs{tb%^O5{cNsDE z_`Z6bWF5sYvatZs24u#Sx<^>4sdk>ns6T)G2I|d*_CJg{8~-d0hq--STNG=Ip;6*4Bb$PEV$Q_JcI_gyJl$9Vm#QIb zykY}3UT-7P8ilJO;dQn>evwp)sv=jbDRgXsJjgEFXjDnG;3=MER!xkhWp7C%>@}4} zKJynFuy8jU=;CJMP#CRh<2kfHOpB#?%Xze2w%EWDRcvuaQ*{*h)4SWi_p--v2OKi( zvZ{>T%-UVT{Ha%+i;TgP0SDxzFfc2$+DEG+c)Wse&ZR*M(y^Cu&U9`dr#@R^km=CR7% zoB}r(-~jFh2UIW}?)fFgClWP%q=OkW_hG$b5~_`Dk`;;kkuw=CLgu*-K)9#jIwLR2 zU4NN%f0&yJU+0Bp#QZ3GdadzTXUp#{!I8~*R=2xaIc{#Pa79?DVUw(4x7N5JEXPeb zcdPTryZ!=)PCD9Kg9m%C`>ReOLy)|;uyynQ)@L=s5D~Wq;t`*yWCAAs-{CQ&KZsAB zt^-{MDtvHvT!t@=acI4>nWTu9QhGs^jt`Wg_$;@0s z#+_qkUM73Ithp%4W9DVVOXh`$$jFG$)XFtija)O+|K|)tKW)pcSNnhM@3)VyH{Wx6 z&h>lF`JVHPj=E&W)#TFDyT9c)&I+zwzkVHp6Mz}q1N;fc1%SzLr+^J$BiIf+U^l1& zeKyWGODv}%uPJ{$M*e~q9Fv`ed?BF~-|!|vmO6>pHkcJqkHiq(=X?Bh#wlS@B|OKq zM?|tOau#GFC`b5NUzjsbw8jO&vk`%hgFnI@4Q>P7z)pn4LQaN!7SdTRhLwnD%mD=4 zfq--n0#X4hIumjbxF3uGtWGwhXVvWM^SdEm18*UZhkaq}-MMf_qnYfTTwnMI$omlX z24oDFN4OGif&zH5089KJ&>esb3`Ucc9$vdD+y#rdNDBYGK5qog}+)j3OEnM$4RWz>&|cE+b1x`jY$sTwL`!FSX?9~=Ob`ugTH~}&M|tB`BAu7>?BBM zZqJC4YB)}VQ{XeeqvX#azW`r?Ghha4*Bw#>6Tl_V3|K}NAvwG=6KO8{!VGW|)&lsi z01@u1kk`OJz^6b!*zdWi&RJjHRuLO^l$5Z{TH9ksg8#@kv9b8MabgwxH;$7LZDd*g zUm2$k7$@sdQ`v}^ikPB-MD2!Y*9}V{^yu0{vCcKm4o8$TW{FjK7@?y9eXrgS`NUAarEVKvFlCZ;<>ThQ{39P>`z97%ym}xcz$Oe_3Vf5PYhr3>US>Z z+LT?lZFnHMfmMQy5PLeIJ!3NH^@mXhGK%yKZVCRMzbBEHHgympjDASk2E@}Dh2*w{ zQY#7#7>!xpZ4z)MJ<~cOfVPWP*DE%Qz46KA+ne^Hy%iJ1Aou0v`1R zJ_VW2^68{ZZ%udLEvt2g&-1KLz64p?nqcMSD4KmzPOca+MU$v~6tPpgA8}9zTv{7K zDicWrA@9-Svq_hPS{b`Lr~@B>qu@hO4?Y6Nz{h~in@=Fy(c>M2P7BK?xr=$%Mak;4 zE{VB?KFC`z+J1x<#t~aZY+N`|hNGG)@aayEOlO8*Gu;NOLiMT*M=u66+-Y zQ|+>6-`3U8<@~G4w0F5(pEj1C`gD6%W!9y6@9M9n&bV>>a?!`hz=2(R9wJ7odOvJ zDA)x5n}8m6k+70&aAhELJLC?)YUhDGgxcl9y$|j^;7d>i_Jg-UFT|CAgK!@Lhd~Ws zEs8@AKZ&^a;I9KG!9B>Y0Yi8c?hnC707<)CKL*FgpaFaW8o_bU+BK(mI){>2X%@oT z(=C+TAJ_(YN#O4&V=VZJa|Z5>4`s`H>k=P~=zge1C~;=(9Uajd-k!h)5IK<4 z2F|*@xnUn7fR#D~awzzN&+p9K7i?>-&PW7~_C-7bImYMCfhLEhbIf-os z-Jp_iTD_0=uUNlynDM6;uzyye%(WJqdyRPG-0Syi=iX3s*^TX4=2N(l?hUfr!@DcR zvb=1O%~WS@-rO+e*nxSq6EL^OC!OMitM2V$S^X4};G9~2T|SA348d9W(VR`gqex2z zF%QLwS(v-d;Sc3{&txoz0tCzl-Xdxq3TyieJVoGHPz*|d!@}v;+macCdPb2a{kYeR z+;9;c>@jlR^YplEe2RK5D1l|8<%)UxrxAA*?}`@03i04oqdT8>ALZRmywlMEo6xa( z;TKM_$IvtXb(4%~;0gI=4RoL3D>FzxQgWGBIkx)$Jxt~1pnKP(s@y3k|A)g>PKE!T z7gcTq;y15qk-yuia(&@{Cp0$u@2!K+{ySPoVK%;D>9 z$k)Is@H)?ha~d40!5Xj@tOI`mM`!>go!B0gC)UGHQz(g|=Uqf3pR%a-1KIe023WR% zX!L2g&-nbGLw*6y0Sgr8Z;)pJyLVve&%@mtTmat!dVmsZ_!YRm16RTK;2O9NIKgX! z#w=JNGOcbg9-0@_IqwzXOkJ_+uoDU%{koB$chkR5rkQO`ik?<2R*|yUW`38+c`0@f z-D4&Rast#aj&~MzpA$!r84m;?gY(D(1_Wn-TLDJEtQ8Y*#%;59W=mf%JYA5eE9e2n zq3m`D+XMI4Y)x+8?#A7|E25%7e=v|4b3xsh@yt4b%}6E_Aan3Gb0@*w8zh5gSn@9Y z?uL^^1^Fa%vxnJ{8F;PLjvNpFV6YSn0>20MfHZb8w5-AivA1-{Q}jYHX-~#_t5b5= zS2T;Afb>k}Lo!R`F-T^GJPtV-JOP;H!R%3HeN2I5=?i_5x!F_f^A|y~g{lO!nyC)B zM{>hpsXqm~D3iW1nQuqWPhmT6sfYaX1wjiXylV-;>7tTYooRxsXN({Y!iRBmNR1)h zv=SQ|8p|F!<~4Z$UH6U}uTQHJ=MkM)$#ubb{plUSHgn64mgtj7kj|RIrRI@vi~^%s z!1QP4x^l26JWZ$OkP`9~{f3ELI(000v1K;L5Hr8p8ck%~noCX+?@9h0W@SIIu)Ms( zK`7lJa2Ol`)qp8e4de^HjXa9{u%&A@!qb^1F@}0xGo|XeN5!Q?OCtOxt(h1;z>G+* z=AA455u*Dy$^JZztRx*d9yfYd8RzqYk-4jgulzlYi27@I258MDQ6WKq3BVB7TEk)doYt3=UU<%g{ z@sC24x^Z-VfSg3@+LLhd<4X2!efw8c(s`jQq;u<=KU*$+av^z)YVolYC(q z7eTMTgXtCB6Q-hPm1P}0)02d1{fT*S*R+q0yfX0*?QKt>+r3kVO_x0ADK6@`M65pS z_~Pd~z6|gkUn)aejxT@0Uc#m&dxt&F!J&zCxe zfHJTUybA6IPOu348Mpuii^0oa33vr82g|@;!8))~;QDwAcf<1{A#@EJG>PJyq$ zS@1W&#-jB(2Y)m8JNO!W16t#lybS*pVKnXo;rIvm9()VF17>I}4_Lx$@LvaPwH1K^ zh%Ziplz{;lfdw!N)dT_nwH1-zxL~+~KraviLP1*)4LX8wUB5s2(7IXvc zKzGmsuoSmL(yc|r+Ku_r;JX9#0lx!muDuReTwln0K!5LsNW-2bb|VYF4SRY%9Ws;j z3K@^+3BKgzkP|@@OWu~uVkvH4SZ>zEB65|uYJ?~~YCLHO(u%QsFMf`gskxX$bY(fV zK4p0QWnXqIY?04B%)1wpH7w`uC2J9?fxmzXuo|obS?J~UkZ*tu;ICjKScJ~s1i1wq z1k>TKgxm_YgEzr8@D|ts-Ud6tF5m&XK^52o_KNt(whxZ|-~c!T-T_Czd*Cqm1XP21 z(Au;{Zzq;~grH;KW6%IT1rMU$e}g;@{Biqt0`fC(2C&!9`sA00`;vu2eg(;H3Y#I% zfxm;_d}57-O#f&JiZZ~(jm z4uV7AFgOCL!MmUaya#H*``{Fyna`07|I=`N4!!`FSm>(fNK*7=xbDJ`e+zj9d|Vf7_4Eq+0YqEVE$>S+#AW%^CG5sk=_eH&yQ!k!k>g&k@}@@0+;MZ}1ALdjlR zy<&=EJ}D89ybiTt$wjy&AOizXfDx#`1kAt!{6HJv4+20S2m-+%6tKM7`6P3P!`&WO zK?e{4SU8@5>rwyX@rF1{Lv11KIFJZ>fh5oy%<$Q5+g&3_q#jvDYKfYUV+Pv9nsluV zx!Xtr;beysZwpsX@yE%d^~4x6h2L#*PKzlfZ&iE~Vz%MOs^~>S4_R&PGui>*imLB`K0AGhBm!MB3x#&7l(eYWve%viJ7=o6C5Hn zn0c-(Di)rf%295~vEs^%0mMjH&h3Ej@^#kyUwPpZ`qLLa&f*TSddvn=Ps%)Z2_&bb zk`+@t^GR9rbP`kXbn|`0xra|MMWXO9fajmux0UsDC22Hi8sRI0$z8;25K>17Z2AS1 z6!T+gQ-9g4=kF(_0&6mj9!SFVw0crSoQ_!$&Im!I+8I;0Gi?`+0*A?VlY2Jr4&^J) zk|py)%p67 zX(GOh`A^+ZeIMJ-1VT>(565j)>t(C&k7*l*{}x_KzyOtgW#Omq73 zae7=9Uq`fIh~-D{@p}AlzE;x81fDFSWIR8LM!aiG(OskYi6*9EG%<+}*TX0Ar+YDN z)7-r5)v#sIuyuT+v1B${ccX^Qh5vc*0$2#b0>jWQ7bFEvun7Da zybNHma*H8f0ZYI#uoP?tv(Y2VA=eS~Ep;@Ln5Z}4WqTy33h?Ef$JM$9d!VXcfdhV13m^vz%lSHn2Pax53&}#59+`N;3%jEY+g0`WCP@7 zq)z}WoUn_wwzTvc+`OIaAXpccCy^&uSdbnTE36<3%SF1qyO3gj&i4X)N!!Ycm9e~s z{ALZJV|I&u^gcWJJ;FaJ6Vdi!JmYzu6gzis7*73p%++2YW zT2sX@r4Ct4(~mU>(H3p5z|#|FgkU}RjBwUK9g!m1?$HIIG-M?LICY}y`Qnl;$T+!2s2D%XMjhdV#l?7;7 z$aA`+RL&L8^d?hi!Xh!Ga;G?((7n6FRHuy>T^=#`Mrc`;7^mAkqDP{&`-E`)S}(~X zdYf)&8L6{kBcbUJh&J7JQmAQDxnDeLXffKbPy|$oU9@VEch!o8>_>TcbVnde7_AO1 zOTS;tqnUyjrb8PXZL}1L$EW!j+sFg7DOZWtXLgi|C7PHe2GU}K7)kRtqo?ve6SnH- z713X!Cr%l#q{d381@uZV4gS#$;V>x}4dyHBMGwy`X8azJ{czCt9lPe3c-~bmWzvG< zYA~G~V(Q3l&VPIdSiC_BmX0F4KiyR>g;4)c5?A3_Zzt|+gg-|pzfroM2sB}%WTg`~ zN?Ft+N$Ip|qm;JAP8@=3vvkhFejLQw&KO8LZ<7YHuf?33Mr@O^>F>8l?MSY3;hG>) zKri%^L+G>Hr6H~^Ohxjf1{0Qhj_%ql_4K$der7wldk~MMJ>yOr{ylS7N=inrgx<;2-hkSTX)il;dpm=j zgyug!VI;^MH)-6XW2Q`aVsgQ_{3i-%KzlisEWlUhduaAt(T`pJ-bph9^kHc1nIPV8IS<#XD`H@k79jUpOM| zezKS1$39i04Ht2Qz&u_iH3-f}?(ZDcqPOjTuGx5rjAoq^ajRM*RVwSB&i^9OugL0_ zgAq?X(Xu_7BQUG7TGSPPV?4R|n-17#6ShjR$E&HG*v}p5q$s%$smAmzQHH;(dSmIv zD7n)u`YXXeNEz)nfsCS_FIAb&J*3+7MVd58aK&IP>L$nhtWr^XH`#+;@u&W)Eah6P z3GvA+`|=)GITz242ywS^b;1J6h)Jk9wtTjWw@ z57G8ZJasE#7PYCOqK}>X=H76t3}t>QXKn9MyzcV~)0 zzi?A`S#H{?X<$23sa~2c=bPGe^A6Y#f9R9P)sX*fyW}6JXR{RltM|oCJ>?jue|3gF zDN|lVw8;jgY*_?dF$ftkvl&F?QOdhSSh zDWS*(KYV(F{lTxF^o$&NyFiD|HKpt6+44@J<;e<7&r!qZ_Gi^VJ=S43Drg1x?C5aF zP!ETU9d%P5^I+GV7Ddl0mSJ1ZmU+!(fC70_%x5WTgA6wMb6dDi8%pIy!MmGN?B*Vq zlV$Ic8%&zpppbIsjN-n!eH|2?)qNd3r_Elp?YRfW4>lu}X z?J!|?$3$p)bSY`mlLd0tD?}~xN^A9nYX$AKVwov zX$NKA&z78&n9}Q)8dEpf7?p?RC|QrXi1ui8GXHNdvHq`^9DX7PQ|5?f3X-#BWA0LGxqU7J@2Tz znEZOXBaEI{WQGk9VZf33hYi)D)I&CrpjrFn9sZm(yn@`bOYjY#^}om4LJhMF`M)ByftXxk5+%7C6C#LMnT(V z2&U;zVFx?ENAcHVmKy3M?XWCs=L|T7?_+liXaMqh+YnC6zf}9{+2w{6(kexyHH9Xb z+6S3C>QSoFV4y_A%4PfnzsM3uZTA@Cb$dEHQBAZMllA0U!$Duk)vV-e*abI_ z<#DG{Z}>`}z1FB9dgxKZ8TS7oz57`sdo}SRIUW0Wn(jDZz>UILRP75?ZIfG$WdA3^ z4;K=K8i7VkCkh??jLA%2Jt+F?QCAFDvo0DGtr^x?`t!`*Qxs&E|F*$Qvp-dBG_A83 zu4knv>j=%>r=;m=Ba|wlO;UJGRK!&Vo^FaZ#?$gRS=N)LD~Ac)ztnWE>nk~eR-ZEX z)2p$Pzdm=SGF{RF@y=XDcC}Zq_=hVEMr{K^q7_lwtSGL0qe9hGF-5m0Djvyo7`Gd9 zx*B4sEdt}1DH>o~=Il~ZsY5e`<0r!U$UBu)L9}3!0aek(x<-FXN#oitimWYN+MylVif%wz?b(vtP)-u< z0Mg_Cr|6N>6x=`_L}b+=xn*>SR;0)@at>}~;^UNBi8gJM*p1Imb#NBm*7*g>wN5v5 zuU5|L+F8U!;!kueT{_YnM@y$dO>WtvCN0~@qwioxFUPG-cCax@PdTg{5GuzTBY8ct zR>23It%|ChKsQ$@Dz)9Aq|oz^%kld7*~TR%?WE#I+_Ybw{3MQj8OG2)7?Kvkl>pZq93`T5hPq4@YW__VS~Xc@9RBj(K+C|16a zuiR|3qnJV?v^pnVorx2I5~eS?q>K;HP8xZ#n9ew%OrVDwl~|gYqR9G^Qsa0+Gxy2a zdUm*Rh2W|-MCcJNW0RysqCd)dK}S;p)dPaI3bp2S8H-70L7}CpIZ#haG2%;aVw{>m zZR?G3dVUP+m7i#{0cShX#`w5CdAqSp(2_BdRmjeBoQFOm6Nv`9jiL0uKKz|}W`=PS zZY3wkfqL*^<5~3nOr@jVvA^*Iam|-exf)ivG^4MF>RIdUMpcVfMePhS){L?ihvhU- zHmB1S(_o8_jxh%6Bi9>O37V*ywNzDgoxzovZMy7FQ!g3)^~6iYYJ(Q3@>-^f&o$#L zIMhX}M`46tR$^$)N;Q;bf1)aS|6%GjqQxRjS&;>5lci#jIX}b#m5DK7U?-~nEuWzK zt1$KozQ&>(Q>fM(X~t+VP!Alco+D2F@i3bGpjpwe+n^mIR7IPoimuHnS~gy7!mvHf zPL0D%OFPjO3ykTsW|k68ix=Y>yr4>5AZdwao@PoWD=mE~xqZ{xI) zCS22-qqS?0ip8&`#p_HBooQe<<3L(E&yu7&g3S&?OH7@qp`B(m^V)e6PXp_*62x~j z*IHQQmMAm&$^969fe;&SKI;4BfQUeC35K_JfDtNZvz+KclXl1$#ic4f5ayug%N`Su z%`&xCpziloB+50PFw(?}Z1~)26Ew^M6;x$yk;Pvtumn@S7gpw)^=e?*AN|>X=L*$F z=bPNZuNvDy7=Tn7xI@KUoMSnFb3}XNFp6&h9rc29<^>_X4w+Ut*OIQ%$nJ7VOLzJ` zhc##E0!uE@Gz-zzS_thfkPsRYN&cp-wvY<<&=jJllvvatn$rstZrFUw`kzVr{{ZrP BCA$Cs diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx index 7c0a664..59e66d5 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx @@ -31,9 +31,9 @@ LabelAlign="Right" Width="280px"> - + - + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs index 4f4842a..6fc24ce 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs @@ -48,9 +48,9 @@ namespace FineUIPro.Web.WeldingProcess.PMI WorkAreaCode, PipelineCode, PMINum, - (convert(float,PMIBySNum)/NULLIF(convert(float,PMINum),0)*100) as RateBys, + isnull((convert(float,PMIBySNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateBys, PMIBySNum, - (convert(float,PMIByFNum)/NULLIF(convert(float,PMINum),0)*100) as RateByf, + isnull( (convert(float,PMIByFNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateByf, PMIByFNum from ( select @@ -79,7 +79,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI left join Project_Installation as b on a.InstallationId=b.InstallationId left join Project_WorkArea as c on a.WorkAreaId=c.WorkAreaId ) as t - ) as H where projectId=@projectId and RateBys>0 "; + ) as H where projectId=@projectId "; List listStr = new List(); listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); if (this.drpUnitId.SelectedValue != BLL.Const._Null) @@ -92,9 +92,9 @@ namespace FineUIPro.Web.WeldingProcess.PMI sql += " and WorkAreaId=@workAreaId"; listStr.Add(new SqlParameter("@workAreaId", this.drpWorkAreaId.SelectedValue)); } - if (this.drpIsALl.SelectedValue!="全部") + if (this.drpIsALl.SelectedValue=="报警") { - sql += " and RateBys<=2"; + sql += " and RateBys>0 and RateBys<=2"; } if (!string.IsNullOrEmpty(this.txtPipelineCode.Text)) { @@ -139,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI if (itemLable !=null && !string.IsNullOrEmpty(itemLable.Text)) { itemLable.Text = rates.ToString() + "%"; - if (rates <= 2) + if (rates>0 && rates <= 2) { itemLable.ForeColor = Color.Red; } @@ -148,7 +148,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI if(labRateByf!=null && !string.IsNullOrEmpty(labRateByf.Text)) { labRateByf.Text= ratef.ToString() + "%"; - if (ratef <= 2) + if (ratef>0 && ratef <= 2) { labRateByf.ForeColor = Color.Red; } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx index 1e4efae..ee90a50 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx @@ -7,83 +7,89 @@ 查找管线焊口信息 +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs index 06427de..a3a00ea 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs @@ -3,6 +3,7 @@ using Model; using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; +using System.Data; using System.Data.SqlClient; using System.Linq; using System.Web; @@ -35,6 +36,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI { this.InitTreeMenu();//加载树 this.BindGrid(); + this.TotalPMIReport(); } } #endregion @@ -52,7 +54,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI rootNode.ToolTip = Resources.Lan.SeachTip; rootNode.Expanded = true; this.tvControlItem.Nodes.Add(rootNode); - + var dictWorkArea = GetWorkAreaDict(); //排除已经委托过的 var listData= (from a in Funs.DB.PMI_Delegation.AsQueryable() join b in Funs.DB.PMI_DelegationDetails.AsQueryable() on @@ -61,41 +63,43 @@ namespace FineUIPro.Web.WeldingProcess.PMI ).Distinct().ToList(); //查询带有PMI处理的管线数据 - var iso = (from a in Funs.DB.Pipeline_Pipeline join b - in Funs.DB.Project_WorkArea on a.WorkAreaId equals b.WorkAreaId - join c in Funs.DB.Pipeline_WeldJoint on a.PipelineId equals c.PipelineId - where a.ProjectId==this.ProjectId && a.UnitId==this.UnitId && - a.InstallationId==this.installId && c.IsPMI==true - select new { - a.PipelineCode, - a.PipelineId, - b.WorkAreaId, - b.WorkAreaCode, - c.WeldJointId, - c.WeldJointCode - }); + var iso = from a in Funs.DB.View_Pipeline_WeldJoint + where a.IsPMI==true && a.ProjectId==this.ProjectId && a.UnitId==this.UnitId + && a.InstallationId==this.installId + select new {a.PipelineId,a.PipelineCode,a.WorkAreaId,a.WeldJointCode,a.WeldJointId } + ; if (listData.Count > 0) { - iso = iso.Where(e => !listData.Contains(e.WeldJointId)); + iso = iso.Where(a => !listData.Contains(a.WeldJointId)); } if (!string.IsNullOrEmpty(this.txtIsono.Text)) { - iso = iso.Where(e => e.PipelineCode.Contains(this.txtIsono.Text.Trim())); + iso = iso.Where(a => a.PipelineCode.Contains(this.txtIsono.Text.Trim())); } - var isoList = iso.Select(x => new { x.PipelineId,x.PipelineCode,x.WorkAreaCode}).OrderBy(x => x.PipelineCode).Distinct().ToList(); + var isoList = iso.Select(x => new { x.PipelineId,x.PipelineCode,x.WorkAreaId}).OrderBy(x => x.PipelineCode).Distinct().ToList(); if (isoList.Count > 0) { foreach (var q in isoList) { + string workAreaCode = string.Empty; + if (dictWorkArea.ContainsKey(q.WorkAreaId)) + { + workAreaCode = dictWorkArea[q.WorkAreaId]; + } TreeNode newNode = new TreeNode(); newNode.NodeID = q.PipelineId; - newNode.Text = q.PipelineCode + "(" + q.WorkAreaCode + ")"; + newNode.Text = q.PipelineCode + "(" + workAreaCode + ")"; newNode.EnableClickEvent = true; rootNode.Nodes.Add(newNode); } } } + private Dictionary GetWorkAreaDict() + { + var dict = Funs.DB.Project_WorkArea.Where(t=>t.ProjectId==this.ProjectId&& t.UnitId==this.UnitId).ToDictionary(t => t.WorkAreaId, t => t.WorkAreaCode); + return dict; + } #endregion #region 管线查询 @@ -111,6 +115,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI protected void Tree2_TextChanged(object sender, EventArgs e) { this.BindGrid(); + this.TotalPMIReport(); } #endregion @@ -125,6 +130,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e) { this.BindGrid(); + this.TotalPMIReport(); } #endregion @@ -224,5 +230,79 @@ namespace FineUIPro.Web.WeldingProcess.PMI + ActiveWindow.GetHidePostBackReference()); } #endregion + + #region 统计比例 + private void TotalPMIReport() + { + string sql = @"select *from ( + select + projectId, + InstallationId, + WorkAreaId, + UnitId, + PipelineId, + InstallationCode, + WorkAreaCode, + PipelineCode, + PMINum, + isnull((convert(float,PMIBySNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateBys, + PMIBySNum, + isnull( (convert(float,PMIByFNum)/NULLIF(convert(float,PMINum),0)*100),0) as RateByf, + PMIByFNum + from ( + select + a.projectId, + a.InstallationId, + a.WorkAreaId, + a.UnitId, + a.PipelineId, + b.InstallationCode, + c.WorkAreaCode, + a.PipelineCode, + (select count(1) from Pipeline_WeldJoint as d where isPMI=1 and d.PipelineId=a.PipelineId) as PMINum, + ( + select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId + inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId + where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId + and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='活动S' and pwj.isPMI=1 + ) as PMIBySNum, + ( + select count(1) from PMI_Delegation as pd inner join PMI_DelegationDetails as pdd on pd.Id=pdd.PMIId + inner join Pipeline_WeldJoint as pwj on pdd.JointId=pwj.WeldJointId + where pd.InstallationId=a.InstallationId and pd.UnitId=a.UnitId and pdd.WorkAreaId=a.WorkAreaId + and pwj.PipelineId=a.PipelineId and pwj.JointAttribute='固定F' and pwj.isPMI=1 + ) as PMIByFNum + from Pipeline_Pipeline as a + left join Project_Installation as b on a.InstallationId=b.InstallationId + left join Project_WorkArea as c on a.WorkAreaId=c.WorkAreaId + ) as t + ) as H where projectId=@projectId and PipelineId=@PipelineId "; + List listStr = new List(); + listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + listStr.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); + SqlParameter[] parameter = listStr.ToArray(); + DataTable dt = SQLHelper.GetDataTableRunText(sql, parameter); + if (dt.Rows.Count > 0) + { + string PMIByFNum = dt.Rows[0]["PMIByFNum"].ToString(); + string PMIBySNum=dt.Rows[0]["PMIBySNum"].ToString(); + string RateByF=dt.Rows[0]["RateByF"].ToString(); + string RateByS = dt.Rows[0]["RateByS"].ToString(); + lblnumbyf.Text = "预制检测数量：" + PMIByFNum; + lblnumbys.Text = "安装检测数量：" + PMIBySNum; + lblratebyf.Text = "预制检测比例：" + Math.Round(decimal.Parse(RateByF), 2)+"%"; + lblratebys.Text = "安装检测比例：" + Math.Round(decimal.Parse(RateByS), 2) + "%"; + + //if(Math.Round(decimal.Parse(RateByF), 2)>0 && Math.Round(decimal.Parse(RateByF), 2) <= 2) + //{ + // lblratebyf.CssStyle = "{color:red}"; + //} + //if (Math.Round(decimal.Parse(RateByS), 2) > 0 && Math.Round(decimal.Parse(RateByS), 2) <= 2) + //{ + // lblratebys.CssStyle = "{color:red}"; + //} + } + } + #endregion } } \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.designer.cs index 067c153..6dfa397 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.designer.cs @@ -114,13 +114,40 @@ namespace FineUIPro.Web.WeldingProcess.PMI protected global::FineUIPro.TextBox txtJointNo; /// - /// ww 控件。 + /// lblratebys 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label ww; + protected global::FineUIPro.Label lblratebys; + + /// + /// lblnumbys 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblnumbys; + + /// + /// lblratebyf 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblratebyf; + + /// + /// lblnumbyf 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lblnumbyf; /// /// ToolbarFill1 控件。