From 52b598aa1efdbe6fc77c2edbb637fe1e02405ce3 Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Sun, 26 May 2024 12:05:34 +0800 Subject: [PATCH] 1212 --- HJGL/.vs/HJGL/v17/.suo | Bin 895488 -> 899072 bytes .../PMI/PMIDelegationReport.aspx.cs | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index b9cb83d69205c5deae2c90efa3dc0d5baab4d116..b7656cc87f601f0100195bc9e9a260c20cf9aa69 100644 GIT binary patch delta 10376 zcmdVg3tUvyz6bDG`!##^%pf2VA{r1OBH{Rq%ycrcmvxXz&CF2qdDIBCOijkOsdaR= zXZ}`(I@$Jdj3!XF8QO?%MMX0Y84;OTS{a&}rOEv*7|yY7_jJzZ-g7_qj-N08wbovH z?X}ll`!%EIXctdymqo5Vmc~!G#o}caOC0jo>gwuvF|wAy&;b@A^JkbYSS(STwUU+Bv*G$gIpIeonKcmcKGm0+?cE(=QnRH_W+O7Kxl_YS&HNCysH1-^t zY=K-4_!%{NBl4Qp1bvW{no@_wU%_)IPKMUd1~k!PNku%1WxTo`kYeuV>pzde+n^^j zhe()=%2|jH!UN!dF5p7B1iXP-$Z|f~OTk zzR`|oqz2`qzzgG$=VLhxZ160+3PT|h<24n_$0OYp=EL1E5k|vK_!)b31L9B_{kJ3W z0Sb;N7RxNYP`}8YlilrqImljBjem_VMR)E)T#v5tL&^7xm+_I;Q`ETM9Pk<}Y#8u_ z-yLv$t#so*J<{m%FGiXV0yV;RNupX*?EuI2w-y z-$8yXc+>n?@Yoi0e|;=?IX@OWMk9uf#U1qp*B=aCfgcPWuR9ojI~Kg09}6CfFWVea zb3WGGEKKd$FbC$swZ$u&>aMW(#jA3P17TUBH$5sJ)&BN5k0Z-7YeKE@G~XSLe|Dps zr_(~QGF0y*;wzzaBI0uJ0q;ZOx_<~Qe-lHq3h6h&z%h>jg2h3KCeHs`G))tQSw(90ai$qEfzQ8$8Z+1 z&{|)J2Yv~fir5YD6np^@$P4f#(qF-8I0HY0hOn`Bmr!;A#=v>tm$EB@rM=}c(!7!t zD=-xP9Ln>ut4LpiAK+6EvD`a(O-kc&y#*JI#x#%Zk?#NJ3Sv|AyeZPQ(20P})OA9B>~;Atq?NnkaH0e|p_mcsA}`~gX`%9QD1QNI5Bv!h zh01l$?J316X_d?$6#TA~qLC_-PU1qVJ4Rjb4{$^^!5GT$9oEkYwXH|(NOSVWKMECm zPM@_DZ@jHN>fH!@5&v{WIsp&kd}ACzUoqrmfe*3KvwPw>w`6b=e4 zcoK1NC_MzR7RPpED6cQs>2BMwO2gmhvEYT!!a0Z?vDImaGhjNi6xZc5fxLdDC%Mk6 zam9m1`WfLO_kYY4-gtI2Mt$jHy<;b1=@gg> zFTga&2ai*qc6(}Z%G65HKSS_VW~vv^Vg5)#hbyfqtdBmivQBp41U#cZ|Iu83xZs}? z@2?U3Yb5_=!C$CQ#1;FEz7s-pap$Z1nZHER+1Dvl;dRDJgGUS-PlvtE=Jez$XF~YL zgZGX4(!2btGo5!nxHG2rHgnM`XD;)XN-`gez4X~E_VnUF;O>36HSLFTH~nGRZz$AZ};On4Dx|ANC&sS{x{9n0oJdK@byyo-1 z{hMzbcVct=#_>nQ|D_v;>tDTb&}WKmJO$6Gk={W{@%&xS^2p&8Gr})tCT+V}Ni0r0TP^#)5@_2MYconKms%BfymWy5t5fzT;omT2r!-Dk zqYIOaOq}=+pAwpx;S&3r691!)p}Ddur&Q*%0sl>!P+ZjxLT(P`s6lqN?a^cq0DBiyE&r^%VX9Tagnb* zDCk#&)|6Dj;>_*?*c>LrSg22hHQl}vYvNMOKQvgdKW9GMmCYA_`@(^ZMX@`)A5HlC z1%y1!m_o`BHjWLWi9=XEdx|ddP(TxhvIRy@?6+s7m`JOh;+uYol`*3i3(ub!y7lmL zWERr1VGhiNc~FUyem>#?SO_n{%ix8@@H#vIIxK-dgAWLn!YlA9yavmm0N#dmuu`-% zJmdP2c>`9#n_$3dSOaU}FA#wB@D>!pMxfHkEGEAMDHArqyRaGFgRQUy%HVwn!ge?a z2Ve*6gk7*3_P}1)2m7HMD&P=Q!e8Mq9DxtuD10bd@-4@ZI1V4dDfkjThAQ|3s^L?p zfzRLsd=4k!3-}hkfvi`qXtn0^^>XNWT1s19yBPw788#qA&J467vrn0ECD5RP~M`#Aoa04VmD~N?S z;M=6!sVpVFHFBxY2AV@#xCMBPTM=o~R2J8U=ei?z8{7f6!$^1&__7{|_du`ur!b0n zfw^tGyftp;xzuL{>)32K7LN*54c7yaP)x^hJmpVINFF zz65a-l)}5P8Qy~}up73*`w)a}PzKv!hlE$xok;A0J+L44!T~r8cuX0y!jQ%HRYU%@3_x@tD-lyVuVyKwk_MEnV^z*YDeu7L&D zTLwk}6Y@nQj-rt7iiETb3Rpn}8)#q$2RI=Nnm{;2KqNGUD2N8$R`XEg=~$#&KpeD$ zc;MyuMARkyJyTzzFN$_GYmdSX&=ER8XP6#($}H96S4*bkXII%TZ{_#>Pdt5oj4d4r zZ7InxnBetfsuCvejTpH4=j!4Ko`sA&dz54|*~<0(L>} zj;2S@j|J?CG62u<-K_M}aUs>jy}iorbFdwP)^KY#FF2Tk8Ga_Pmx)aihEh#0#bM^| zVvEH3oe-1AIAf31yKhy@%yL%hEShl_voZc<1pltEz7P6@nG3zayF@mmq0!uxpM9Skj{C|87!6~9e_5)p*_oEs*btAue#iU(m9BfowD_u65+(O$ zq2v0KP|A!{VcjoY>KP8vaG^c9iZqoT>L5j#4;>SVZt{O47*~Z>?fGWjN3%20huOgM za}i&J#c(T@Ekcwr!(T%Dnc81qH)QBYE`fQx2&)W2wWUbE2Cu@MsJ;ww1I)r@c{$=b zAkPJslJpi*{6bWS_%^%(0eAcC|G>Y%8=Cj0{mR(gmrZT2HaMX-Nk`5KN)Jcuh1q34$?56pSu{K#MvE64l%x zgi%E|A=*sI5i4ciGh&jNG*YaJFz!bc_pO4%bW9d6$i@sY%ord@hF6s8pUTa|rDC;> zipB|1R6BvC(}3|>6uCPIsyS$!;Ai9>t;LY`M>LS+7pv@4_PP*Fsa~Or**hR^U`7GD zvO(17NLQ&V6)2*^47*p_%;@}bp$o0}S=?Zr35wBo(UG-6qK`=$tSM6pCLf)KFrn;4wXlQZ3w_S zPz3J+mHY7Gu^FlNpcJ;iRtUm=OxtaUJ7GJVhBDX%yI~LPg?+Fe%HaT1KpM`?XK?l% zM*1k6gnQ85hlt0Z68NcbT)>k8PkdTG-+R}f{PWPVNSxFBOPe#H{FjI~q0O7YiT1xn z{u`KwJZ}PT5SGr!55snTM5H~$;#zD+>GyCiOn@XH!0ptm`%+{v%tO;RvxlkXDK*`k z(Mp~s8=Yi@PJCgFHDgodQ=-vTPB;2WQpqGaNyUjESJ{num_?qEGG>iOu42X#N%Bd2 z4$YCPWZH8LFR1r#6T6xNmrAQ5d;|Dxyg)uKQeG)0p6jIekU3|aG+AU`x^onJf`X?t zh34(oT;>u(9wX}OhpIH-Q7PJNRVba1jev}^LIPQ!#D}FUGpj@jFk_Rf8k;1^*da@F zezR0SE=^J?Op|g**&>~!+!aE!u}_wat&)P?;R10~uC^IFB*7OWp|3T(=ey9rDLKs8 zhdLR|00W(f6yQJMqPW!04!rCF#R24j}h2$<3zf+wSQ>L6N!HR-L(Cp=xaA4Te_L)&H42NTZ){8@H6Y(he!s$h9<=D+J)1xW zZ)b5749HPbE;6m5*0e%7%IZOlUY3_lX0v|FgaVNgHp@@aA2!O(*;D%BHBDI_oolBw zqd6Pp$uwqzJi}>4-+A}B-n@G6`n_30@tftSl1;LkQT{t}KN=K}Rco$gEPhk`MN1X) z@$JJ4rE=T)Uj$Z-;NLN5N|{InrE)ZFEkz%n*&s*zw#aVNvsv~qePyebX3KEpbJ15S zyUD!;)%upospLTw8h1dBq>3upMZylbyYGPPSsje93Us8Y)kU?Xa<~zr?4ayOrIYlw$deFHDrH2^|S8yoHB9-pOR|>u~PGFG~*;E;)yEnQiD}hDP z@E9eNViMR$R)*u6Z+xR@RF-6G#qR|7>mxT*(vV1{6%{0~MDpBd4Vv!DN|5DnwM53()uo*p`E{P=;nV@Gknv2u@wP0&ARxDRiy^KVw5&l8m;|E(5U zwa9w#zRbVvR5stK3F(8!=T1r=I-U*kb!I){QDfjgsMSq(pKF=$JC**0rds~PrYM-K zxNo*FTvZ3))N1&o1Vawf`Zleic%0!Vznu zq{Q4ZY{=lDgNJq+nlW@}rx!9SSY}rj{!Jlw8^yyUlcg$kb~>@d;Wpjz)}Tz0E+vhE zGgQfRbx|ss8eOf59-O97#z7^U!rv3a$Q@;mq@3lNYI^QR8%9r@XnCEKSQ>YSE!lLB zu?C$qt*xUg6xeArvEyS4<`dSwlBo7gEyXODY#kyReyig1DVXxJtTiHynPpEm)BVa3 zD+S-cDdg&lE@YNiOYPKiJRX5+x2xf1$}(%EY?N6YMmf&NA-k=y6gaK*GIIjf6|!+q zk&LreiE?*p7=x?Upp_~n+ZA#@=xAjoX=;_Vp??Rh)y`E`fi2UgPwQd2tF6K7&MQV8 zK2mz>;Rm~$o)cD&jq-AoWSUkYMw{If>kd4SO?5_+>mFOW>F&wb9PPAqF}obG?qkMz zt44`)a8FE6Q;*10vzZUUNoxf&BvqlJ*7kcTyqBVyS*NT4M)8wyZ67qn?x5HAN#SNv zU$si4+}&0O<$S8SsC$AGYxd1h*D)hf6)1AE*v;%VK;6NNF~}|(=t!eQ6VX_wNoqOs z#jChI#i~^{Iy06<)1tRkH@VI#k#z72YdBp^mBY<>Gt^1UNLD30k19hb?Wh)J=FUwaX%3{saw=-yu4^@;~vAPtRmnyi)|CSfcaXbudjt3=;IK4-FQHCAJ) zP4gY$>kYBtIaJ6|GR%xhb&tqzMP}kiTeV33+tg0v>WM=bKHZ*1mpdv^=BrieaM8%M z3Hm#iqo|@#Nuiv>_9Qc>MqR;-ld8hJ4Kri1Ey#>BY7|>a(@&_QsJvQDrK}89F<)I| z8_x7+=A@db*VJR74f<@=GWiEFJOl~0QzAv~R53GF*!D&E6q}!|p+3(j57I;X*#JDI ziL$xkge}Kfl4#3jc&cGdY-7!Fr8cj)I{PM@V3gSes_md;kY}8LL(-MSn+LzMbr2|U z7B2`_4SN!KW~r*_PP0Xdl>G<}^~)cKS>}*^wgNi^nrpo&>v5bih3#ys7zPBRRB6Km zTX9H=Gsi_}C!NL_o3J|jPMcD4-X?^ZkKAKhFO;Nf*_f@GV|8{rEz(HT1TEb%wEq7F z6^T^wlf4yXy=YH1SKO%;;Y=Ck!~i5~$JpxZ@6qQ}O)#@B+6pxa6lh^ob6Jh0ij`V4 z<$Qu`Os_|@%`(;Yabm8e*n@J(Xf0dByE2~idTGbe#8^!u?*$>!jLg=~BLAGG7z6Nn z?0rk=M!D~+=@fX0MVJR(&}NIiCp7HQaIK1&+0(VcC}W^KhE}|6>q!+evDIly@dA@q zrq%FwaWlzRUvIlsC>b3b0%gheI9fDU38VFoOEG583N5?|MJ`ZMsdl<_ubEe~2oHfreN2JN_053EJmXIhzT?9uQ{@`KuoD!N;f`Smc;#J4Rom{G1tX7*{V zuv1BqBfB{rxvb*1+h2?Uqr5u%Ec4i0JI)C2R41+xeYFZ4_808}l?``xr{HW{Uir^; zl*=y{6H@F8<<;4T(DNDVkYZW^j{As%Zzv~7g*aWgQ*>2G4Jaw_5|%Q(vV z)_#LIW`XmVqJQ;94CTbB@xSxO^MevYGgFi}s%oPo;eH=Z;j5eh!*DX+TBn;GF)FF zXYYb00+UASJ!;Zq8dNydL!`%$Jr~)16i~`Sq zfglE;AFfz12R$1AiEQ0RAt(3h6)tO*oE8WpSb{9eAydH+FcfqkE)8-vqycF)$_bM^ zP@H;hhRg^3fDcRuh2RcwJ7@#hAc&Da3MoT6iDK6KyAkvG-lmHv4g z74`b3#}(JQr|F{Mk<%+N=huU^;7PC!JOvzQd^cg4-Kwt}a7CZ;O z2eyLe!8XvfsqUtx#^^%H3I~!Y;Nx=onRMu1$0^8j~>FhUacF(>f_~lFSo*<2ATqi$J~(&cAf?4(+oC+ z#x2(~6)c59nO2Tq>%J^$i_w#0g>z9n{TQq9#Z^3p5j&pDggl3}as={aun~M0IJ4Qo zjfMKN-f()aJPhfSb=K3fy>ZEqjbJHo+~t&g0s1ddcOB%@U^{pT*zlg^>+5&waPsv* zTmyI*IB|DEzJyt9z3B^7TNjf~&xjeiI7Dd1G%UO74$q;ugRsYsZZ`!bMSximb z%Yk7Ymn$6%2N_@l7>epgLOQ*wSK|qdVP*L(%`Ur8=y) zpZ`yms_)vRiYc&9uFv502YFl!RB4Pz<+Ug%cb{Pc=Xdk5)Q*!lHE!dPs&*Fh$L zexN_N9*hJ7K@u1Ya={>w3^G6p2!MNKm+J<|p&$)>18oe0Ob5e378n7747a6BC>_W! z3Ni=W2(m#4Sncyu3Jai2L56XVw}bIuBA5zpMEq@#cYq0CGH6HK6v#Wl-QX@z1nvRT zfmQfGTyO@I`@u{w3zUFwg4tj$D0RS`UjX?Sur@ys8nz6|aQ1HM7*F4L@DRDx4fw|2{@Pb>PJ5uy{_d?u0!EdqFga0U00`_&^`< zuIh62g^UN+fdtSG^ale#BDfwTfq}p;;UpOZB^e9`Dc}Z>3Ibp<7z)zBFfbg<0wcf} zkO@YDQgrer$SiOp$Oh#g2iy#D!8br2xCM*`AuwL5z!e|LEEshhWC54}CW70*0x$^_ zf+=7txC7h?ZUv*!@LiBa;BIga*p7Kt3@IQ_f$7j^fcwBqa6kAam;*{G@NYIK1#`ih zsBj+SeDDBx5G(-;!9!pXcmz1^xbjUWE58d_4fqe=cCpc_5=GMi~VR@tp&;WRqh^!TryimpG;>rZq0GtTM24Qg^z z@|g~$MP<2+4v%B$G+$%S(Sbi{eJTC0oYXYx!p~X#ZeITxr%fLi10yGReAA81@31dQ z2&V*ZR$Cdh#<0*1mdLoB&KR}DFr7Xb$Koh)I6K*r&zhODRk#wU?hUz*(^{5oGMNr$ zsv!~Ltd-ebmiTpN3vC)E4;INf>tHQGR-iT&bnTPuT-4L|Lq3?oTg*f;CYl{!6yD&L zNls^%uIY)Lj}CG$fq5f-7Ge+6n!#+02>V%>*~Lt+=}4M<@Wyw`_kQ%N7v^2~Z0X}E z&mL`9^v+Y??fCXj{&ec~*rhqI&&D`Dci~9f#eQYLwb&{@hCT4)boR#el% zjtH|$S!PQz21$hjSZGsSj>w6yHx(+4c$SG}xoiWow=w?ZR;p*5S|4^_v69U=+iR^^ z_N~ZvDM#1|EQR%nX&btJZ)~6Zr=DIO{Uq&<_hWB)@by6~EV}!#v5by3Dv31N&$4LA z0Jh}64BNSbi$DWA#=hudOD3Dl*e~hT0n(kD8s}2yVCJXYO{z}bAE{Zie-q0WtE*Wl zi$u%GBDsZixGxuZ>+6fKDq7>?4~r!~Wz`aOZbHqds*0+%uu0VrldN=%4a>C@v#qS3bGkbZ zf}M~LK{}W6Z$U0~`Z|!_o6gcVHOef-3664HlfXRAL*RYnaV{w|lh{94Dr{&-Ve&dx%`#gc4iL(Y=8 zT`H;eq|Zw(kUC=RRfw9w(XPcjV??M@YK^jMB(-HR_jBRjB6S*8WiWxvhqyI zE!#M1IP^S^qqG{HEhaZg&6p~=axQICC69=nDF2Yz&5}t+ck<*2lT9jl6J4vmTTUeZ z2zeKUBsoC-oxGFIy}+}n_RmtYINd76kE5dJc|4t+B%iil%1#WIr* zx-mWV=@%nD7K&&rSH(t#p9uS~1gZ2zbt3J0%gmr`2R=w~UfwPGuBmvqTz#~tOj1@Wlz+RtfC?o!L4?msVTDed()x@3Y03wZ{h4Ii0fpPT ztlC*h;BvDI6s)3|N(wv_R@#}pUY05Rl#(J+)+y}@l?{=TDRPD*KFIE;;5IW`Y_^p}(laGorbF0w4d+wNczkx+Z?WLBRJhzs zZRu88dv=+nD2;DI9mh@NOK+Xmna*Zm9?fLe&Yi+FS2#oUk_hMan8m^<7 z&viW>n^*1!vomHtx?n}doJUu!Dj%CY?xw7)u{pzo<1e3Bw78ENEus_Db3gw3tQ;HG z`F{`-D3(ss zHZr?F)oWhD##W+rxQTyYz&Zt5YZT6~v0K!8v3;5o#I}`MsYH8j@Z^j9B5l7!g^w7x z7c5bavB;Ae_L{X?yJVNC(e_eJrTm-SSdu^1y&|wxJEqvHHPu?OBcbQbFG}mxZ5o}s zYChESE$@-hB78y%8}?op<(y_xC3h}J`?XfhmUWeCV%@0f zr&_ya`*glt9zNG3H;&J&?b zy>$Q;{no_HJ*l-x6!*I772YEKtVH|~Gl@!$sk%t@=*K1U{ZPsid2#w7cxI41O-%FZ zyBOPOtyw*trVQX7+W(HKibb>Z&9PVKJvuuoQ6!e>Ct1rP-8r$B>79)Bq#7C2n2rKj z3Hsr`2(Q!+ze}ZK)rpbctA09iO7qgCG{q~{SL!Py3STF|+l5AlM!p8@TxX+snwYXq z-=o=uIzGAvkXmYVFgBkCapM-MUC0As{xto$p0CLwd4bU(QQ0yzg$nb`3{kXKZ;{{dPSjtp2A1(eJx|;k69Dsw0#Tefbi}x8dk~Q}Sn7cnSvP9tpy^+}m4NfDUlTxYk zkda7>&-0)tyQo(wRR4~dPT>{qAeB7g(Z$@ijje9$k#%VztxJEOT^`>tjA6T>Q*a4p zYUtN$f6>`&98v7k=wUK;p0mHvCsShu=HHTlQO#P;89bT}Eth9hw|iZmTdEZu08 zY}xeKL6lhHaeIU(+c+O(C!5?ZK<_f=MWNAD^LH@yI#FPqj@<6{!=<2c zjhGFl3TMnWaivIib2_`hT}=K5O;dQsnP)jIeqEg=ULNHx4mh`K$8Ao|neKS)&FT4R~WUo4ATMo5!Q5uAAqJvztvXUO21dY+A2*R_til zV#;*%m(Hqr)5LyXw9yR%WqM99`!G@}?~_qxo9T_A&_gU*lsxLG9ewS{>^&ZwG{>Df zlHFK&l>sf48t;KKL(LxSeqS*^vOpFm}0* z52CV#=2Wt0$VsB?jHgQLHOG7I_I~yS54X?4c$G&yRif&mr_8;h!FF?}@N21_)T@uA@HL8kE RXX&OeOQSBt*xRGj{{+YLcEA7t diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs index cc5dee3..e67a31c 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationReport.aspx.cs @@ -94,7 +94,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI } if (this.drpIsALl.SelectedValue=="报警") { - sql += " and RateBys<=2"; + sql += " and RateBys<=2 and PMIBySNum<=2"; } if (!string.IsNullOrEmpty(this.txtPipelineCode.Text)) {