From 5871297f1fe2b218dd3560781a5393e53357918e Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Wed, 29 May 2024 10:09:16 +0800 Subject: [PATCH] 11212 --- HJGL/.vs/HJGL/config/applicationhost.config | 4 +- HJGL/.vs/HJGL/v17/.suo | Bin 1065984 -> 1057280 bytes HJGL/FineUIPro.Web/Web.config | 2 +- .../TestPackageManageAudit.aspx | 11 +- .../TestPackageManageAudit.aspx.cs | 791 +++++++++--------- HJGL/Model/Model.csproj | 3 + HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql | 312 ------- .../版本日志/HJGLDB_2024.05.17（邮件）.sql | 193 ----- HJGLPackFile/版本日志/HJGLDB_2024.05.22.sql | 106 --- 9 files changed, 394 insertions(+), 1028 deletions(-) delete mode 100644 HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql delete mode 100644 HJGLPackFile/版本日志/HJGLDB_2024.05.17（邮件）.sql delete mode 100644 HJGLPackFile/版本日志/HJGLDB_2024.05.22.sql diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 1963de0..e47cfd0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -162,7 +162,7 @@ - + @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index feecced779eb88434aae8a06c4c671dfd1d2ee17..69bfa29ca04d6d74aa5c398ac85f2cce199e6e49 100644 GIT binary patch delta 19612 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󟭹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 Ya@nkAW3w6*%?z=(^E<2*?`zKg2}EWSdjJ3c delta 39413 zcmeFa4O|pe-#^TmnH_d!mt_S)M8buL5D^zdL?c}h5e;!QHQz!&G&Ms~G&4msH8V40 zZGWbwNVb|8AsW-Gp_zJ>8JU%tH<4F$^SI>3-pZj_4>wZ4>`uQ?% zXU?3L-~0K^Si0X)y1ZXm>aZJ_k58D7kI&^RSFT{=BLXTg9LNJ=aJ>s~1NN6=TMo>_ z{`0^Cz~6wkfp>tz!1SGuy}^V)(G?+tTZ+d0(owEH!JflSj(c76gn6uF*H40pu`(Bv z+IQd&m2nd`R|dCi{rJ|EAO%LeEBW|z#8E#W75ELMZpZdRobQS4V%H?8Q`g(D_Yuw< z0A9d;G;j;h890Y?vDhBMHUQfQ*G{SZLSD~t9Q6XyfDQl(_*}ssC$>ZQK7PD)$=J7J zOgf+kLD+AHZ6&r(13#erIBb8zme*N;{b*d5P<|x#c^zZ19gK6^v5f&%FrS5b;h8uX z1r!2z0;7RbKp=1ja2GJq;NvqN+X_^0PVhd2Kd3t%@GQ>%3X}ssp#gjjCjk!u{J}Er z;oAVzu^H!<1HFM2{Ojfue;>3wgzvA%`6bs}dk*{MLRRb4R^Ph3_jOZS zs!wgX(Rf!G%JPN|!gfbXLwKEYaLnhKU*q%4XQ30|4_JYAKR>!GtPh4&pJPM{jBqI{CEAVa|-z{opt_@e`VJ1$6)bU=Vkw;S?9gI4AN8Wwp=>jAGU4eL@ z8(;^z1Nt-ZoIcp^0VD%GflR>FXe~Ck7T{Y~Zo81E3AmCAM4$ke1WX3*23#B3 zWrp!P9>l?XU;)rt6HZ_GH)*59+eBag2TR#yyKs!%m4jvqU{L~^2oM7cahiLy^ zHJEJsh2V0F<$Ggy#m0TaZs1Q7L?}`~ z27W^2$`d!R?(AM#6fNAcx;pNO4Qz_AUm}^YW$Y-O?a6{@Gh-7fX9|^e$yFK?TEa?^-c!j_4}=Db^L+yp9c`_m7F)T+Pi(gkB(% zpO#h56R2{V6h$YuO153;`(I;JdeJ=Jb>>-_;?64RH0~=w-Bn*~XEm4V7+dLL_P%bn z9Oep(vAAOE!lnGHD(rVR8RkLA z9j1QwNPS&)!R*x}gCdPd<+?OD40_E=W;pFbxHov3dlZi*(-uBq$`KWw; zf~$DJP*;C3VOR44vrs;#zrwiX#_b244YcBooDb)MdG@V$y}2mS_0zr&q}M4^;^N-G9e&og)!@=d2dhsNBO3&zwPnX zkhemz_EMdJbqKk^Ib_fslcrCaSe!L=R&jjZtfIN`6KAo}bhZ!cyHJ44;^ZY_D**;T z27Cb{pa3dh0?dFPU;+FAE6@%I00My^;07QVXb*${9e_}vBM=7M2yo%u30s@dNASsj z+#kBL+Rj{?8=|Q26E#e82+YCQSD5&Pm1~6BEv!EieSCdrSiNt&J^;^P0M-h%6)c?@ zCt}$CI6NEFAb-%V0r&x9cMtFd;0kivQ~F}33&6V_fC9ll5WtW552LT|C*WMCYtFmo zyQ8dJPXxCV;QOv>_i^?&*CTX4Xu9&Uz*e{x4I4%!wPG+;^fN~7T3NNuphe5<1gor- zJVqu|z9vL@D#8S*aTDn zl>o2eX>6YXo&`L>bHFZOE3h3Hg>l<~?ejnt@B*+CScA^hVEZEQHZUH?wb;G{yav21 z!7q3PJFfz-0|$XUz#Bjvuou_|yb17`ehb^1Pzkh}&pX)fitQu}>-*S04EzUh1b7qY ze*`jt1|0KFJc#`$pc?oX=Z*v4O0N8=0j}cjl7w_0*Y@v1Z%o3~A91A!TM_E|JobME zE&wSYuRs$w9vQCq7<^n;?u=l+xgtj2lEUYY|CZqDlW0*63arI;J+t9(>+9Ir1H1to1j@&R^*My?-+;G) zdf-#wUEl=p9xxk>{XVuwfe(OVz=yy`z;WgpJH|r?CdrmvmILRYar?==$@zwq>YCGd zr!8RcYuV5Ic>j&BzIP?VIR4%*AAEGoM`w%23ZF)uzC*hA_IbO$ZwzEKJiz4899CAx z+~*8oyTT5C;ak}xTq{yEh?G)Rd0hDK7ZKB1MMULEp?vWY-8S8|eDPf7E?~uM2+b~F z*$T_YWN?SJO-^1YVDsf}kk@_^&6@;8)c-klTjeR)ovS!7<0!c#lBH^;7T(VW!4t^@ zc6s&YZr6DYuF}(1wM}j&)3CAZ#*UDwIP6SOZr*;O6$6eR;Hoo4-0Z>u;ph{p5S8$lzz8mFuM_OhhG4bAPW2h^PDdv-Y9> z^_`c$)GjdX;YaVcETtX6He7mn(vo`lInR#@vn+;b&Y9~WY?+aUeI>NtWexp|vCF$y z=&!7NEZm>n8<>%o8QUtDT>(yc3w^EZy)Md3h-kiu9>d6ZpOY9umJu*JP-)9-W!Dd8-QS-JrDwP078L|Kp1eN z2qhnmolbxahyWsin}8_bW*{1f0kVM3KrGM&=nCWj-GIJ8B9H)Z0o@bZB%lY73_J*= z0KI_Tz^yvs3GGLKNB|BJ* z7QKTVVd{EN22SF)>++LtG4AN77KoGVdI9HLm%C@{D$?al%1zhV05$Qg9rT?5Bm&)m zB%lY74D`E^<{w+*PAI4=S0sq#wwQx8Vh4rMD5Ds zj0x_;417|{!n8h#42;4;yo_Sp41*mr=tK8eSr9ldSkR)Q*$L6J7Tgu^fGM2nGlju4 zrBXTWKBT14;-{59RJu`d)Sl)J1fSSHI1n|KCT0~d&X>{UD=pow`MQ{~c-QQ29xcBi zjKa3Dt=gMrb{nI*XBEed2$=gEaKd)OcHnT>wb-VQ059EyNp?NuY2P_?sE-fhz9`9r;XSK;qmj)9S5TD zZ-81%a7wS-48F$Jqrk|FfyaPue~)bs9LFbunsJ{8VT*kzzaklNr>#NmI95khHs&yA z;9*>i@j$e08rl9p2ws;n(e5RJmAbBLwU5##6~i%wF*BgBc;*9oNnO(=c8}}ca>GP^ z!_C5w8E^zKT|6Gbz3EmnPn!#GP$*xQZsbm0$Te47bJt}VC*TD7+g99lVVxcvGX=IW z45AkoEhDK+5hWVkV4Ok@3v+lrGhSm}UipI^S)P>D#$?X_3MT7=R`zWnwDKM)-pW&Z z?Du3abNQ-bHrh3N)k1bB{WPB~l-FTOUP*M#d%VQRDWCs5Bfugf#Yoyx!daw*?PGNA z5jCEQdV+79%}Uda&rBJn-4(xh-sX8v`h8;l<>Bw{U*yaz%+zf3w;WF2KvmzUICVbI&-BMNEvdyefL&JZ^m?j?WmXVmUGUWF%dDB`46^8KPtVIm6ELw>ts$y zi0hu?_#lPTtcF^?Bjab_W#7()aAA=iOnl976W>Z|LW!SU+tub8(6S5YBbx< zYWoN_L9)x8{CLxF%T?C06E&8uV z&+Z9{{d;!rnw)4)?3&bTK(DT82?G+kCfNt{OX!!J-ajEDc|icG^Ty+N$G8s~Mb&*- zNW}HwyX&KN-F5jI;v6#iJym~PYn+dV^w>xq&x@tfXO$QU$9mzQ4%gS&76_z)XOvqy zZ~{Mox(pz1?vThpS0KjgD+YDo+`tQQZU_c;gSGf^nYVz%7U~Q(xaF{O9Ln(Pt-p92 zCj#AoQ_vr+=M#y!*{!Rqqu6BctzrG{M3J!oFOq}pIAA<*7cc?10({7~*Zd~69FM|w zjJKi@|AOC-+;^fG~i>@F8{=4GF>iH z@y~4Ke|KC&_KASl`b{6moz)KJKEbw8#R+&K$YaPf_eGnzjP8dmNuRPydK{VuNTBMy zjOdL+*SbZUKoy5%*=t^!MnV6#P_*mHKhhNzfE%u0@>*4{Ywp*VTI`_sV%F6)JN^nQ zaLw+vQ0U@Ab5=9E7X3Cm&$O^A_62j7vu3$7s%$p6E|y(14F#uiVS%6P%EAYrs~*_K z9%kNP?jLQj@7Z=OvX(WNxJ8zJy+yVJEc6CydI;O4z)Ij@;1OUoz$df}TLb#@7`9IV zuB6cp=^4H=cXXKaG2dA`+Q!<`=TSl+B6cI_>nOq8?hhe3YIn2HDd`iG=e2U{?j&#l z&6zP=;?i2DCIcT5 zqw5!;vleL<8gBS!QTsSO7p5M!bpbX5|Cz{rZ#*Odhy>yRK7l;=dncsX%{cB1@Z(g} z+j@;}`L7$U*_n^)4fo$#;{54C?LKyz1?+=5QZO5QW*D|Ug6s04Wx9aSqm#AgS|(kaosgx~JwB@>f{ zP_q9+G}6h%LNHa66iW3c)G%@+3t+K9lBCURl$IIj*k@`GHAWhpT0y0-!9Yva2&r1? z8sRIZMQ#@w6wd}s)k{EyAW+_`#@n>p_6To^o^9ydespvKHjp%RVpF7(C}d0yQ@&J1BRdY$MC3a+KC| zOt2!R>}w<2FM^~YR&|omsnbHameW-(#ID0MMVoR-SZnZ{L5oTsHbl8Rn_$IB;ywdK z{@|ZP%YPQa>7rduqNZMI9HrbQhimmsf}K$k8AG%Xv-q{avkemzB+8!ig22iMx?>1A z^UU$u{4jBeQaZLvtIv7H7q!bxb)9%`{KtpCnS zYXia3|I?S&)T>Ktu9CZ>v`D+qz#z%$SSmscdcYOp(PvZDTYEoRc;CDZpLiwNUrV+A zX*54xjM1Xv#ghhioKX6E2`73|M9FgzRIbab&p3yriQo&>Ab7GxBbQsA(I^5=_vC=6 z4ogP&Xu+o0rihL0JjWy>&+0Vy)f|h(IzP`zTwTSlt`!>3)PjrlJu3ujSsC&d%H=EqWZHpf${sVLhGiX81^Im(U^nx8=cuZ-4Eh?qe5a z+|j=awM+BuOQjuDE144oqmnx4%Q?SoKEdq2zo1g#8ri6*_pbii`e#nCWPWuZg?1C1 zqQmAxtMkR4uC7ROh<;kmqu&yR?ktfPnLw)&1qGZ z)6lmJH}`LC;P1P{qfEamj2iDmebW&R8H~2@07-FM-K@P7*z1qQXW;So;FcL^a6xO~ z>za-S(ToMA1XJr^ww#Edd22Au#`cn#iWZn`G{ve~+6uv>rpt?^4wM;=>l;>BLfbAO za7S5SGB?%qKzEe`E zIa9JypO@uQO1H|}sroZRy5^~qGZcdl4&pwh_J@*B~qCx*{J$%1QaWN7A@5HmKZ|e z2gPV_kkPpo6Bd6!jMi{2hVg(&H~N)>*JOid-CQ7g+f)VA}C zl^|j6gc=S1UR1Th)8cXQiBl?8@e8E7PLzLE45I2L(M;9`(MoaOi8gXH;fbXsVmQ@J zgH~^BITuPBXDcC^eUhPG@HC@vZ&9*Pkt_xAd(G}>^rB+FXwe)i4R!52(URFyV~}eH zOBoWS8I32j`VO*{@mUV0Q$wUEZCbW;()SNW!zIb;OU`(~s2OF$h4xhanvko(+NfYW zOsPelmKqo(?h`g>8~TU^;{Qs$>xIYvO1=LXQjhF{Jel^5l(Oi=QZSJ-fy?VEa8cbz zDVv{5q>3FlwBHJjao#DNr=$1DRaEyLjBd!z9m0RV#MB@$jfPek*;^@Lx@csq6oyiN zsxL71(H4grN?^`+6Ed|`$%dB+sVWuzKj=~CM)W>~yjJ;l&qqKlWf^x*=Rk9Q_+YMPtkv z+8U2xx=6zhLXcj*r==ua9NaRa5Q}l%n{i6^_ZYE!pASV)FBxFREs>(36Y?eaH+M?m z+FDtjBD(XX40>r9ZnG9+_Dh#akyP}E6i&`Ucu}t`L+H_Sz#ve5u9r$$D5va26yB33 zIlYuq*BNf2eW{c})wxm#sViF#Z6i^n@{nH=nLVn7E?!hDn)7W#HB+YQmRXw50~B!y z4u8ci$*dJGmyR;Zoru<0Mxjg9Bc(nxeInEp4hy_{f27`c{ep%I(*?3WDy3*8E2Klr zbIbrI_EGew`U68aHC=$Bi+c>3plYSG7W1L2(?&j3!T}Nf?Ipc z?qmw0`j-t3{hWq#F(L&FQ={neGw8prU7g>fEokIg(LF^3F@(vD23q{H98b0?DMVYj zU3!K2^3{mxu%U-_le%g1-O^!^zEH(D>a$H!wUQmu;y_QLuaWF~B)evp4E2n{UzFlq zWh*RH{gNS8SIq?4u=7(|b-J%xp`w+7Or!HHleOtic@4b$cMYLhZnkfQFC951XXxZV zR)({_I8$CsC*Bsqw0Yxvp}VcO%Vzf%h77(6qebPQh?aJ{9Kr~yJ&aK1Fa`W%O4ri! z<<~^2d0mdxiki74G(|R2z#Z}>+SqIeqnw`&mE;^LFQb)Ra9`Bx@>t6K75or(ukROT zI*c}O=7h2@l|c+OwZas#^%H}%!@o#N;4>Koa=s(1(;7>CZ6aA8lB+dDBHTy_*KbT>*O_1;(U6yys(<=!a8at*^HI#}y1d`dd*IVB5QGm6lDAT`ZQf4BoDs_;S$|v}N4KB%zn5j^3*e3OEPuAV&xA);T-+BYpyeS1x&Kr_Z%iSk|^#3y~1S|$h4^oQjJIe_#(aJyNvtJFdP+8+mqv`MfaCh-2-<9C*rw|dDQsmp<>nhy>;>`6uX`*rg zK3x4i!H$51tTN7=Rc*`|E?m!p2DX9vt(EU|Kd*$-%2acVwsD?szIZ)XN$#b-c)}9y z_LU_f+_*AHekG6+gUpe56GV&I;CtLaY&BhFY(nhl&E$BFCgia+G;5po+ z6fm@uRm)GhSDAvf>IPpYWX4}i$_YB{$P$C+B@4*4ZUmuo=}-1yUiYh=6R34q9} zsg)D8xwY~U1EvQOE!5bckRy{%N2YA99cC05B?~+$uuhKjMB`cYw}|O<h2Ne~HFASUo#Kl}uA*I`W+wsjbQ}&h*neN=1`J zSu5QwAAqbbG-9?2jZia@S(G zTew*(JT4zc1yI^rs!s>)v1XE>`ppx1k_o3ajvRxl9=9zDl#c%{I&i){G zpqLjdk+gCY0^QExFsRC2l8X$KBye$zfs;L}j5f-d?faFM`m+?uJk=P0*70!oQqeMb zd0UV3ef8&Qc;0zNvA4@k&H1(Qyn%+hq5gA&lqfCbu<;O7;TZ@|_xaXfcH`r+g-Uy~ za0*S5!)t#)T*RG^!cj+!Ck?KhS}>wWxs(AFOXMht0I+|;#J|ILAZ=yH19#@Y<8aw=Mfd%6!E**ZrE&q1C-&bTCh}B9P-XV=48%WBV+4m(RO); zRurq0vD!VnvO1%K>NQMF>TAXn&5^0pG0#3^RJ~>F=lZcBkg8`HjoSD(ja!gBchDG1 zu|t&$T4a&}8aTDw2qJBeZP!eMsrCSB6%pR2HxC+bBj4gNuM8?| z8FJN|k*h^cQDA74zbI^>rhW*LAShd-?dYhC5crg2c#0H(FOt*V1#&<43R(J>=1B0& zLrcFsj)r@d7{@A}-ikFK;>{~{+aCPw0E?P$XNw%D4iz2uS5XrvCXmz2I<({O38;X!mHI+V}q;#Sq1&Wi( z?pDI!mbDg;{yKlCwnV9u3_Ljb|9<|@Mfh(^mD`y}XP2Ul|A|h7N9esoblAJ)G3V*P zL_~+D!|I>qQ%oZ#DMP4ck`nr_mA(JZ2kuuNT2`ox6E?JsaA56Z#lfQSEFK}B)z*eT zZ3`{>1!)cwmMJ6Y)GQ^078fW%LXi*EEmKC5gvRmdv1p~!!L8(YSg9k&BT8Ml-NDL< z`78Hog|8{)V(mWlBqw^>{1Yq@9vYJUD>N3-M0D>1=6Tkse_$c4N?C-j^>)be*{j*ZiKn61qgu~XUxrKDvB z_A7<|2lME7qGcXy5As&TKcQG?)kYh*W3+G_61-q3HndV;of!$UuQTIo#B-UhB|?@^-J5l&3) zCl++gv-j-Tby9xb#Jq_~6H_KmOj?kxk9z0Yo_KYY+QqZGuU7Sky8rr>+}70Swp6{g z-0*+LchCNnA&=p&%Uzd2+14qR)0$zr>C4I=!Pvh~*ypTO`ZWGHDwHCfCB$AnDcVAh zvWR)?$hA#4r}SveIsa$RNYyhZBmO*>^O~0EuSCcH-xN#Dm|8e#6&j(=+(7XUdp8Wlu0Q)CnqE@ zpIt1yw;lf;?4Od7-aVm5GUXPSqgHkES1pSFH@geq^GE2>mpE#p%^3=QM&!=`< zm0Msef>UN*ce>Mm^;-<>2c)F;>z}Y-K9o5BfQ9~>>e$5}-ud6{%?9oC-;^gnf$?n2 zb>k9NdjxXIoM2CC?a!YM-z~RDK51R=7~!4Kgo#O$C;5EU3$OYjJM2{?mo>v;eAR)} zRti3;#8Um!kfo3=Rw_LS3b%TcG$DN#mrM^`_xyh{UAOqDAid>=&9a;jhw6-1lT$@;Kw7)c3Oj357?$;NilXB{m=5gJLRfOUSc zT5PoX5o5B(wkubdCsq{{o~2y`@|B5Q;$;KDdi2CnP(YG zWg%uO#h*e$@?*^~ucKjOH+F}^UiUc$C;vMYkHFdu9H*`#HTE-kXz>7yYm-f|3fmYt zJ*H$@^05+3l^-cpl;%-~yBT8Jg=4T-vpo$VNLyF657qZIrP97|QwCL}sVdb!5AUn! zxEh7Vyg>clw2Y(DT9}aOvn}c5Xm5_Dif}X+p96u7xe7Bi|3y3@YN?t|jk}c*6p(L0 znDt5H_=Vp0`f_1H_J--2iL{D=K9jm9_ln1h5(&K$=Zjm1&G}M(zul_WeJcLuAB}J4 z@XXOxQf*D(Z{2zm`MH!S)-z0Cc*A=7lQ&sf>mb)A<%X@LO$rl1+^)PsfiCrsH;0~o zP>846>Ob$6@njcTy-OKGk-L-viu^ll*rpz)XyIe5?r5;FK;5ZST_Ofh*aB0S&=Jv( zV`>JKok7?ycZku3hJQedJ_e;#Z&tIB1bqZ&X42+Y{RUCRVj%|8)Lo=KgG?)^{1`^7 zX)w~j6Lu=ID7&l0 z=6ZWl5S}ra7M-`;LG^`F7M?LnpvDOEc&fAEds)@YzcFs$ed72)rF1MyZ}cCcwU}|@629Y|qtKh|76+4tm zgvC67ioV96w6YT3mH1ULGY{>|H4UL7#Vmswf3z6M_O+`Khly#x%Fsnd9x6p1q@daDja@X9n7k|;>6j-JenFM zaO3W`_?@>KL&+kk$$0l?Z-t8C5mg6$u@$4(^mj;_%K|bZ&#lALtRs~iv~nJ?pVhml zKE)DBMF*fJ9J2%~&U@(dd8SS}wSimHsribsoA!sRb)K=RvAi}2(|J&GhpYRq=~mhI z20PV%uc$&j1VOwR3kFqS%8H%>7byq%lkT9h3ST=}o|HJrG{Xr|2lDO)Ao`6pQH)76 zZOJodleGx*PX^EbV?#hv|_G)b}anJ)mBt zkthleRb`e=?S2w4mH$w~*~4^px@8#UHml)O_!5>m`vgPSI6A0icZgcesbef+O7LQ$ z1C?m>afC=!!D<~F&(%p+a%vVc{c^w*3BF3g#OjmL62L zLY>d+H3~msjeZ6mSC^<3dD&(RITMipSQE&l>8A>&CIR!8f8HOm_G5JWh-~Cj5J(fg z;{(<*sz~1z{EciqefEUkK(c;o2zM8nf@${-xVrWf6MuR6Cp!D4Wek;;Hog$o;F4Q>Rl;Qpm%vFDn$;@inn9E9M zqSSmkHx+VyOEui5lM$%>i^E*J7DhY>Stz|-X7O`456;@8ZL(W)7f5T2;FUJZ>n1^hG3|c=(HS5 zb+4l0s$N0>#my19=DZhcQ&UY?!ubj_P~lLgQ&I$Mf^Y}qhBN^x&p82+<_&$JD5FYn zq3lnYC{KNp>wj-4J@Df%}~413%x}CS%3+2_8ExS+$_v=s|b#z#@p3YmcoWQ6rX9F^Y5TlgkkbI{3o)hO`v{*ln3M?Z%-2~}gEZQm*Ub@5t0NIkv9tmpj` z>GWZv4c*v_Yw^S~@w&u@+2(U>N1Meknobl$?r-3uavwRbh@7imrKc)P_qo52M&MvA z^IRsH2qs3;<(VMk$X>UF( zCu@aq6plL3*%3IhcLXWK7pb-u@_AZ~q>>qGI?LvCb{jP^!A9A$VT0EFB*wc+^SSU& zqrKChXzIIKl97vp@kqK?UCVhlo0~+zwEZXy4?cWkzZVu#^K=*v&dU(08>gf2xnY)^ zHX|9e&EU4xNN!6YA@pfWl>Sbt;bqv29%7GLCh-Nd3@V?hE~724`Gt`)&CEYUF_tz> zQ5V7-YPGkrXw(!n3tw4G7^*(*vd&Hebyw;72@*El7(l`@p6yws)`_&S1Xjd0>bJ?V zn)dXCA}+%le2-e@kUbUI+uQGj#i&pJ{az(rUtx^*>_(DM(|S`VYo@(N!F1MqB}~ZIg!zZji{f$O5}^E)OZ(O_$~OSVz~vnW1YZ7RuI;=9#U6wKMx-i zdlUd;uq@B58qRiQi&VQ;6$dYZNZ9uSCb4NVH1m)*OwrT;>xu$O z)zOGf4?6%E-sbKK_e*Yr-(a$?g#vE+yU5kW4#|C=WilK-+30e9ZlfJvh|yqO{_VGX zuk&3|YT`-{=@q2|@OD7f6X?R?Exc(wSNY-^*kc84wpmO1IkM5A@ts_DH2G(d!v_6i zTf^JMT@+o9)mh-qKetD>kqoqXHR#OwjUfqRdf9uFTMmt@6O8_eyvwVh0h^zKtai+U zpwC_nof_HXp9- zQ=jEVbc?6GYJ*=Wl`2XkRXv7=>JD+)Se2`FBsNui1pDlF4r>58E(?5MPKe|fWrh?E zfc?>DnlTdR-qT&^t4xMGv8T9v=mj;`nBiw9<6CghDjtX2{fZJcsEaszz=CXV4)vOR zVH@E5qj9_4Ze<1EPuEzv6lFw9biQ`ty(w4DIh86ZkcN#nqu{zuzeb~emnS%I zny;;S&GaX1$av$C14!e3vmwu5M&K2G+Wd^VnF5|s%ej1Xy2_5rH27f)($UgYKVA_2 z6*r4?qjkkpVW8}D4!l`O!(O-CMGa5uR%|=koM#@!4QrJySE8{sJG|xt|A^1Jw#kJI z!rT086McTzqU)V0><8LA7=EiYNO7X*9n@|;j>^7MdgJItZsp+(G1!LaNmtBIj@P<@ z%t3-vz3L_@6Q)i5yU>~Y9)zFN79C+9)85Y&_`?_E!Ki5u?R>{f6m<}4uz3_5ZQXFW zd;tE=aE~d8<{tpv!-ZQz0rSBjt@9a1Rd4Zm(lz!kc#FSuH7JqGU15d~ksx6CPC z(OR$zErH*ud;1wYIWYkJK7y1VZUa?V{8CvJZF7ol5VAnQn6Lz#t~2!4_)GkdXj)0li#`(?!>G-co4_qWCx!lT%{~@b#*f z6ng!XdKcTLt79s9RZ7I2Ph))Cw7J4G)K!1G-8JDk?p3a$PMRfwnzq45DC=QLhKI8H zis=q2YDCW<-(e}=Zsaatyw@JDzZIrxbrR3=U2fsN5I(HT&E*O=ggs(>kb4bWtlZ~U zQdt%;Tu;YfMPuwPPd;dBw}UwOSP1mN5EauBPJsB@8SDk;JXCo33pIufzGi~(wp)M@j%ZqYWZE>|43p2f-Y?t06)a5oddm=c z?6ip+n>n05XHc%w%$?sikf?VKeofjrgb(1+CsEoCOK&|Or6IOkDY|1#@L6PIA94hl zgN1KfoMq?ZkZ7eJ}78?;52JDZgQ+ zII5nlhOq^@iRF&->+Md*p^N&RQUA`(%;Z{!$#EmQJ~p9c=9pf(!IP|7-I*{lPJL(2 z=hUzB3EahY<}fP#9&-$RGMO%)#szMLUTf3tr=2CBIcE+!)ASvte*fnP1v^(GGQ9Cu zHQ2BcqchVhAIrXl1QNp4#d>_YnjMXF6uh8nDcoftUMl0o90aXND zR@Wim?~T*L;_ZYmhvhOZ2*0WG*#2uATppGMZ}M*{?Vtpch|hbwQ24cWpz%}jywVyN z!HxGQD%snaWJq0vv2Wv%+hnRbZ;GTHR(yRTzrkzT1(W?913GU-3-!3E6?PmFU|T#2 zD)GmKQ=Oosp~RpwxkpmJ%E-0;0UD;5@1)Wh5Ev`{a2LW|dhk2n8*Z_iOIjuMd7 z{tl>17eAjIRs+z?)4D+yF~U5C>OxE*Tv}XpNwBOI!bySi=%Mzwn$+Hu&xHpBN|pu2 zHSB7NZ;v7%*ELjBfGnMgU`%3FTW~%Xqjro@bs#9&st3Axp#N^#^bYJg>w}0$7Y3m> z>4BzNstGWaLq+J?1ExW5$~uRaDeTWFvOz=`>9Cios^ZWYUF_(ua#TF3h8plOY0U5H z?JECBv>O8cMMZb95Z5o##e3%#@w@*P&OiHMeK{JHH1-JXd~kkn>J5J z%o>p(jL2eIWLB;*@-U978=#Q5fYGCjuhJz)b|60TVv~LK-S6Eak zxe+6D>O;RMY7R5S8|L~9@af$W|JiOj89_A*p=3*DLmE$bO%21-=hEtL)EQK_QR3d} zSuTrUq*m!h>O)*$4WzQQatxIYM|6DhFv*IhB1JBN(r9(CIe~{)0u00O*g2Fp%-oY3<8kh8AUH?7iQB^r3j)VXCp*yR?+M&~ znvbG;I5|8{=6F*QHQ#C}q{0(Q46bcMmzTFi4OCB)NubCQHBz`wr1~dOc=G*_x%#T9 zwM6Pe@%Li_5pZ7Vb;tDpVBKfFR7 zP}mjm^zr8*`M<`iVV@(ifLF_`v~ennM)#WdV(uO81iwn}qRy&hQzQ%>T{xWSVTwaQ z7xCGtRQ0-FfG|aZ-vhaX*iR;gCj$2ua;s}7!FRXejXLiNM9Y#5k9wTv(Vjt6*1?qI zs*AKzRS7zkmTw*o=gv&FG%UCC@F&?yAd{~1?qT6@>8lS57B6iGe7413UH5e2Qt^ID zxED<4eP3@rqV$!|t4Xx`K@2HEWG##2aVgM*Sr3|$yn!Bs9zg^zMw$7dkO4GNv<}j` zVICR=J2Jz&#&`MwoJ-5aB0^&+sdNLruYgWrkk{UunSyO_t#?y5j*g z6{UabpR$*sTa_;;a3EjBSg%`Zis3?cM4Rq{m@%lbVHNoB+C`kgC20Jydte+?&%*~B z9S6kTy7XiRxtME-)Nzkq*Vkyyp%#@@v6xdg^M@(KP1fqCbdz;+E9EUhOiLF(EuRiG zx)(uR6_6f30uezjO@!4x|4Gv*sD3@{=$yt)uxg1`k?AFphH__w`}aqBnr$?h;Nf_4 z3fAK#mB~-ShpS(vT0ouaK_An+)Y%%CGE?~h)L!>9VocRTMK0gEb8i&(3M3lt@r4R2 z;%kHh+f1QQ{sxXj_1utwk&#ZTQjxNL#08>FUjs&4>@pQ15~435RNrl}Lf@Xf&rhex ztM8if)ys&MwcD12jzns@L&8eYa6g&0tTvT+b%SG=U%@q6V#^iAePB0cr^x#VI9Dn; z%P@?(8)y9mU)i|)xG4n2j&2~t`-43~AgX!P z6wPwHa<^sK_6{Cfe}}tWc;g}wmR8YoFe#7RY_SQU5;-?v3U#h7Z9?2>{Rxo=v9Lys z)umYPI=j9uFkuT`XE?OcG+18{(X(X=PwK{Q%r$8-^PU2eVmTs<`mC~~Q20|2vWS!N z0C(A47Cvwr(Bb7Y>{e(n#F@jn^62RQAf>Oz_<2|GHyFpG1zEa0&wvxeNsdZ)N?gsp zrTZT%yi8oR4cvv5@wHUB9-*Sfd9d*tw?d~&w;_a_NeO+-{mA;9V%C>@G|yla$t*{| zGQjiL3PVYc+SGd>OR$I4s%Kz91;ld^l`lsI3bEn*33OM4l6-Ll(rAkb?Kye-i$deX=l~Dt^Erd_>)mN+atJ zcrbzh%W2IRHNADQDxGU7y@WTMfsy-O4>rL!lVEAUNVn4bmtf!RIg0A^lnUM9YIP!G zuxf<>8`26on$rxwV$NRS^Yk*hqH^=LFP;0%FIivo)3z0xJt7@-`z2DLzrsC^aonwH zSrlqrsKy(IDR|SPiKC7?mBG*Y3>)-|t(uT}6GnsPVkm5iuKDZ8h z>qh?`2sVWpxVP=_>cYYALN6lAgB#7<)gjxvptiTY3;NE7;MO=+sH&^V9)@Zj#eG=P zPOvr1qe(7eT%?UxJRX_Nvm5 zTXjQn91O`Hknw?;K$h7rkfnN9tKuh9jBC0dAKiAedOsG5?WeI=P;vpm#8wkFTQ><1 zr(g6T0!4a?jLy0hJA^27HW2#YBY1qes4hKkD)wdrz~l+0pl?CS7O z6eYXOmuvO6dHl7f*Dt8P$(Tg(&7d1EzgiUjDfC<{m%$Eop0#8f_!rEldo6u#g&4lU z)8QTtMXX!@o>@Fo0}Kan5)oh#=?)vtVGtTjX0=ssm|%H7rx*>3QBe&yG5S%mYM#TF zBw^dj5{9h5$=7S%m+cm#D7y~1C)}4Hr(y;}a7#nCQm|Z#^_~?>Morn?Jc&Bd>~Jpu z7wE|li$!>sP|+>Rxt1cv!~X9eSQ-yM0T~H=sd^~y{y54#1Af1_$S)lW)O^9$RUMA6 zAho@Gu<8oNq-LRIF3g z{LSHQX?HQ+teJ3s7@V!4hD83I1pfapr9;`y^r1xqrA$&D68X%xqX^L-!F4@!?PrdG z_qUo%Pf^*Iq7|31yjY`5q-C8DHAXyWxHp8G{fb|>@E+Ws8_h@fa&#e=Sh`?^rsO6H zKGw$9%l@Vdr4}_)6py&zo&$QsCq&oGSlG2w-F#o(PkkLhU&;;DvP;Z0ODXrff-kem zroo6>+|Rh<&~Vk=MO-KVcZKs5F5DGrhJfc`MLh~q-2uKc#B-{a9qd=Lpf<#uZKcY4 z)Ul|eP}fh;SPLk;-eiW~40oYXJg zl+gAmcAR|>XG^%OnRsTp8kZ8}AV#Y48{emunex_9<@n zZIF@Z}y#>nGx1~0qMqV(Ju@NUv$s(>Xfn=b1Y1$Ry&wW?g!}JTg>ad zd0*DPMqap+H&s(#AH*Bb@huVAEX!C}AbK)e?yaD~b0A1XOrtoD!VGO=V)yurb>l>k=e7QKR7ZzEhpRr6}tudxkbqeq1cd!gw4exB8 zld=pe>Ut(hU9ve1v3uydr}3=I^ui;^Bs>*}?@UaNF@Mc!-$oLryR%xVXRK2x_NerV zza#js64C2WK+i$fN^MpL+nRmIPjCrers^Lm@cJx&2dPbIb3b`twgbM{5Ra8WT|S*z z1{M2GgcOf9eMe`vLvFQ-M5AlfBp3$S2udJ@7!RSm^%Vr%C0`E__t)S@4bQ-=JA-a2+t)yBUQhR1?aN3 z@KF!PIzNliBUuDGr6HF8wHTsRSS(RvXiE|dLY|kS1y8jE`D(&_mWBxEj?ZtChk1=j z>l({(KOW#fx#@T@-ubkp#;H{t_g~VHhIdobxW|blu)(09-H&1N>lYdA)G!nAj%3(O z4?)XB_cvP^UR@E*-Ocg%eB4~00(AHnk#e6y#zdmU6t1N;`=7!~$rr>R*Sin%2*aJU zx72hC9oge&rfxh}E;e0ai0MN5i2UmMtFRC)KR zDep?lawa0DvD9Zc+|t}(=JD(cZ;%lmrbtA){~=M%L=ar09|#U1vlL352*HF{NC{72 z-RO-0x2ok4oWYR$vklU4<6ThD_4M8Z^Yh;JRotp(;&Y-qbIhx~_L?{P+v4bm)U_uG(DU9kpV_-B1U@GnXMy~!D!V2I6mXd+rhmclY88ESW-~r3|;vVIjN1m z`AtWJ#BT>xz5`1Lw)}9CB)kj(Sq}py4GtXE#^UJmuW(`Y9RA#U%}Cjp4tcm`I*MR{ zHHfdHB7L0)>h99rJmf94=EWKKe^i_4^=qB?V8-=`vA(9-G|h~4EY6#H1U+XOXi{G} z)IEx#8i~gQ_G8&_9pt+H0)sl$oW^BwF(+U|7ZEpMukp3|y9nQP$N*#h2xa@yKNH71 zmOiXyF@N6wRoK}_M_Ha}oOejl$t3g47-OKFU$ zB61M2kxCZRpokRt2qxwh;lPN1wtPhj(gOh^P>U213f2}Y4M^K8)DVQa>MHE-e%_e@ z&h9z;4~O~4`#$gUaerL*b={Mg$Jh0TZsu$KW{!m4?VZ5=w!(6%A;us9tk+41oPG*_ z<(N;408Bqju9J3eLBJ3+ydT&a4ANwTDr(49=k!h^)x9n1VkQ8mVj(s~q; z_<>fa2*n-&5f0PukfD5^d8)n&e#!c3PNY&xE_}c`b!3tJ(jhq8`G>+`ROkbV{bgzc zK!FkeU>P?L-?XsRpX!ESO;;e30??;OSt~~}8kXhB`6a!Tm(ho5+UrS^5Q!#ev8ba}2u3?=>fi5GBgi`ZI0L)H((W zxn{RV0gpg07d|ds!v?Sf-57JLbq(wwo7)FJOHe+{A(kW8jS)_)<}(gti6vI4>6h?o ze=5MTg|DZtjLVd`)kOH=KM;I&?BYiTq4(7}mRNAVCB8|xop-}K{fjM`QG&mVFX0j3 zxof#Uln*@EvBO`eH1SB;oaj2;*($HMkUFJ(6C1i|vwxU^7*MM>!{D}dCYn>`5Y|s* zvxa)fo5gWj=JHa&UWJ_C$XaizW;27ObE7{)&a9@cYnM8>(VwpdCX%C<`)r9DTGLI` zBXf#OUpcwnPtBr~&@`il+h-jq)IiMMDa8n@Lt1wMJ=DL{90ZoS@ZN1n;zdkH6Tda2F9jn8*Ju z>6vU!^M*QkbC>@)X&Yj;v<@+CQl4WrK>&_|-Gk)IZp#00c}9%Dh0H*(Kpy z0=3tmfQ=nykmnoVY2$rUT4xzW2n4OfO@RZhH;GbJGd&OYa`TIh;U>Z!!@H3gb@_C# zDBnK~z`Ik)8bmr3icD6BXqiSVF_@`2+yD((!FW zIr3aItpWk*PlXDedi7A#Al1dD);ZwXk0T$^duh7Q=V_;5X(@5h;ZpBVX~>}X+w@(- z85^ould7Sjsw#~Oj>}(e#Rx=5Ph%8jju6wD?qL^Ov)^C5*%BHUzck864` z!}dL7aI=-lWla`zynI-qop+J7z(=_X0~;CqqIWp!G};2eurNoN3O%=$!lC|jF&Dbl zIm~JYZR;M%#N!nre9(Rl%L6w_;WTHVQepN;E z)-Z(cE-}01Og)%AcBC=JW9Xk|9@0FV?XiJ1h6}r{PK&91G3P={{@TGtn(fb*$ssgR3rEvoHa-r#c zM0W@n;9e=iR(E6USESV=e%)4eNN%r3N%hoOe5h7(^ldA*iiX7f0qg&FYOPOm zuMG~Ma%hz(iU?;&-b6!4`5Jx6n*NRdU8-bbfuEH~*wZ^xI^KvIENRe5ng?&E<5?y9 zpv}c=kL(3CNUk(m7DXdBk|xS*7n_&F3aK*fVa8`6w#J9d6b*mbwYOR{{u!CE*8hX% zvSba}g0keeh6V>rzQTG-lOQD4Ft@fuM|$d&^HbtfnepXSbg5t^3Hy-;xxxNw6IOG+ zRsME}!x#;f3hl{#p)r8q4PG%*@Dr%QRc3*-JZ4(q3!*yPX+slfdW^k>IIqUdvo=lR zh{60JBe`BScGNBH+jPX_c}uuvLu8X!t{h#WGo*VeW1>j7HwOQXll@c70_Q0=e5BA> z>^duZ9asp3Ou->}{q1Odj1JPk5RXuwJ$_0_N@TBmW1kj{?~tnDtlyMbxV|VOeP}ci zr=w?hxqrCc*Q>&v6nUq}t5!G7rNacL`3jvS*W27&>0C=DJ?*EYRAi442)27Y&fiv5 zdS)^;WR%yE#yY1F&V8Zq)H3(@anz7mJ#I3c+L(V1%DKao2Ab-a4Op}`E1+a{&NGSu z-J-f|7F>mvW&h5;v#{2QTHLte-j-|wuHG;H$HaLM3@>5!zj`Z4k5|4j=6C2GeM`y0 z#p=WP;mDVL!##BBw1}}S^g>vNG4(UO82ZNq%AREsh%R{aL)5mY=_={|;I-Jg4*a2&$pxO+Vnkx**YLeI9u7J^GC2<>;e|^3)U0N2QFk0FCGY z%U!2IAj%><&6#WQ@I8`Iy39Sz==aYt2iU#}dQFcTWyy82dk!C18GGoC#Bm(UncSva z27Ht_Qu>cHedEuuPAg=_z~rAw@Lx&&rajN@g5%8;Jc?=AwAAEAQ^U5Qv{joP4}JhEZY(>gSW%sH+6;gJZtvPtM*bubJO|d&yB<0Jd89112 zGAEE^X+ms3glG)(Pmx;vj6le#cWu}CuX}Egcb+ld^1N#0IU8I~f6xgGmWJn;cPqT? zUSLw-(^yF}DPJ0!-EwJyZ^6`>zJPO5_;a%Z*KYY$(dxQ4{)C+k{5{;bWkkt9P$e$p z-0`BBtVzQ#seF-r0N7eC)6NF^O4^IeuuXx;cQmT_5rEP<#aQRam#tuV7G;Y8cVae> z*5hS+$^ahfP?EvDVAf+8u`3(ep_U4woJ=vN#egZZNi!36WY6Buq6mU5$8 zry^Yrn`$@2A(Sq4lbpe;u=bYb)wU9IX47SxLSvTui)Sb1DHPEnvp_248zOJ6P*<ir8LB<(?(9bW_%1_O++o&G&vzpRxW2Y5SvVv6%RsqGQ3o{?ft|dGUX-C z-?(*zPFvOzZ$x0|Pz4!T-uJD-rrE;o3$z|(;ThW%Aw@QQkf>spO?qg?2pc9{@%41+ zd5tn2SRul$G zAlAW_T*r#YC3*?~u_q!Zz+HF;y)7Y~GpTCRvF7=$r8d z6U(`z>(?VhMd2o%*mBCcxA8&BHfHRTSN#u3_g2n;{a<*rSB>xjXf~=wI{Pc`XK9{n z9Cn)!w6mWhgyS!_@F{|dxeC4KyX%9RsnRSrhRUXD}_onOh4ZS<~+iDJ@T z*Dy=B424mJ`V%z~vkD{2$}rNt88w47={>s{?&)3Tp!7LU5tX!Sm`pUPM^~d#4o#yj%7uC6J{SLQ-@y%tVal{(Q0Q81 z)Nz`C-7R~@Yvt9IxHRz2D4Fvgu>KeRn!*9XxtkHhoB5Ky-8?TfZxC^Z-ZB=(wUwo8 z!G;t{v4dK}3g@GYom4cMwhcv8wUnXt*RT@hi*!*ZOV2*eFA}sY=`2agYgKhvfxd+; zi4d1J?BzsK`QvkMhv72^DWGWE`Ic zkb8(OE`X^`-NP<_{;;7#Ni$hP!C}_Y!nbZ%^la}^>3^8*bCqGB8u6NUh-y_Sswi)X zoIJ!gz&F+?9Va9?cbj5|F6c@+!u^d>)lxD)b)$q%+q9sHvGuh~;V8eNudH~Rto!)` zT!Rpp{ObTyXv^WKC>7HvX26@l{3zXJYt1j!lK=_+Mxq5<%mecp=1D{r|0vwg_!(&n8p`ZNYJ$49H5FBMBUI5GuvWeT?8rRc71iUVhkhfm?=<$Z?o7@LVcf(oX0qIb!+`s#jcsIxG3lMoOh)C zW99f!PMD3I>W=bW`W!`q?g8lSca)u;bAYIgzDkC4Pi6n;v7LDroeKod1RI0he#wSnQ?QH9S5i)5^#d0Zx~doxUv3 z0Z1qCyF6nOrwGhvIw+P(uW zaIOUZ&UNgG&iR|hi`uIPHgjJ&{8uzFBol0Nyu?TN}(d>1~o1G7D+xoIA^=WY0*uyvw){?A5dT%H|znN?eqI!#YP8*`o z)bK-(24Km`y%`~Ay0IgGD-~J>rg6)16S|()#uZ-R>vQGhnq-u5wO*P-eN6mB)qkp_ zP8CE*h_FakmOiodsBHPoJ{UUivOilQmt z{PS`u`{KWGysl8~$v7$myDUqh28R6?oTj3ETqURFH#w$&5C9i|OL%MYf-olgBEuI?}j{flNKN*M=H4K+pb! zi&x(XoOpz`MKb$1YT?!hw}&vFvHTA4dQV`565cF*6LH3E$;mRWEwNv`!{>`#YC&iw zLWbZ7j?@wDZ$I^ZUuyH|SNOe>M`?)v|Np~JSoPa}C5xZ+QpN$zQPYC-@qVNT!fuZf soFzBi4_>`7i_T5mMHG;y=L7ctsmST)w$*GtweD6)`K~iy-3Z6|AM4eG`v3p{ diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index baa8804..9ecdad1 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@

- + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx index e16c24b..8327805 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageAudit.aspx @@ -53,7 +53,7 @@ @@ -66,7 +66,8 @@ - + @@ -214,7 +215,7 @@ - 0) + { + TestPackageNo = dt.Rows[0]["TestPackageNo"].ToString(); + WorkAreaCode = dt.Rows[0]["WorkAreaCode"].ToString(); + SystemNo = dt.Rows[0]["SystemNumber"].ToString(); + TestHeat = dt.Rows[0]["TestHeat"].ToString(); + TestType = dt.Rows[0]["TestType"].ToString(); + } + ws.GetRow(rowIndex + 3).GetCell(5).SetCellValue("巴斯夫（广东）一体化项目"); + var setStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 14, true, true, "Arial Unicode MS"); + ws.GetRow(rowIndex + 3).GetCell(5).CellStyle = setStyle; + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 5, 13)); + ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue("BASF (GUANGDONG) INTEGRATED PROJECT"); + ws.GetRow(rowIndex + 4).GetCell(5).CellStyle = setStyle; + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 5, rowIndex + 5, 5, 13)); + ws.GetRow(rowIndex + 5).GetCell(5).SetCellValue("试压包流程图清单"); + ws.GetRow(rowIndex + 5).GetCell(5).CellStyle = setStyle; + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 5, 13)); + ws.GetRow(rowIndex + 6).GetCell(5).SetCellValue("TEST PACKAGE P&ID DRAWING LIST"); + ws.GetRow(rowIndex + 6).GetCell(5).CellStyle = setStyle; + + var cellStyle2 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Top, NPOI.SS.UserModel.HorizontalAlignment.Left, 11, false, false, "Arial Unicode MS"); + ws.GetRow(rowIndex + 9).GetCell(2).SetCellValue("Test Package No"); + ws.GetRow(rowIndex + 9).GetCell(2).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 9).GetCell(5).SetCellValue(TestPackageNo); + ws.GetRow(rowIndex + 9).GetCell(5).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 9).GetCell(9).SetCellValue("Area"); + ws.GetRow(rowIndex + 9).GetCell(9).CellStyle = cellStyle2; + ws.GetRow(rowIndex + 9).GetCell(13).SetCellValue(WorkAreaCode); + + ws.GetRow(rowIndex + 10).GetCell(2).SetCellValue("试压包号"); + ws.GetRow(rowIndex + 10).GetCell(2).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 10).GetCell(9).SetCellValue("区域"); + ws.GetRow(rowIndex + 10).GetCell(9).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 11).GetCell(2).SetCellValue("System No"); + ws.GetRow(rowIndex + 11).GetCell(2).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 11).GetCell(5).SetCellValue(SystemNo); + ws.GetRow(rowIndex + 11).GetCell(5).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 11).GetCell(9).SetCellValue("Test Pressure"); + ws.GetRow(rowIndex + 11).GetCell(9).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 11).GetCell(13).SetCellValue(TestHeat); + ws.GetRow(rowIndex + 11).GetCell(13).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 12).GetCell(2).SetCellValue("系统号"); + ws.GetRow(rowIndex + 12).GetCell(2).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 12).GetCell(9).SetCellValue("试验压力"); + ws.GetRow(rowIndex + 12).GetCell(9).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 13).GetCell(9).SetCellValue("Test Type"); + ws.GetRow(rowIndex + 13).GetCell(9).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 13).GetCell(13).SetCellValue(TestType); + ws.GetRow(rowIndex + 13).GetCell(13).CellStyle = cellStyle2; + + ws.GetRow(rowIndex + 14).GetCell(9).SetCellValue("试验方式"); + ws.GetRow(rowIndex + 14).GetCell(9).CellStyle = cellStyle2; + + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 9, rowIndex + 14, 8, 8), ws); + #endregion + #endregion + + #region 表格部分 + //数据表头部分 + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 3, 5, 13)); + ws.GetRow(rowIndex+15).GetCell(0).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None); + ws.GetRow(rowIndex + 15).GetCell(1).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium); + ws.GetRow(rowIndex + 15).GetCell(17).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 3, 8)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 15, rowIndex + 15, 9, 13)); + RegionUtil.SetBorderTop(2, new CellRangeAddress(rowIndex + 15, rowIndex + 15, 2, 16), ws); + RegionUtil.SetBorderBottom(2, new CellRangeAddress(rowIndex + 15, rowIndex + 15, 2, 16), ws); + ws.GetRow(rowIndex + 15).GetCell(2).SetCellValue("No\r\n序号"); + ws.GetRow(rowIndex + 15).GetCell(3).SetCellValue("P&ID Drawing No.\r\n流程图号"); + ws.GetRow(rowIndex + 15).GetCell(9).SetCellValue("Drawing Description\r\n图纸名称"); + ws.GetRow(rowIndex + 15).GetCell(14).SetCellValue("Rev\r\n版本"); + ws.GetRow(rowIndex + 15).GetCell(15).SetCellValue("Sheet No.\r\n页码"); + ws.GetRow(rowIndex + 15).GetCell(16).SetCellValue("Remark\r\n备注"); + ws.GetRow(rowIndex + 15).Height = 40 * 20; + + style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 11,false, false, "Arial Unicode MS"); + ws = ExcelCreateRow(ws, hssfworkbook, rowIndex+16, rowIndex + 50, style, 0, 17, true); + + var dataTit = rowIndex + 16; + + var dStart = 0; + var dEnd = 0; + if (i == 1) + { + dStart = 0; + dEnd = 34; + } + else + { + dStart = i == 2 ? 34 : ((i - 2) * 34) + 34; + dEnd = ((i - 1) * 34) + 34; + } + var pageTb = GetPageToTable(dt, dStart, dEnd); + int nextRow = 0; + int lastRow = 0; + for (int j = 0; j < pageTb.Rows.Count; j++) + { + int dataIndex = dataTit + j; + ws.GetRow(dataIndex).GetCell(2).SetCellValue($"{j + 1}"); + ws.GetRow(dataIndex).GetCell(3).SetCellValue(pageTb.Rows[i]["PipelineCode"].ToString()); + ws.GetRow(dataIndex).GetCell(9).SetCellValue(pageTb.Rows[i]["SingleNumber"].ToString()); + ws.GetRow(dataIndex).GetCell(14).SetCellValue(pageTb.Rows[i]["DrawingsNum"].ToString()); + ws.GetRow(dataIndex).GetCell(15).SetCellValue(pageTb.Rows[i]["PageNum"].ToString()); + ws.GetRow(dataIndex).GetCell(16).SetCellValue(pageTb.Rows[i]["Remark"].ToString()); + ws.GetRow(dataIndex).Height = 14 * 20; + ws.AddMergedRegion(new CellRangeAddress(rowIndex + dataIndex, rowIndex + dataIndex, 3, 8)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + dataIndex, rowIndex + dataIndex, 9, 13)); + ws.GetRow(dataIndex).GetCell(1).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium); + ws.GetRow(dataIndex).GetCell(17).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium); + RegionUtil.SetBorderLeft(1, new CellRangeAddress(dataIndex, dataIndex, 2, 16), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 2, 2), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 8, 8), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 13, 13), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 14, 14), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 15, 15), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 16, 16), ws); + RegionUtil.SetBorderBottom(1, new CellRangeAddress(dataIndex, dataIndex, 2, 16), ws); + nextRow = dataIndex; + } + //如果pageData不满足33行数据的情况下，将设置剩余行高 + if (pageTb.Rows.Count < 34) + { + for (int k = 1; k <= 34 - pageTb.Rows.Count; k++) + { + int dataIndex = rowIndex + nextRow + k; + ws.GetRow(dataIndex).Height = 14 * 20; + ws.GetRow(dataIndex).GetCell(0).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None); + ws.GetRow(dataIndex).GetCell(1).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium); + ws.GetRow(dataIndex).GetCell(17).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium); + ws.AddMergedRegion(new CellRangeAddress(dataIndex, dataIndex, 3, 8)); + ws.AddMergedRegion(new CellRangeAddress(dataIndex, dataIndex, 9, 13)); + RegionUtil.SetBorderLeft(1, new CellRangeAddress(dataIndex, dataIndex, 2, 16), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 2, 2), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 8, 8), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 13, 13), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 14, 14), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 15, 15), ws); + RegionUtil.SetBorderRight(1, new CellRangeAddress(dataIndex, dataIndex, 16, 16), ws); + RegionUtil.SetBorderBottom(1, new CellRangeAddress(dataIndex, dataIndex, 2, 16), ws); + lastRow = nextRow + k; + } + } + RegionUtil.SetBorderBottom(2, new CellRangeAddress(rowIndex + lastRow, rowIndex + lastRow, 2, 16), ws); + #endregion + + #region 尾部 + + + ws = ExcelCreateRow(ws, hssfworkbook, rowIndex+50, rowIndex + 55, style, 0, 17, true); + ws.GetRow(rowIndex + 50).Height = 18 * 20; + ws.GetRow(rowIndex + 51).Height = 18 * 20; + ws.GetRow(rowIndex + 52).Height = 18 * 20; + ws.GetRow(rowIndex + 53).Height = 18 * 20; + ws.GetRow(rowIndex + 54).Height = 18 * 20; + ws.GetRow(rowIndex + 55).Height = 4 * 20; + RegionUtil.SetBorderLeft(2, new CellRangeAddress(rowIndex + 50, rowIndex + 55, 1, 1),ws); + RegionUtil.SetBorderLeft(2, new CellRangeAddress(rowIndex + 50, rowIndex + 55, 18, 18), ws); + + RegionUtil.SetBorderLeft(2, new CellRangeAddress(rowIndex + 50, rowIndex + 54, 2, 2), ws); + RegionUtil.SetBorderLeft(2, new CellRangeAddress(rowIndex + 50, rowIndex + 54, 17, 17), ws); + + RegionUtil.SetBorderBottom(2, new CellRangeAddress(rowIndex + 52, rowIndex + 52, 2, 16), ws); + + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 50, rowIndex + 52, 4, 4), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 50, rowIndex + 52, 6, 6), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 50, rowIndex + 52, 9, 9), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 50, rowIndex + 52, 13, 13), ws); + + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 53, rowIndex + 53, 4, 4), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 53, rowIndex + 53, 4, 4), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 53, rowIndex + 53, 6, 6), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 53, rowIndex + 53, 9, 9), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 53, rowIndex + 53, 13, 13), ws); + RegionUtil.SetBorderBottom(2, new CellRangeAddress(rowIndex + 53, rowIndex + 54, 2, 16), ws); + + RegionUtil.SetBorderTop(2, new CellRangeAddress(rowIndex + 54, rowIndex + 54, 2, 6), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 54, rowIndex + 54, 6, 6), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 54, rowIndex + 54, 9, 9), ws); + RegionUtil.SetBorderRight(2, new CellRangeAddress(rowIndex + 54, rowIndex + 54, 13, 13), ws); + + RegionUtil.SetBorderBottom(2, new CellRangeAddress(rowIndex + 55, rowIndex + 55, 1, 17), ws); + + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 2, 4)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 5, 6)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 7, 9)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 10, 13)); + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 14, 16)); + + //合并单元格 + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 53, 2, 4)); + ws.GetRow(rowIndex + 53).GetCell(2).SetCellValue("PREPARED"); + //合并单元格 + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 53, 5, 6)); + ws.GetRow(rowIndex + 53).GetCell(5).SetCellValue("REVIEW"); + //合并单元格 + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 54, 7, 9)); + ws.GetRow(rowIndex + 53).GetCell(7).SetCellValue("JIANLI"); + //合并单元格 + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 54, 10, 13)); + ws.GetRow(rowIndex + 53).GetCell(10).SetCellValue("Worley"); + //合并单元格 + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 54, 14, 16)); + ws.GetRow(rowIndex + 53).GetCell(14).SetCellValue("BASF"); + //合并单元格 + ws.AddMergedRegion(new CellRangeAddress(rowIndex + 54, rowIndex + 54, 2, 6)); + ws.GetRow(rowIndex + 54).GetCell(2).SetCellValue("CC7"); + + + #endregion + + rowIndex = rowIndex + 60; } - - RegionUtil.SetBorderBottom(2, new CellRangeAddress(0, 0, 1, 1), ws); - RegionUtil.SetBorderRight(2, new CellRangeAddress(1, 1, 17, 17), ws); - - RegionUtil.SetBorderTop(2, new CellRangeAddress(1, 1, 16, 16), ws); - RegionUtil.SetBorderTop(2, new CellRangeAddress(1, 1, 17, 17), ws); - RegionUtil.SetBorderTop(2, new CellRangeAddress(1, 1, 2, 16), ws); - RegionUtil.SetBorderTop(2, new CellRangeAddress(2, 2, 2, 16), ws); - - RegionUtil.SetBorderRight(2, new CellRangeAddress(1, 14, 0, 0), ws); - RegionUtil.SetBorderRight(2, new CellRangeAddress(2, 14, 1, 1), ws); - - RegionUtil.SetBorderRight(2, new CellRangeAddress(2, 14, 16, 16), ws); - RegionUtil.SetBorderRight(2, new CellRangeAddress(2, 14, 17, 17), ws); - - - RegionUtil.SetBorderLeft(2, new CellRangeAddress(9, 14, 2, 2), ws); - RegionUtil.SetBorderBottom(2, new CellRangeAddress(7, 7, 2, 16), ws); - RegionUtil.SetBorderBottom(2, new CellRangeAddress(8, 8, 2, 16), ws); - //插入图片 - InsertImage(hssfworkbook, ws, 3, 2, 4, 3, img1, 1.2, 1.8); - InsertImage(hssfworkbook, ws, 3, 3, 4, 4, img2, 1.9, 1.9); - InsertImage(hssfworkbook, ws, 3, 13, 4, 14, img3, 1.5, 1.5); - InsertImage(hssfworkbook, ws, 3, 15, 4, 16, img4, 1.5, 1.5); - - ws.GetRow(rowIndex + 3).GetCell(5).SetCellValue("巴斯夫（广东）一体化项目"); - var setStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 14, true, true, "Arial Unicode MS"); - ws.GetRow(rowIndex + 3).GetCell(5).CellStyle = setStyle; - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 4, rowIndex + 4, 5, 13)); - ws.GetRow(rowIndex + 4).GetCell(5).SetCellValue("BASF (GUANGDONG) INTEGRATED PROJECT"); - ws.GetRow(rowIndex + 4).GetCell(5).CellStyle = setStyle; - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 5, rowIndex + 5, 5, 13)); - ws.GetRow(rowIndex + 5).GetCell(5).SetCellValue("试压包流程图清单"); - ws.GetRow(rowIndex + 5).GetCell(5).CellStyle = setStyle; - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 5, 13)); - ws.GetRow(rowIndex + 6).GetCell(5).SetCellValue("TEST PACKAGE P&ID DRAWING LIST"); - ws.GetRow(rowIndex + 6).GetCell(5).CellStyle = setStyle; - - var cellStyle2 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Top, NPOI.SS.UserModel.HorizontalAlignment.Left, 11, false, false, "Arial Unicode MS"); - ws.GetRow(rowIndex + 9).GetCell(2).SetCellValue("Test Package No"); - ws.GetRow(rowIndex + 9).GetCell(2).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 9).GetCell(5).SetCellValue("UG-130-FW-HT-001"); - ws.GetRow(rowIndex + 9).GetCell(5).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 9).GetCell(9).SetCellValue("Area"); - ws.GetRow(rowIndex + 9).GetCell(9).CellStyle = cellStyle2; - ws.GetRow(rowIndex + 9).GetCell(13).SetCellValue("C400"); - - ws.GetRow(rowIndex + 10).GetCell(2).SetCellValue("试压包号"); - ws.GetRow(rowIndex + 10).GetCell(2).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 10).GetCell(9).SetCellValue("区域"); - ws.GetRow(rowIndex + 10).GetCell(9).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 11).GetCell(2).SetCellValue("System No"); - ws.GetRow(rowIndex + 11).GetCell(2).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 11).GetCell(5).SetCellValue("FIRE WATER"); - ws.GetRow(rowIndex + 11).GetCell(5).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 11).GetCell(9).SetCellValue("Test Pressure"); - ws.GetRow(rowIndex + 11).GetCell(9).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 11).GetCell(13).SetCellValue("2"); - ws.GetRow(rowIndex + 11).GetCell(13).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 12).GetCell(2).SetCellValue("系统号"); - ws.GetRow(rowIndex + 12).GetCell(2).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 12).GetCell(9).SetCellValue("试验压力"); - ws.GetRow(rowIndex + 12).GetCell(9).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 13).GetCell(9).SetCellValue("Test Type"); - ws.GetRow(rowIndex + 13).GetCell(9).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 13).GetCell(13).SetCellValue("Hydro Test"); - ws.GetRow(rowIndex + 13).GetCell(13).CellStyle = cellStyle2; - - ws.GetRow(rowIndex + 14).GetCell(9).SetCellValue("试验方式"); - ws.GetRow(rowIndex + 14).GetCell(9).CellStyle = cellStyle2; - - #endregion - - #region 表格部分 - - style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 11, true, false, "Arial Unicode MS"); - ws = ExcelCreateRow(ws, hssfworkbook, 15, rowIndex + 49, style, 0, 17, true); - for (int i = 15; i < 50; i++) - { - ws.GetRow(i).Height = 20 * 20; - ws.GetRow(i).GetCell(0).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None); - ws.GetRow(i).GetCell(1).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium); - ws.GetRow(i).GetCell(17).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 3, 8)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + i, rowIndex + i, 9, 13)); - } - ws.GetRow(15).Height = 40 * 20; - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 3, rowIndex + 3, 5, 13)); - //数据表头部分 - ws.GetRow(rowIndex + 15).GetCell(2).SetCellValue("No\r\n序号"); - ws.GetRow(rowIndex + 15).GetCell(3).SetCellValue("P&ID Drawing No.\r\n流程图号"); - ws.GetRow(rowIndex + 15).GetCell(9).SetCellValue("Drawing Description\r\n图纸名称"); - ws.GetRow(rowIndex + 15).GetCell(14).SetCellValue("Rev\r\n版本"); - ws.GetRow(rowIndex + 15).GetCell(15).SetCellValue("Sheet No.\r\n页码"); - ws.GetRow(rowIndex + 15).GetCell(16).SetCellValue("Remark\r\n备注"); - - #endregion - - #region 尾部 - - //此处的尾部行数需要根据 得到的动态数据量 来计算，默认写死从50行开始。 - ws = ExcelCreateRow(ws, hssfworkbook, 49, rowIndex + 55, style, 0, 17, true); - for (int i = 49; i <= 55; i++) - { - ws.GetRow(i).Height = 18 * 20; - ws.GetRow(i).GetCell(0).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.Medium); - ws.GetRow(i).GetCell(1).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.Medium); - ws.GetRow(i).GetCell(17).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium); - } - - for (int i = 2; i < 17; i++) - { - ws.GetRow(rowIndex + 55).GetCell(i).CellStyle = SetStyle(hssfworkbook, BorderStyle.Medium, BorderStyle.Medium, BorderStyle.None, BorderStyle.None); - } - ws.GetRow(rowIndex + 55).GetCell(1).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.Medium, BorderStyle.Medium, BorderStyle.None); - ws.GetRow(rowIndex + 55).GetCell(16).CellStyle = SetStyle(hssfworkbook, BorderStyle.Medium, BorderStyle.Medium, BorderStyle.None, BorderStyle.None); - ws.GetRow(rowIndex + 55).GetCell(17).CellStyle = SetStyle(hssfworkbook, BorderStyle.None, BorderStyle.Medium, BorderStyle.None, BorderStyle.Medium); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 2, 4)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 5, 6)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 7, 9)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 10, 13)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 50, rowIndex + 52, 14, 16)); - //合并单元格 - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 53, 2, 4)); - ws.GetRow(rowIndex + 53).GetCell(2).SetCellValue("PREPARED"); - //合并单元格 - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 53, 5, 6)); - ws.GetRow(rowIndex + 53).GetCell(5).SetCellValue("REVIEW"); - //合并单元格 - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 54, 7, 9)); - ws.GetRow(rowIndex + 53).GetCell(7).SetCellValue("JIANLI"); - //合并单元格 - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 54, 10, 13)); - ws.GetRow(rowIndex + 53).GetCell(10).SetCellValue("Worley"); - //合并单元格 - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 53, rowIndex + 54, 14, 16)); - ws.GetRow(rowIndex + 53).GetCell(14).SetCellValue("BASF"); - //合并单元格 - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 54, rowIndex + 54, 2, 6)); - ws.GetRow(rowIndex + 54).GetCell(2).SetCellValue("CC7"); #endregion ws.PrintSetup.FitWidth = 1; ws.PrintSetup.FitHeight = 0; ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; - + ws.PrintSetup.Scale = 85; ws.FitToPage = true; - //垂直水平居中 ws.VerticallyCenter = true; ws.HorizontallyCenter = true; - //打印边距设置 厘米/3 - ws.SetMargin(MarginType.RightMargin, (double)2.4 / 3); - ws.SetMargin(MarginType.LeftMargin, (double)2.9 / 3); - ws.SetMargin(MarginType.TopMargin, (double)2.4 / 3); - ws.SetMargin(MarginType.BottomMargin, (double)2.4 / 3); + ////打印边距设置 厘米/3 + //ws.SetMargin(MarginType.RightMargin, (double)2.4 / 3); + //ws.SetMargin(MarginType.LeftMargin, (double)2.9 / 3); + //ws.SetMargin(MarginType.TopMargin, (double)2.4 / 3); + //ws.SetMargin(MarginType.BottomMargin, (double)2.4 / 3); //页眉页脚间距 ws.SetMargin(MarginType.HeaderMargin, 0); @@ -3114,9 +3271,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.PrintSetup.FitWidth = 1; ws.PrintSetup.FitHeight = 0; ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; - + ws.PrintSetup.Scale = 85; ws.FitToPage = true; - //横向打印 ws.PrintSetup.Landscape = true; //垂直水平居中 @@ -3132,220 +3288,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage ws.SetMargin(MarginType.HeaderMargin, 0); ws.SetMargin(MarginType.FooterMargin, 0); } - //22-射线检测比例确认表SHT 3503-J412-2007 - private void template22_old(XSSFWorkbook hssfworkbook, XSSFSheet ws) - { - #region 头部 - var style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 11, true, false, "宋体"); - int rowIndex = 0; - ws = ExcelCreateRow(ws, hssfworkbook, rowIndex, rowIndex + 4, style, 0, 20, true); - - //设置列宽 - ws.SetColumnWidth(0, 11 * 256); - ws.SetColumnWidth(1, 5 * 256); - ws.SetColumnWidth(2, 8 * 256); - ws.SetColumnWidth(3, 5 * 256); - ws.SetColumnWidth(4, 5 * 256); - ws.SetColumnWidth(5, 6 * 256); - ws.SetColumnWidth(6, 6 * 256); - ws.SetColumnWidth(7, 6 * 256); - ws.SetColumnWidth(8, 6 * 256); - ws.SetColumnWidth(9, 6 * 256); - ws.SetColumnWidth(10, 6 * 256); - ws.SetColumnWidth(11, 6 * 256); - ws.SetColumnWidth(12, 21 * 256); - - ws.AddMergedRegion(new CellRangeAddress(0, 3, 0, 2)); - ws.GetRow(rowIndex).GetCell(0).SetCellValue("SH/T 3503-J412-1-2007"); - - ws.AddMergedRegion(new CellRangeAddress(0, 0, 3, 17)); - ws.GetRow(rowIndex).GetCell(3).SetCellValue("管道焊接接头射线检测比例确认表（一）"); - ws.GetRow(rowIndex).GetCell(3).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 16, true, true); - ws.AddMergedRegion(new CellRangeAddress(1, 2, 3, 17)); - ws.GetRow(rowIndex + 1).GetCell(3).SetCellValue("Pipeline Welding Joints Radiographic Examination Rate Confirmation Form（I）"); - ws.GetRow(rowIndex + 1).GetCell(3).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 16, true, true); - - ws.AddMergedRegion(new CellRangeAddress(0, 3, 18, 20)); - ws.AddMergedRegion(new CellRangeAddress(3, 3, 3, 17)); - - ws.GetRow(rowIndex).GetCell(18).SetCellValue("工程名称：巴斯夫（广东）一体化项目专用化学品二区\nProject Name：BASF (Guangdong) Integrated Project\n单元名称：Citral\nUnit Name:Citral"); - ws.GetRow(rowIndex).GetCell(18).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Top, NPOI.SS.UserModel.HorizontalAlignment.Left, 11, true, false); - - ws.GetRow(rowIndex + 3).GetCell(3).SetCellValue("共 1 页 第 1 页"); - - ws.GetRow(rowIndex + 4).GetCell(0).SetCellValue("执行标准\r\nApplicable code"); - - ws.AddMergedRegion(new CellRangeAddress(4, 4, 1, 5)); - ws.AddMergedRegion(new CellRangeAddress(4, 4, 6, 7)); - ws.AddMergedRegion(new CellRangeAddress(4, 4, 8, 15)); - ws.AddMergedRegion(new CellRangeAddress(4, 4, 16, 17)); - ws.AddMergedRegion(new CellRangeAddress(4, 4, 18, 20)); - ws.GetRow(rowIndex + 4).GetCell(1).SetCellValue("NB/T47013.2-2015"); - ws.GetRow(rowIndex + 4).GetCell(6).SetCellValue("检测方法\r\nExam. Method"); - ws.GetRow(rowIndex + 4).GetCell(8).SetCellValue("射线检测\r\nRT"); - ws.GetRow(rowIndex + 4).GetCell(16).SetCellValue("检测比例\r\nExam. Rate"); - ws.GetRow(rowIndex + 4).GetCell(18).SetCellValue("5%"); - - #endregion - - #region 表格部分 - ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 5, rowIndex + 6, style, 0, 20, true); - - ws.GetRow(rowIndex + 5).Height = 28 * 20; - ws.GetRow(rowIndex + 6).Height = 42 * 20; - - //设置表头部分 - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 5, rowIndex + 6, 0, 1)); - ws.GetRow(rowIndex + 5).GetCell(0).SetCellValue("管道编号\r\nPipeline No."); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 5, rowIndex + 6, 2, 2)); - ws.GetRow(rowIndex + 5).GetCell(2).SetCellValue("材质\r\nMaterial"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 5, rowIndex + 5, 3, 4)); - ws.GetRow(rowIndex + 5).GetCell(3).SetCellValue("规 格/Size"); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 3, 4)); - ws.GetRow(rowIndex + 6).GetCell(3).SetCellValue("mm"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 5, rowIndex + 5, 5, 8)); - ws.GetRow(rowIndex + 5).GetCell(5).SetCellValue("管道焊接接头\r\nWelding Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 5, rowIndex + 5, 9, 12)); - ws.GetRow(rowIndex + 5).GetCell(9).SetCellValue("施焊焊工\r\nWelder"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 5, rowIndex + 5, 13, 16)); - ws.GetRow(rowIndex + 5).GetCell(13).SetCellValue("检测焊接接头\r\nExanined Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 5, rowIndex + 5, 17, 19)); - ws.GetRow(rowIndex + 5).GetCell(17).SetCellValue("实际检测比例"); - - ws.GetRow(rowIndex + 5).GetCell(20).SetCellValue("检测报告编号"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 5, 6)); - ws.GetRow(rowIndex + 6).GetCell(5).SetCellValue("总数\r\nTotal"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 7, 8)); - ws.GetRow(rowIndex + 6).GetCell(7).SetCellValue("固定口数\r\nField Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 9, 10)); - ws.GetRow(rowIndex + 6).GetCell(9).SetCellValue("焊工代号\r\nWelder No."); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 11, 12)); - ws.GetRow(rowIndex + 6).GetCell(11).SetCellValue("施焊数量\r\nWelded Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 13, 14)); - ws.GetRow(rowIndex + 6).GetCell(13).SetCellValue("总数\r\nTotal Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 15, 16)); - ws.GetRow(rowIndex + 6).GetCell(15).SetCellValue("固定口数\r\nField Joints"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 6, rowIndex + 6, 17, 19)); - ws.GetRow(rowIndex + 6).GetCell(17).SetCellValue("Actual exam. Rate"); - - ws.GetRow(rowIndex + 6).GetCell(20).SetCellValue("Examination Report No."); - - //这里创建行数据 - ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 7, rowIndex + 16, style, 0, 20, true); - for (int i = 7; i < 15; i++) - { - ws.GetRow(rowIndex + i).Height = 25 * 20; - } - //这里循环数据 - ws.GetRow(rowIndex + 15).GetCell(0).SetCellValue("小计\r\nTotal"); - - #endregion - - #region 尾部 - - ws.GetRow(rowIndex + 16).GetCell(0).SetCellValue("备注\r\nRemark"); - ws.GetRow(rowIndex + 16).GetCell(1).SetCellValue("焊口位置与检测焊口见管道单线图与无损检测报告。\r\nPlease refer to Pipeline Iso-drawing and NDE Report for joints position and examined joints."); - ws.GetRow(rowIndex + 16).GetCell(1).CellStyle = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Left, 10, true, false); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 16, rowIndex + 16, 1, 20)); - - - style = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.None, BorderStyle.None, BorderStyle.None, BorderStyle.None, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Left, 11, true, false); - var style1 = CommonPrint.SetExcelStyle(hssfworkbook, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, BorderStyle.Thin, VerticalAlignment.Center, NPOI.SS.UserModel.HorizontalAlignment.Center, 11, true, false); - - ws = ExcelCreateRow(ws, hssfworkbook, rowIndex + 17, rowIndex + 24, style, 0, 20, true); - - ws.GetRow(rowIndex + 17).GetCell(20).CellStyle = style1; - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 17, rowIndex + 17, 0, 3)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 17, rowIndex + 17, 4, 9)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 17, rowIndex + 17, 10, 16)); - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 17, rowIndex + 17, 17, 20)); - - ws.GetRow(rowIndex + 17).GetCell(0).SetCellValue("建设/监理单位\r\nOwner/Supervision Contractor"); - ws.GetRow(rowIndex + 17).GetCell(4).SetCellValue("总承包单位\r\nGeneral Contractor"); - ws.GetRow(rowIndex + 17).GetCell(10).SetCellValue("检 测 单 位\r\nExamination Contractor"); - ws.GetRow(rowIndex + 17).GetCell(17).SetCellValue("施 工 单 位\r\nConstruction Company"); - ws.GetRow(rowIndex + 17).GetCell(0).CellStyle = ws.GetRow(rowIndex + 17).GetCell(4).CellStyle = ws.GetRow(rowIndex + 17).GetCell(10).CellStyle = ws.GetRow(rowIndex + 17).GetCell(17).CellStyle = style1; - ws.GetRow(rowIndex + 17).Height = 31 * 20; - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 18, rowIndex + 18, 0, 3)); - ws.GetRow(rowIndex + 18).GetCell(0).SetCellValue("专业工程师\r\nDiscipline Engineer:"); - ws.GetRow(rowIndex + 18).Height = 31 * 20; - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 18, rowIndex + 18, 4, 9)); - ws.GetRow(rowIndex + 18).GetCell(4).SetCellValue("专业工程师\r\nDiscipline Engineer:"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 18, rowIndex + 18, 10, 16)); - ws.GetRow(rowIndex + 18).GetCell(10).SetCellValue("专业工程师\r\nDiscipline Engineer:"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 18, rowIndex + 18, 17, 20)); - ws.GetRow(rowIndex + 18).GetCell(17).SetCellValue("专业工程师\r\nDiscipline Engineer:"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 20, rowIndex + 20, 17, 20)); - ws.GetRow(rowIndex + 20).GetCell(17).SetCellValue("质量检查员：\r\nQuality Inspector:"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 22, rowIndex + 22, 17, 20)); - ws.GetRow(rowIndex + 20).GetCell(17).SetCellValue("制表：\r\nPrepared:"); - - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 24, rowIndex + 24, 0, 3)); - ws.GetRow(rowIndex + 24).GetCell(0).SetCellValue("日期Date： 年 月 日"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 24, rowIndex + 24, 4, 9)); - ws.GetRow(rowIndex + 24).GetCell(4).SetCellValue("日期Date： 年 月 日"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 24, rowIndex + 24, 10, 16)); - ws.GetRow(rowIndex + 24).GetCell(10).SetCellValue("日期Date： 年 月 日"); - - ws.AddMergedRegion(new CellRangeAddress(rowIndex + 24, rowIndex + 24, 17, 20)); - ws.GetRow(rowIndex + 24).GetCell(17).SetCellValue("日期Date： 年 月 日"); - ws.GetRow(rowIndex + 19).Height = ws.GetRow(rowIndex + 21).Height = ws.GetRow(rowIndex + 22).Height = ws.GetRow(rowIndex + 23).Height = 2 * 20; - - - RegionUtil.SetBorderTop(1, new CellRangeAddress(rowIndex + 18, rowIndex + 18, 0, 20), ws); - RegionUtil.SetBorderLeft(1, new CellRangeAddress(rowIndex + 18, rowIndex + 24, 0, 0), ws); - RegionUtil.SetBorderRight(1, new CellRangeAddress(rowIndex + 18, rowIndex + 24, 20, 20), ws); - RegionUtil.SetBorderBottom(1, new CellRangeAddress(rowIndex + 24, rowIndex + 24, 0, 20), ws); - - RegionUtil.SetBorderRight(1, new CellRangeAddress(rowIndex + 18, rowIndex + 24, 3, 3), ws); - RegionUtil.SetBorderRight(1, new CellRangeAddress(rowIndex + 18, rowIndex + 24, 9, 9), ws); - RegionUtil.SetBorderRight(1, new CellRangeAddress(rowIndex + 18, rowIndex + 24, 16, 16), ws); - - #endregion - - ws.PrintSetup.FitWidth = 1; - ws.PrintSetup.FitHeight = 0; - ws.PrintSetup.PaperSize = (int)PaperSize.A4_Small; - - ws.FitToPage = true; - - //横向打印 - ws.PrintSetup.Landscape = true; - //垂直水平居中 - ws.VerticallyCenter = true; - ws.HorizontallyCenter = true; - //打印边距设置 厘米/3 - ws.SetMargin(MarginType.RightMargin, (double)2.4 / 3); - ws.SetMargin(MarginType.LeftMargin, (double)2.4 / 3); - ws.SetMargin(MarginType.TopMargin, (double)2.9 / 3); - ws.SetMargin(MarginType.BottomMargin, (double)2.4 / 3); - - //页眉页脚间距 - ws.SetMargin(MarginType.HeaderMargin, 0); - ws.SetMargin(MarginType.FooterMargin, 0); - } - + //22-射线检测比例确认表SHT 3503-J412-2007 private void template22(XSSFWorkbook hssfworkbook, XSSFSheet ws) { @@ -6332,7 +6275,37 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage #region 私有方法 + /// + /// 查询指定条数分页 + /// + /// + public static DataTable GetPageToTable(DataTable dt, int StartNum, int EndNum) + { + //0页代表每页数据，直接返回 + if (EndNum == 0) return dt; + //数据源为空返回空DataTable + if (dt == null) return new DataTable(); + DataTable newdt = dt.Copy(); + newdt.Clear();//copy dt的框架 + + if (StartNum >= dt.Rows.Count) + return newdt;//源数据记录数小于等于要显示的记录，直接返回dt + + if (EndNum > dt.Rows.Count) + EndNum = dt.Rows.Count; + for (int i = StartNum; i <= EndNum - 1; i++) + { + DataRow newdr = newdt.NewRow(); + DataRow dr = dt.Rows[i]; + foreach (DataColumn column in dt.Columns) + { + newdr[column.ColumnName] = dr[column.ColumnName]; + } + newdt.Rows.Add(newdr); + } + return newdt; + } /// /// 获取某一列的所有值 /// diff --git a/HJGL/Model/Model.csproj b/HJGL/Model/Model.csproj index 78bcf82..57e00db 100644 --- a/HJGL/Model/Model.csproj +++ b/HJGL/Model/Model.csproj @@ -79,6 +79,9 @@ + + +