From b8a133df938158531f219f457baa54080bfeb749 Mon Sep 17 00:00:00 2001 From: cyh Date: Fri, 22 Dec 2023 11:26:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SearchSapResult/DetailsController.class | Bin 10748 -> 13012 bytes .../SearchSapResult/SearchSapController.class | Bin 17466 -> 17568 bytes .../SearchSapResult/SearchSapDetailPanel.fxml | 2 +- .../plm/createEcn/AssignIdController.class | Bin 9726 -> 9726 bytes .../chint/plm/createEcn/AssignIdDialog.class | Bin 2113 -> 2113 bytes .../plm/createEcn/CreateEcnController$1.class | Bin 2249 -> 2249 bytes .../plm/createEcn/CreateEcnController.class | Bin 36101 -> 36117 bytes .../bin/com/chint/plm/createEcn/EcnBean.class | Bin 5720 -> 5720 bytes .../bin/com/chint/plm/createEcn/Util.class | Bin 11642 -> 13262 bytes .../SendGXToMOM/sendGXToMOMOperation.class | Bin 8805 -> 8891 bytes .../SearchSapResult/DetailsController.java | 179 ++- .../SearchSapResult/SearchSapController.java | 8 +- .../SearchSapResult/SearchSapDetailPanel.fxml | 2 +- .../plm/createEcn/AssignIdController.java | 122 +- .../chint/plm/createEcn/AssignIdDialog.java | 20 +- .../chint/plm/createEcn/CreateEcnCommond.java | 10 +- .../plm/createEcn/CreateEcnController.java | 1073 +++++++++-------- .../chint/plm/createEcn/CreateEcnFrame.java | 2 +- .../chint/plm/createEcn/CreateEcnPanel.java | 4 +- .../src/com/chint/plm/createEcn/EcnBean.java | 92 +- .../src/com/chint/plm/createEcn/Util.java | 58 + 21 files changed, 858 insertions(+), 714 deletions(-) diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/DetailsController.class b/com.connor.chint.wuhan/bin/com/chint/plm/SearchSapResult/DetailsController.class index fc9c9bb82a97c966b6443a2f06c0607a880d4773..c6f755dfc97ee6e5bcda2f20bed295c12fa13948 100644 GIT binary patch literal 13012 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 E0-K#n?f?J) delta 3203 zcmZveeR$K=701u_OUpaLArLk8aNC=B7@Z6Q@OBI&^c6frFj!OCs)R|H%2=?>+b2 zdr!}~N$VyY+lbgVt{gi-L`8heLJS(AexaovDJ)CkX}Kyr&(VG$>8q$=6`)wJ%QtC_ z&(&1#s-NX^`dn7L1+q4*bgpofl#I3EcX-Ew--EK$$BrbG<%l)?0e@7Z9aVAf=`@|n zZTJ&TS?~d9n0O>Bwyd_z-_qZ#v4fzko8;g1F3N8+}BxqY3y#rwr<2!>8!6 z;4@V@ICJtDQ2*TN%bcs74QmR$b*?5?VTGsOb?cNVd2?;D=((%O z?Qzyyxj!h{>uj!ac~`l8RvsY3X7`Hla1h8+@A5et-QM8FgLO{jG*DdgN>@X5W4%vR zq!pVpbk5`~wK=WAoXhzZ&Qqt;MwkkCs7gp5ZN7nrTewioOwTio;2YK2^qROaIz^G$ z#$$P$g>M6;N=}p1)tu-lI*-TKpuSQwr5?B2+3amx>~=|Zxm2eZG6!jrPH6_+u2VXh zst;|g)+)`vdpZnLrrr1xw%bnd}JVTUE6$gpSQLp}SCob5PZ zkqWKjyLG;Y?^Sws<+LB`?59@w z=SZSvyVm$@bPuo7`GH^o_pNigoGWL!+^#xbqo>J68+pCX8-jU_5qD$4RWH5559_>9 z9n5|dThvWCZfsMnIcxCK_LLzGXuH2ZmnCb2jazuNTA5pBKEMYp{ERx0JH&K|pH*jb zPh-FObzZ@c=cSAIMV)u@u6`D7i{)K%<0(x|u9c;3r`PN9TDTpQt!CyWtJ-`^pRDN~ z&+=8x7VZQM4yp0zZg0-Fo1^DZtn?6RjqRI2uv?@5XYNTql7_2Q6yBKMjOYBl)(0n4qN+-%5 zw18^mDGSmPT1wI~;{6nUMoe~XF1FJ)GEtE>5<7%6s@CGMQz&X2-DA3dU4mw6F};Zv zAq%~4dIGzJtaQob!5*P#3^R?P(`Y3drc*BViWY;l{Dn#%ZTIiMe%VUL2fP&rWTp?U z@NzsO)R!~(b{rJy$CEi7hlFCe377G#P#m}66+DOMDV{$=BTDcB+4*xcppC{-0-r}6 zUZio9Xxc{wcnOCoNh_vA9Kp*%RTPDGbdWulo|LQSlNLH;ryNp_hNsa7FgPDOMXEBCr?scCoRg)@1R9pcr9pR%>lgeGMzY1J8JCsZ5Qnh zssR)S=(Pa7p5KkPJMpfpz`Fswe-a;cB0c{&eN@whk2~qq_jp-cPRrU;nne6-XmHuD zS%RZ3d@jm)QvhFx{YS`t6SCii?8T716tdri>=nZ@g)E2k^T%1Mv9r00tpSb>1~!B~ z5#bxZq4bL=-x@+(M7U@O@e$#YA=o3rcZQG{5v~|Qa#&z8gp`QDhA^sCQMj2( za0^Yttuz;7$cYka!dSW&w~-$c=wX!78oiBj zzw~kieT^AlRKkv#$U+rHViw9U8`YSDrI?GmaR;`d1_v<@ComuHVgbHDEt_zse9bQ8 z5m>~N;pBy=<0YtP4_xxWsnl7p?A8O}2jCrAX5n2#g(=BU;{$NeTFgxFA%nL1w(BcTy zN2uW_N~>erX{PF+?Cp*IMP6*H^3{hb~7%U;6 z?r=!Ca5&_9Qm_w73Tg~Xrvm(tMRvF>R+%R>W0NW - + diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdController.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/AssignIdController.class index f11b974e0ab92b49a53639faae65bf6c13948805..d485546dc326bf844edf88594d449d6f2233a411 100644 GIT binary patch delta 575 zcmWNOX-L#j6vcmMAgYNBf^tG8GLkX-QXmloW7z^VWl4^h8Kst!Syq-J8qE}K1O_$q zAzMhpXc=hv(_)KBLS`B*L)r47GHWP>%AijnT^`)ax%a*M&N+8DFdVp+=aD-a^b~vj zj35g)^BBi`CXh`E3rJ-lX)JQ$o^7u15^FDIA^|HcBa`L$$+3$oS&S@rbhN+w--H6Vn$s{$Ki1QTF!d5O)!zIF8Cdw5~661p9>s;l5 zz3JozuW|UqO@?@+QFJJo$MW%4enaWNcE*5-n@)zIB+XJ#`OerWbxOO1huiqfolIKI z{JX5+o_%_sY8zim8xh)_SgOwz?j)Hf#C z8LJlF81r6Z{MLrPv+8?3@R5FFn=tc-=;I$>G?IR^|EuQkO>;>om+va%he{Ywh(TM! TPu08mr3k-ufIm*rv}XMWy+jB2>f> zl~I{c84RTT+bm4M_MIm4p-oMiB8#ZkkPa8l<-6zHbARW%qyABUd%jy^q5*e_X9-Cx zC7CQH;bRKRNMkwaWRt-PC+^&B~w{tN2^)D8Y}i&!CG=yZ!yo-2J+cRkN`~- zaFk6PH`T&sZc|7PTX;e-&ncmwQU)nwgspP1O&-eSBcyD$tB?v+*j`1I8mQJ0cIiYW zVKuW`7pPH;z3QY^_t>Xi>hz2QigQpy98!Xa^CK;+@rOyFfyp#R%RNCgMY}z@I%d)1 z%$;7Q$Vp3|vT;r`jb>(YhS{8DA?IwQ^9J8ykgZg5kv&`@!eyegS@jiDZFCT$%kDhl zDt)vwz%~BRt#R}ym0o%It1Km1PpD=B*l=^mG?k+H3aG%DIAgyu9Nb*T%MJ7MrkQ?= zb>>thoz!rLTJBO$mlI3(x+3>U<$-ZNWS+h1<1x8rW{{^8nW4qJAjC^{@QNy46XuPP z$Bp)_k@i`mcc%Jz&j*J2NPoa8O{w1vXg&1{MZG22KVe20jL324Myh21y1}26+ZE22}?0$#2;ns@gDcFxWDP mGT1T5GT1ZdGB^O`92smFoERb*oEhR7To{rWTql2K_X7Y|R1Qr5 delta 83 zcmX>oa8O{w1vXhd1{MZ=22KV820jKu24Myx21y2E26+Y(22}>r$#2;ns#-E|Fjz5& mGFUUnGT1QaGT1VhG1viF_6(5>4h-=Ojtt2RPLn^g`vCw@(heU0 diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController$1.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController$1.class index e7020a18e149781d7bdfc1abd308a77cf8b40530..b36c075613741847f69000c531fd9929d437ed86 100644 GIT binary patch delta 69 zcmX>pcv5f!J3C{?WDa%<#=gmp?DHk3FmN+ZV^CzC&S1bigTbD8CW9aIEQVO-*^_^= Y`!Fs9s*#_Z%Aw4-9LSQLyo^H`0GB@#82|tP delta 69 zcmX>pcv5f!J3C|RWDa%<#_q|E?DHijGH^3bW>93F!eGEWmBF5Q8iOD6bcR^w8Iymq Y`!LP}s*#_Z%Aw4-1jv$|yo^H`0Fs6h_y7O^ diff --git a/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController.class b/com.connor.chint.wuhan/bin/com/chint/plm/createEcn/CreateEcnController.class index 406baa22addb3192707444439e21616b25af1058..7c54df526e8bdb8fb649a6d3d9ea27898c6491b9 100644 GIT binary patch delta 2164 zcmWkvdqB_k8h)Pl{eFL(;iS1U*<4m3cO`O7yP$}oQd;Tcl2Sr$>xZ#aSp3+bjUDI4 zIEV5>CCp`oSu&To%v|PjT(+U(n3>q;{PTU@%jf-Ep6B!Zyh{sZZJ`tugtLx&Rrn^d z(%o~+=MJYAascc=0~DbtiqQ;iw8Sp7$8LC|1OX_;K$IZ_6!04|&G=YO#^lV`FW>Cfb!vHG<7Fjm>qbv2#t%#gfLZ z8}!mzwy_$swbh(0t+sr_@?~2qfbFbMwzp=mgSDJ*T7NV4W|J$Xk5x)vtCAh9%T9K( z$j-2&$0%b*(BCnE{T+!M;7H~m$21Ofq#4ZMV8={@SsdbUG8pLqPofLljbpv*I79IY z!_b5y(VC;snc*1BF&N574C7dYavWkAg#<<;h2t@sv6#y^Ean7kU_8qB9?mfVkC?~? zoXCcZqZgAof|HClh4VR;E~aoBQ(3|^?&ow~G62tQWY>sJ338u~1*~6U#`x(H)eu$ad~PJ(>&2Vt8{Wdee;o z+=XE7Mi}=Xnk7hLDW zJmpdTfyY>%$JvZW=))>@=Sc>!njt*JFrMaEC(kgRXE~YQGK1$ij~DoX;c7WAaV@{& zMqcJ-USSchvW(Yxm_P6YZ%P({wUuvj8#|w3e zh-QiEQnAz}w!3EPT(MiBj=bhdPwmOp?!TwzSk8Z93Lx!JSK7l@zNO+#Sbac1@omFa-=)fN)N1)Uigdj#^>UX5(&T&>4Rzs#Chq9JJJvL zr9Xa=0aO{tx-y6@B$&Q3l>H=xgXJwJLyZw7!x(Q)K2b(+v4nDi7%7ckE+ctRMzKOh z^Q4U7d5PdP8EXzd&ae~3=MpUriIIjfURp}5w3j&PA`_&S#7l@INVp`L$V8bUNis|R zB-xTIIg%oIGEE93Rb1jslOmZe$0c1(N}8OJ47n;Z^WWka8r;KBLw_q{|^>Nd*>2B^Jpsquf#C z8eA^N@sYvR@)bUo6Gq7@_v5V5^t)g#!$mXwCA5+6&`~a%CBDZ{xq@NFjx@Omas!ES z(=2h@ojJG0Vw5{M`!n15!t?`ZZ`4zNG}QpSp?%<|fe6&T2+@8B*Zzpt0Z7$>n6HD7 zr-QLxhhU2aqeMfnPv62JeH)ef4!+iRaaxDrf)2+O9YIeGV+S3{Kpn+U4QHZ`W|odI z&qxF}nWtr|j&rg~qgbucyl3#C#z-UcC-`fuL~EQZ&R7 z)*u5xfIBLu9a~hx)>DT4YV_9A=&xt+uAVgtoO7*NR^jQ=QH4N43uBo{{ zbhvAjyN9-V-_-qx9{LkT7>v~iNYaO9qmM90Yg`$5ncU{Ol{d1D7wQ m`4WB>(A^UBwk+51{6bF;G_*X?%6b*1{i2=K%>5+agTDhz11OpR delta 2158 zcmW+$33yIt7JlDz?)@#Hq+{2Lb%MqcTZF`#)S3{IB8!luu@#9R4Vr(nG9iNS(~>IM zP9Lgh_(v8Yh$glWRr@}+TB<{4rnYMPb)Ne?_x-}l_JCRZ|YB`+t8wcRVj zJ}1w)yN>?a;p~W|0JftxcAx>iMMLaF6YN53xZ#c6@IyZOq5#1tLMZki48;h?Uc_P_ zCZhx?*pGA^z+xOUOeI)@GHgIOzQSR{c*L+BHCe|@^ticK;1W*a4l3~sr>HnxkJa!4 zYvVLu#~FIzEL-D@D>ibov#ylUQ?B!M`Gs}l1#79rdg{UY+L#Tr6B}tb8|w@<(F``! zB_`(L8=A{Ebqkwm37hLJw$N8>Y1N~b)rfCcE!o;?$2OK9|7wM>tu>47tZcTozNELc z*~E6z$0}q8tDGIJD^7N{Nng7uyVzaW$?icPyC1vRgV^1UU=Mp5d)hhlx3{vFeUN^3 znTb_0z&^)7`!@U7FWArF#r_U|4seWQUq?6t9OD_}h-0uLk%JuX@omQpgUKB1m~AkX zLmW;HMH0Z1=m@tJ?On|oj+%@>eZGS?IR-u)i~fv65Th}aF$m#!L^Bo>IRVochq;VL z8WZp#-^FK4L=h($K_}x0r?57svMv+YjMF)sGZ@b#&Sx@RoW*ZAn+2T1eVogS25)m7 zADQTLCl~Nnrb|;gr56{>t>$o@<}p```Kgw3y`JC(y}*sewN3hhpX=}Z!ZMbB z<@QNfXgl-a!2&d3A-q|H?%abuEXF|YMJV@S97~YE{g}xEc%KLHHrqhn$0*~V!EAW^n@Qf!}gO#ksQ*6j%Y|AtB(X zUgl(8HJV*B`dsHnyuob#i)(n38+ePGd53wt%Oc)mDev<*9~jDqhUOVRnmrf z(fXp=N-XsiTlFHiQJ=1dL zA`y_bs4nf`Deci%-h#LIpp$e!pmapAbi!!qj41I%ymY}d>5BQ%9huStYs3$0#UGob z7rvI>D3Aagl0Z~SADoxIxF`MaPzK-JQqti4@d;dWDHNrSe`d+cSE9hU!sj_F-Dc~;*eOWD-)!NOqA9V zCmkhTx=DfrOQM9yB#Dv9GR0hTWU8dgG|7}C$&zHrky+vrXNu&>Y&j_@@`KrOUFOPt z6a25FsV(!grp(vovOs<01MMy88Y)f=H}4ZlB1OVC%9@-rZvDmYLwJ)-?AJ%DqY|#NI&>-y9U>wx9QLckfp@VT+hv0$^#Wfv9PYq!k4W+-1 zV2F-noQ5$~N14$w+Kh#8ZdLO;p3pITtYhUbI!=0Mq>MA&zd)m9qmGwSjg>n(L96RT zeM{ptR1-8=-__Ncs0BJ%FX_);3MDDmB@v(iFSC&bE8% z96L%=?Q~7Em+68(M>C>P1F+p58RzKCKrP*jdb$;j^c#5VHgwkQMuHs}px}bLZR-#5iK^KUxF*TA2;+M?&<;DGx$(T@w34v z`rZGluSFemhAJfgDZhI{W-B(XfUPHt_7&)^l?c>R7^2@B{ZG5rFD~=Eh_-sk9P2Uy z^a_IXs%zGgn{93z-|nEL-ZgnYqKn?caD&nM015ig9P}r=ua8`5St#yJAzYGt zGe>Z#B}OB0S~yNSC%DW>dTC{dQ#{}_6P%$yf+B5{@mVIxCLO%tEblqbM>_dJitk+D zH(df3rG`t@%CWEVBK= z&P9Bg`1ggN5b?|t^-1fy>d&l)>OJ#Zy`hlC^Qimu0)%c09ADzHa@OladYV88>NOt8ZGLcY9^a`VaLT K^@{aWtobifTWQY# delta 477 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 literal 11642 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 SoWw<(GCp=}>ga#(W9)Aiz%uaw delta 2094 zcmZ`)Yitx%6#mW(?aWSRyUT93?a&tp$d(2XBZ5^ik^+`zTPO-hVCin@mhEoowg`${ zks@NHP_9a;prSmLM@wON)I|JYq9H~Sj7CC?e*p1?BKSb1p4n}IX#Drxd(QptcfNBU z-4o6ibyOv3DtrXGM@5DBIw_k1;_sx~VuK6il+&3Nzp_V&oHRm!Msts1uJc-@kiWYrL{ zM7*hEJLd9EKEGeX+h|v?gW$ZyJY!LHpn^M4fL%IvV~^OFG(uMK4!6*VaWD4~GW)tP zsUheeABij}3xs<8J-}T5j#^wDIy$k3ptFz((MYZ3c2q?dx9OW*tIls|z4Yv=i|tJp zUg@~7{(!Zh-KxpdaTLecVP9=+And2EBHJlhJYX*pPJ6Csw4c_r%HFm`#gx=G{fb5^ zX$sj0!^9{@wn%ZTrM52N_&}yjqTKyZ@@q7MaJSgsKUbLUq14=U&V5C)?LZPT0l8Fs zk=`*}FL2E>F@Lv|SKwO6;1IH0i%bk2ei;2-eiN02N;j(K97RZcn&Hi@DYUz44ZDf* zE!bh$PNL34ePODR>RQgZ!jtKpS5uhgddf)Sly=x%E8}PjCU>KeS)MKQ7#_pvy5B^N ziB%Rh(PZKU!_$rCIfi;1>-mH%bZS+{AdX_Qi7h6!8mi$rjyFVGX6}%;SY3gkn%HS+ z-P@=2T}!L2PwUxCORK}R-*EJ5P3hI@EzKp_U%36ShJy-NE9)K(LtWE=v;@m+5!`Y zO&p0AJ-FZ)ju$F@;rBUgD2brBVU)@fQ7Xy?_+lqegp-(nk1!EuFbU`IC@!KHe_=8u zVG21gl?+UyJ20I_U!(ghge9bu!zo} zg1&;EE+RlzP$?-`EICmn4M0#Dg6fzw0!yT^2uagWBh5xwszyYLqE?Dwsk9Dt(r!eh zPL6l;;t#P>I*n(f&#_9njMdULG|BwV$OEue&ch3`7whDFG|Qv#lKcSH%j2<8E`dNA zKtqsY9b0&i4j@y$AD8g0^`;Hv^zZOJB#e{Y_<@m(`O;PV$fzG0r8Bt9D2aP=2tP4O z#u-V*&$t2w=jb|q!Bwd2*I``4uduOe@8UPkv$JoT@jJ&-*}WG0!7Ci>pC8vb&&e*% z!=EuuOk*R*F~Q&PuvNd~1}ECsu*>LSYK<*RP^YkQ32Fyhm!NjCe+laT>|lc0#Xd4M zGpDnY3FZv;>InkRDeTr5B1S5EG}eQ&3~g*xD!wKO8p&)=I=d0Cjru`NNMWRLZIBMa z-GdV%FJ~;Zh{tn=^=nZO7OQhcdn`btP_lyA3LcDuu=pe=Kap}h=RRIBD%YFb0xoTW zD9OuqwZyYp5MP&=cIIVkz0($RSMKPnTf_hI%X#^?r(e&>5~X=rEXLAtlUVBE#-#{f z?f|_n!Wx`hh9OSoZOdw&oSSu1J}eh^I2%)j<=&fwjvwb za3_Blqwpr~ tc_batch; - @FXML - private TextField pageNumTxt; + @FXML + private TextField pageNumTxt; @FXML private TableColumn tc_wbs; @FXML @@ -92,7 +104,10 @@ public class DetailsController { private Button bt_all; int pageNum = 0; - List> tableBeans; + List> tableBeans; // ¼ + + List> errMsgBeans; // ¼ + List> allMsgBeans; // ¼ȫ @FXML void firstAction(ActionEvent event) { @@ -155,23 +170,41 @@ public class DetailsController { protected AbstractAIFApplication app; private TCSession session; - /** * @param event - * @function + * @function EXCEL */ @FXML void outputAction(ActionEvent event) { + // ȡѡļ + File tempFile = Util.getFile(session, "CHINT_BOM_RESULT_TEMPLATE", "MSExcelX"); + if (tempFile == null) { + MessageBox.post("δҵexcelģ壬CHINT_BOM_RESULT_TEMPLATE.", "ʧ", MessageBox.INFORMATION); + return; + } + try { + FileInputStream in = new FileInputStream(tempFile); + XSSFWorkbook wb = new XSSFWorkbook(in); + in.close(); + + XSSFSheet sheetAt = wb.getSheet("SAPݽ"); + for (List detailList : tableBeans) { + + } + + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } private StringBuilder sqlTotal; - public void initData(Stage primaryStage, boolean onlyError, - StringBuilder sqlTotal) { + public void initData(Stage primaryStage, boolean onlyError, StringBuilder sqlTotal) { // TODO Auto-generated method stub this.sqlTotal = sqlTotal; - this.app = AIFUtility.getCurrentApplication(); this.session = (TCSession) app.getSession(); // аbean @@ -200,7 +233,7 @@ public class DetailsController { tc_returnTime.setCellValueFactory(new PropertyValueFactory("returnTime")); tc_plm.setCellValueFactory(new PropertyValueFactory("plmStatus")); - //п + // п tc_xh.prefWidthProperty().bind(tableView.widthProperty().multiply(0.05)); tc_batch.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08)); tc_material.prefWidthProperty().bind(tableView.widthProperty().multiply(0.12)); @@ -212,8 +245,8 @@ public class DetailsController { tc_returnDate.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08)); tc_returnTime.prefWidthProperty().bind(tableView.widthProperty().multiply(0.08)); tc_plm.prefWidthProperty().bind(tableView.widthProperty().multiply(0.07)); - - //ѯĬϴ + + // ѯĬϴ try { cb_errBtn.setSelected(true); searchErrMsg(); @@ -224,10 +257,10 @@ public class DetailsController { ObservableList data = FXCollections.observableArrayList(tableBeans.get(0)); tableView.getItems().clear(); tableView.setItems(data); - lb_page.setText("/"+tableBeans.size()); + lb_page.setText("/" + tableBeans.size()); // this.tableBeans = tableBeans; - //󻯰 + // 󻯰 primaryStage.widthProperty().addListener(new ChangeListener() { @Override public void changed(ObservableValue observable, Number oldValue, Number newValue) { @@ -242,71 +275,109 @@ public class DetailsController { } }); primaryStage.setMaximized(true); + cb_errBtn.selectedProperty().addListener(new ChangeListener() { + @Override + public void changed(ObservableValue observable, Boolean oldValue, Boolean newValue) { + // just show results + try { + if (flagEdit) { + flagEdit = false; + searchErrMsg(); + Platform.runLater(() -> { + flagEdit = true; + }); + } + } catch (Exception ex) { + ex.printStackTrace(); + } finally { + System.out.println("END" + sqlTotal.toString()); + SqlUtil.freeAll(); + } + } + }); + + pageNumTxt.setOnKeyPressed(new EventHandler() { + @Override + public void handle(KeyEvent event) { + if (event.getCode() == KeyCode.ENTER) { +// showHistoryWords(querybox.getText()); + } + } + }); + } + private boolean flagEdit = true; /** * @param event * @function ֻʾ */ - @FXML - void errBtnAction(ActionEvent event) { +// @FXML +// void errBtnAction(ActionEvent event) { +// + +// } - try { - cb_errBtn.setDisable(true); - searchErrMsg(); - cb_errBtn.setDisable(false); - } catch (Exception ex) { - ex.printStackTrace(); - } finally { - System.out.println("END" + sqlTotal.toString()); - SqlUtil.freeAll(); - } - } - /** * @throws Exception * @function ʾ */ private void searchErrMsg() throws Exception { - String[] prefs = ChintPreferenceUtil.getPreferences("database_tc", session); + // BOMϢ : ȫ״̬. List> tableBeans = new ArrayList>(); - SqlUtil.getTCDataConnection(prefs); - String sqlDetail = ""; - if (cb_errBtn.isSelected()) { - sqlDetail = sqlTotal.toString() + " and status = 'E' "; + if (cb_errBtn.isSelected() && errMsgBeans.size() > 0) { + tableBeans = errMsgBeans; + } else if (!cb_errBtn.isSelected() && allMsgBeans.size() > 0) { + tableBeans = allMsgBeans; } else { - sqlDetail = sqlTotal.toString();// + " and status = 'S' "; - } - ResultSet read = SqlUtil.read(sqlDetail); - int i = 1; - List beanList = null; - while (read.next()) { - // ҳ 20 ѯ - DetailsBean sumBean = new DetailsBean(new SimpleIntegerProperty(i), - new SimpleStringProperty(read.getString(1)), new SimpleStringProperty(read.getString(2)), - new SimpleStringProperty(read.getString(3)), new SimpleStringProperty(read.getString(4)), - new SimpleStringProperty(read.getString(5)), new SimpleStringProperty(read.getString(6)), - new SimpleStringProperty(read.getString(7)), new SimpleStringProperty(read.getString(8)), - new SimpleStringProperty(read.getString(9)), new SimpleStringProperty(read.getString(10))); - if (i % 20 == 1) { + String sqlDetail = ""; + if (cb_errBtn.isSelected()) { + sqlDetail = sqlTotal.toString() + " and status = 'E' "; + } else { + sqlDetail = sqlTotal.toString();// + " and status = 'S' "; + } + String[] prefs = ChintPreferenceUtil.getPreferences("database_tc", session); + SqlUtil.getTCDataConnection(prefs); + System.out.println("cb_errBtn" + cb_errBtn.isSelected()); + System.out.println("sqlDetail" + sqlDetail.toString()); + ResultSet read = SqlUtil.read(sqlDetail); + int i = 1; + List beanList = null; + while (read.next()) { + // ҳ 20 ѯ + DetailsBean sumBean = new DetailsBean(new SimpleIntegerProperty(i), + new SimpleStringProperty(read.getString(1)), new SimpleStringProperty(read.getString(2)), + new SimpleStringProperty(read.getString(3)), new SimpleStringProperty(read.getString(4)), + new SimpleStringProperty(read.getString(5)), new SimpleStringProperty(read.getString(6)), + new SimpleStringProperty(read.getString(7)), new SimpleStringProperty(read.getString(8)), + new SimpleStringProperty(read.getString(9)), new SimpleStringProperty(read.getString(10))); + if (i % 40 == 1) { + beanList = new ArrayList(); + tableBeans.add(beanList); + } + beanList.add(sumBean); + i = i + 1; + } + SqlUtil.freeAll(); + if (tableBeans.size() == 0) { beanList = new ArrayList(); tableBeans.add(beanList); } - beanList.add(sumBean); - i = i + 1; - } - SqlUtil.freeAll(); - if (tableBeans.size() == 0) { - beanList = new ArrayList(); - tableBeans.add(beanList); + if (errMsgBeans.size() == 0 && cb_errBtn.isSelected()) { + errMsgBeans = tableBeans; + } else if (allMsgBeans.size() == 0 && !cb_errBtn.isSelected()) { + allMsgBeans = tableBeans; + } } + ObservableList data = FXCollections.observableArrayList(tableBeans.get(0)); tableView.getItems().clear(); tableView.setItems(data); pageNum = 0; this.tableBeans = tableBeans; - lb_page.setText("/"+tableBeans.size()); + lb_page.setText("/" + tableBeans.size()); + pageNumTxt.setText("1"); } } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapController.java b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapController.java index 74cb30e..0b75b5c 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapController.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapController.java @@ -272,7 +272,7 @@ public class SearchSapController extends KFXPanelController { i = i + 1; } if (tableBeans.size() == 0) { - MessageBox.post("δѯݼ¼.", "ʾ", 2); + MessageBox.post(frame,"δѯݼ¼.", "ʾ", 2); beanList = new ArrayList(); tableBeans.add(beanList); } @@ -308,7 +308,7 @@ public class SearchSapController extends KFXPanelController { frame = (SapResultFrame) paramKFXPanel.getParentDialog(); addWindListener(frame); - frame.setExtendedState(JFrame.MAXIMIZED_BOTH); + frame.setMaximumSize(frame.getMaximumSize()); System.out.println("frame==>" + frame); this.app = AIFUtility.getCurrentApplication(); this.session = (TCSession) app.getSession(); @@ -383,7 +383,7 @@ public class SearchSapController extends KFXPanelController { } }; }); - + // tableView.setMaxHeight(pageNum); } @@ -402,7 +402,7 @@ public class SearchSapController extends KFXPanelController { sapStateList.add("PLMݼδͨ"); sapStateList.add("δ"); sapStateList.add(""); - sapStateList.add("ȫ"); + sapStateList.add("ȫɹ"); sapStateList.add("ʧ"); cb_sapState.getItems().addAll(sapStateList); List sapStatusList = new ArrayList(); diff --git a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml index 2ab9c05..6f79955 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml +++ b/com.connor.chint.wuhan/src/com/chint/plm/SearchSapResult/SearchSapDetailPanel.fxml @@ -22,7 +22,7 @@ - + diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdController.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdController.java index 6ccc522..db06b82 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdController.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdController.java @@ -26,36 +26,38 @@ import javafx.scene.control.ComboBox; import javafx.scene.control.TextField; import javafx.stage.Stage; -public class AssignIdController{ +public class AssignIdController { private String groupID; private TCSession session; private TextField field; private TCComponent tar; private boolean flag; - @FXML - private Button assignBtn; - private Button assignBtnTop; //еָɰť - @FXML - private TextField ylText; + @FXML + private Button assignBtn; + private Button assignBtnTop; // еָɰť + @FXML + private TextField ylText; - @FXML - private Button closeBtn; + @FXML + private Button closeBtn; - @FXML - private ComboBox bmComb; + @FXML + private ComboBox bmComb; + + @FXML + private ComboBox factoryComb; - @FXML - private ComboBox factoryComb; /** - * @param session - * @param groupID ID - * @param field ı - * @param tar ѡж - * @param flag ʽʱ + * @param session + * @param groupID ID + * @param field ı + * @param tar ѡж + * @param flag ʽʱ * @param assignBtn ָɰť * @function ʼ */ - public void initData(TCSession session,String groupID,TextField field,TCComponent tar,boolean flag,Button assignBtn) { + public void initData(TCSession session, String groupID, TextField field, TCComponent tar, boolean flag, + Button assignBtn) { // TODO Auto-generated method stub this.groupID = groupID; this.session = session; @@ -65,21 +67,22 @@ public class AssignIdController{ this.assignBtnTop = assignBtn; getCombox(); } - @FXML - void okBtnClick(ActionEvent event) { - SimpleDateFormat sdf = new SimpleDateFormat("yy"); + + @FXML + void okBtnClick(ActionEvent event) { + SimpleDateFormat sdf = new SimpleDateFormat("yy"); String year = sdf.format(new Date()); String fac = factoryComb.getSelectionModel().getSelectedItem(); String off = bmComb.getSelectionModel().getSelectedItem(); - if(off.equals("-")) { + if (off.equals("-")) { off = ""; } String TF = ""; /// if(1==1) // return; - if (flag) { //ʱ + if (flag) { // ʱ TF = "L"; - } else { //if (TF.trim().equals("ʽ֪ͨ")) + } else { // if (TF.trim().equals("ʽ֪ͨ")) TF = ""; } String searchWord = fac.split("-")[0] + off.split("-")[0] + "-" + year + TF; @@ -101,8 +104,8 @@ public class AssignIdController{ FLOW = String.format("%04d", Integer.valueOf(FLOW) + 1); query = "update CHINT_ECN_CODE set FLOW='" + FLOW + "' where CODE='" + searchWord + "'"; } else { - query = "insert into CHINT_ECN_CODE (FACTORY,OFFICE,CODE,FLOW) VALUES('" + fac + "','" + off - + "','" + searchWord + "','0002')"; + query = "insert into CHINT_ECN_CODE (FACTORY,OFFICE,CODE,FLOW) VALUES('" + fac + "','" + off + "','" + + searchWord + "','0002')"; // query = "insert into CHINT_ECN_CODE (FACTORY,OFFICE,CODE,FLOW) VALUES('" + // fac + "','" + off // + "','" + searchWord + "','0002')"; @@ -122,32 +125,32 @@ public class AssignIdController{ } assignBtnTop.setDisable(true);// ָֻһ assignBtn.setDisable(true);// ָֻһ - Stage stage = (Stage)closeBtn.getScene().getWindow(); - stage.close(); - } - - @FXML - void cancelBtnClick(ActionEvent event) { - Stage stage = (Stage)closeBtn.getScene().getWindow(); - stage.close(); - } + Stage stage = (Stage) closeBtn.getScene().getWindow(); + stage.close(); + } - @FXML - void selectDepart(ActionEvent event) { + @FXML + void cancelBtnClick(ActionEvent event) { + Stage stage = (Stage) closeBtn.getScene().getWindow(); + stage.close(); + } - } + @FXML + void selectDepart(ActionEvent event) { - @FXML - void selectFactory(ActionEvent event) { + } - } + @FXML + void selectFactory(ActionEvent event) { + + } /** * * @function ѡȡͲ */ public void getCombox() { - //ѡȡͲ + // ѡȡͲ String[] FO = session.getPreferenceService().getStringValues("CHINT_FAC_OFF"); List facList = new ArrayList<>(); String first_FO = ""; @@ -171,40 +174,40 @@ public class AssignIdController{ // foMap.put(FO[i].split(":")[0], list); foMap.put(group, list); } - //ʼ߼ + // ʼ߼ factoryComb.getItems().addAll(facList); factoryComb.getSelectionModel().select(first_FO); - //Ӽ ̬ + // Ӽ ̬ factoryComb.valueProperty().addListener((obs, oldVal, newVal) -> { - System.out.println("ѡˣ" + newVal); - String index = factoryComb.getSelectionModel().getSelectedItem(); - List vector = foMap.get(index); - bmComb.getItems().clear(); - bmComb.getItems().addAll(vector); - if(vector.size()==1 && vector.get(0).equals("-")) { + System.out.println("ѡˣ" + newVal); + String index = factoryComb.getSelectionModel().getSelectedItem(); + List vector = foMap.get(index); + bmComb.getItems().clear(); + bmComb.getItems().addAll(vector); + if (vector.size() == 1 && vector.get(0).equals("-")) { bmComb.setVisible(false); - }else { + } else { bmComb.setVisible(true); } }); List init = foMap.get(factoryComb.getSelectionModel().getSelectedItem()); bmComb.getItems().addAll(init); - - //Ӽ ԤϢ + + // Ӽ ԤϢ bmComb.valueProperty().addListener((obs, oldVal, newVal) -> { - System.out.println("ѡˣ" + newVal); - SimpleDateFormat sdf = new SimpleDateFormat("yy"); + System.out.println("ѡˣ" + newVal); + SimpleDateFormat sdf = new SimpleDateFormat("yy"); String year = sdf.format(new Date()); String fac = factoryComb.getSelectionModel().getSelectedItem(); String off = bmComb.getSelectionModel().getSelectedItem(); - if(off.equals("-")) { + if (off.equals("-")) { off = ""; } String TF = ""; - if (flag) { //ʱ + if (flag) { // ʱ TF = "L"; - } else { //if (TF.trim().equals("ʽ֪ͨ")) + } else { // if (TF.trim().equals("ʽ֪ͨ")) TF = ""; } String searchWord = fac.split("-")[0] + off.split("-")[0] + "-" + year + TF; @@ -238,7 +241,7 @@ public class AssignIdController{ e1.printStackTrace(); } }); - + // comBoxOffice = new JComboBox(new DefaultComboBoxModel(init.toArray(new String[init.size()]))); System.out.println("first_FO:" + first_FO); // if (tar.getType().equals("ZT2_Change")) { @@ -259,5 +262,6 @@ public class AssignIdController{ // // } } + private Util util = new Util(); } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdDialog.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdDialog.java index 154bbb0..fcfdc29 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdDialog.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/AssignIdDialog.java @@ -35,14 +35,16 @@ import javafx.scene.control.Button; import javafx.scene.control.TextField; import javafx.stage.Stage; -public class AssignIdDialog extends Application { +public class AssignIdDialog extends Application { private String groupID; private TCSession session; private TextField field; private TCComponent tar; private Button assignBtn; private boolean flag; - public AssignIdDialog(TCSession session,String groupID,TextField field,TCComponent tar,boolean flag,Button assignBtn) { + + public AssignIdDialog(TCSession session, String groupID, TextField field, TCComponent tar, boolean flag, + Button assignBtn) { super(); this.groupID = groupID; this.session = session; @@ -51,19 +53,19 @@ public class AssignIdDialog extends Application { this.flag = flag; this.assignBtn = assignBtn; } + @Override - public void start(Stage primaryStage) throws IOException { + public void start(Stage primaryStage) throws IOException { // StackPane root = new StackPane(); FXMLLoader fxmlLoader = new FXMLLoader(); fxmlLoader.setLocation(getClass().getResource("AssignIdPane.fxml")); Parent root = (Parent) fxmlLoader.load(); Scene scene = new Scene(root, 400.0, 240.0); AssignIdController controller = (AssignIdController) fxmlLoader.getController(); - primaryStage.setTitle("֪ͨ"); - controller.initData(session,groupID,field,tar,flag,assignBtn); - primaryStage.setScene(scene); - primaryStage.show(); - } - + primaryStage.setTitle("֪ͨ"); + controller.initData(session, groupID, field, tar, flag, assignBtn); + primaryStage.setScene(scene); + primaryStage.show(); + } } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnCommond.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnCommond.java index aa86bbe..713d3a5 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnCommond.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnCommond.java @@ -7,18 +7,18 @@ import com.teamcenter.rac.aif.kernel.InterfaceAIFComponent; import com.teamcenter.rac.util.MessageBox; public class CreateEcnCommond extends KCommand { - + public CreateEcnCommond(AbstractAIFApplication app, String commandId, String actionInfo) { super(app, commandId, actionInfo); try { InterfaceAIFComponent targetComponent = app.getTargetComponent(); - if(targetComponent.getType().equals("ZT2_ProjectItem") || targetComponent.getType().equals("ZT2_Change")) { + if (targetComponent.getType().equals("ZT2_ProjectItem") || targetComponent.getType().equals("ZT2_Change")) { new CreateEcnFrame(); - }else { + } else { MessageBox.post("ѡĿ߸֪ͨļ", "", MessageBox.ERROR); } - - }catch(Exception e) { + + } catch (Exception e) { e.printStackTrace(); } } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java index dd09856..8802c9f 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnController.java @@ -71,116 +71,118 @@ import javafx.scene.layout.StackPane; import javafx.stage.Stage; public class CreateEcnController extends KFXPanelController { - @FXML - private TextField ecnId; - @FXML - private Button assignBtn; + @FXML + private TextField ecnId; + @FXML + private Button assignBtn; @FXML private TableView tableView; @FXML - private StackPane stackPane; - @FXML - private DatePicker changeDate; - @FXML - private TitledPane referencePane; - @FXML - private RadioButton rb_product; - @FXML - private GridPane gridPane; - @FXML - private RadioButton rb_tempChange; //ʱ֪ͨ - @FXML - private RadioButton rb_Process; - @FXML - private ScrollPane scollPane; - @FXML - private TitledPane tp_product; - @FXML - private TitledPane tc_details; - private List parts = new ArrayList(); - private List reasons = new ArrayList(); - private List wips = new ArrayList(); - private List products = new ArrayList(); - private List ecnBeans = new ArrayList(); - protected AbstractAIFApplication app; - private TCSession session; - private TCComponent target; - @FXML - private RadioButton rb_formalChange; //ʽ֪ͨ - @FXML - private TextField factoryText; - @FXML - private GridPane productPane; - - @FXML - private TextField htNameText; - @FXML - public TextField markText; - @FXML - private TextField contractText; - @FXML - private ComboBox prodNameComb; - @FXML - private FlowPane departPane; - private List partBtns = new ArrayList<>(); - @FXML - private ComboBox pmCombox; - private CreateEcnController controller; - private CreateEcnFrame frame; - private String[] database; - - @Override + private StackPane stackPane; + @FXML + private DatePicker changeDate; + @FXML + private TitledPane referencePane; + @FXML + private RadioButton rb_product; + @FXML + private GridPane gridPane; + @FXML + private RadioButton rb_tempChange; // ʱ֪ͨ + @FXML + private RadioButton rb_Process; + @FXML + private ScrollPane scollPane; + @FXML + private TitledPane tp_product; + @FXML + private TitledPane tc_details; + private List parts = new ArrayList(); + private List reasons = new ArrayList(); + private List wips = new ArrayList(); + private List products = new ArrayList(); + private List ecnBeans = new ArrayList(); + protected AbstractAIFApplication app; + private TCSession session; + private TCComponent target; + @FXML + private RadioButton rb_formalChange; // ʽ֪ͨ + @FXML + private TextField factoryText; + @FXML + private GridPane productPane; + + @FXML + private TextField htNameText; + @FXML + public TextField markText; + @FXML + private TextField contractText; + @FXML + private ComboBox prodNameComb; + @FXML + private FlowPane departPane; + private List partBtns = new ArrayList<>(); + @FXML + private ComboBox pmCombox; + private CreateEcnController controller; + private CreateEcnFrame frame; + private String[] database; + + @Override public void initData(KFXPanel paramKFXPanel) throws Exception { // TODO Auto-generated method stub - this.app = AIFUtility.getCurrentApplication(); + this.app = AIFUtility.getCurrentApplication(); this.session = (TCSession) app.getSession(); - target = (TCComponent)app.getTargetComponent(); + target = (TCComponent) app.getTargetComponent(); database = session.getPreferenceService().getStringValues("database_tc"); - CreateEcnFrame frame = (CreateEcnFrame)paramKFXPanel.getParentDialog(); - this.frame = frame; - addWindListener(frame); - // - ToggleGroup group = new ToggleGroup(); // - //ʵֵѡ - rb_formalChange.setToggleGroup(group); - rb_tempChange.setToggleGroup(group); - rb_formalChange.setSelected(true); - referencePane.setExpanded(false); - - ToggleGroup groupGc = new ToggleGroup(); // - rb_product.setToggleGroup(groupGc); - rb_Process.setToggleGroup(groupGc); - tp_product.setCollapsible(false); - tc_details.setCollapsible(false); - controller = this; - createDetailTable(); - + CreateEcnFrame frame = (CreateEcnFrame) paramKFXPanel.getParentDialog(); + this.frame = frame; + addWindListener(frame); + // + ToggleGroup group = new ToggleGroup(); // + // ʵֵѡ + rb_formalChange.setToggleGroup(group); + rb_tempChange.setToggleGroup(group); + rb_formalChange.setSelected(true); + referencePane.setExpanded(false); + + ToggleGroup groupGc = new ToggleGroup(); // + rb_product.setToggleGroup(groupGc); + rb_Process.setToggleGroup(groupGc); + tp_product.setCollapsible(false); + tc_details.setCollapsible(false); + controller = this; + createDetailTable(); + createRefTable(); - //ȡѡеĶ - + // ȡѡеĶ + initText(); - + } - @FXML - private Button createBtn; - /** - * @param event - * @throws Exception - * @function ť - */ - @FXML - void createClick(ActionEvent event) throws Exception { - if(ecnId.getText().isEmpty()) { - MessageBox.post("ָɱID","ʾ",2); - return; - } - String changeName = "ʱ֪ͨ"; - if(rb_formalChange.isSelected()) { + + @FXML + private Button createBtn; + + /** + * @param event + * @throws Exception + * @function ť + */ + @FXML + void createClick(ActionEvent event) throws Exception { + if (ecnId.getText().isEmpty()) { + MessageBox.post("ָɱID", "ʾ", 2); + return; + } + String changeName = "ʱ֪ͨ"; + if (rb_formalChange.isSelected()) { changeName = "ʽ֪ͨ"; } - if (target.getType().equals("ZT2_Change")) { + if (target.getType().equals("ZT2_Change")) { TCComponentItem item = (TCComponentItem) target; - setItemProperty(item,changeName); + setItemProperty(item, changeName); String type = item.getProperty("zt2_Template"); TCComponentDataset dataset = null; @@ -207,10 +209,8 @@ public class CreateEcnController extends KFXPanelController { } else if (target.getType().equals("ZT2_ProjectItem")) { String zt2_WBSNo = target.getProperty("zt2_WBSNo"); // ½ - TCComponentItemType itemType = (TCComponentItemType) session - .getTypeComponent("ZT2_Change"); - TCComponentItem item = itemType.create(ecnId.getText(), null, "ZT2_Change", - changeName, "", null); + TCComponentItemType itemType = (TCComponentItemType) session.getTypeComponent("ZT2_Change"); + TCComponentItem item = itemType.create(ecnId.getText(), null, "ZT2_Change", changeName, "", null); // boolean flag = true; try { @@ -254,87 +254,80 @@ public class CreateEcnController extends KFXPanelController { } } - - //ӰϢ 浽CHINT_ECN_NOTIFICATION - try { - SqlUtil.getTCDataConnection(database); - String deleteSql = "delete CHINT_ECN_NOTIFICATION where \"ecncode\" = ? "; - String endCode = ecnId.getText(); - SqlUtil.delete(deleteSql,new String[] {endCode}); - String insertSql = "insert into CHINT_ECN_NOTIFICATION (\"ecncode\", \"code\", \"section\", \"no\" ," - + "\"actionstatement\",\"result\",\"principal\",\"pctime\",\"remark\") values (?,?,?,?,?,?,?,?,?)"; - ObservableList items = refTable.getItems(); - - for(int i=0;i<7;i++) { - RefTableBean refTableBean = items.get(i); - String result = refTableBean.getShYes().isSelected()?"":""; - SqlUtil.write( - new String[] {endCode,"1",refTableBean.getDepart(),String.valueOf(i+1), - refTableBean.getMessage(),result,refTableBean.getUser().getText(), - refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); + + // ӰϢ 浽CHINT_ECN_NOTIFICATION + try { + SqlUtil.getTCDataConnection(database); + String deleteSql = "delete CHINT_ECN_NOTIFICATION where \"ecncode\" = ? "; + String endCode = ecnId.getText(); + SqlUtil.delete(deleteSql, new String[] { endCode }); + String insertSql = "insert into CHINT_ECN_NOTIFICATION (\"ecncode\", \"code\", \"section\", \"no\" ," + + "\"actionstatement\",\"result\",\"principal\",\"pctime\",\"remark\") values (?,?,?,?,?,?,?,?,?)"; + ObservableList items = refTable.getItems(); + + for (int i = 0; i < 7; i++) { + RefTableBean refTableBean = items.get(i); + String result = refTableBean.getShYes().isSelected() ? "" : ""; + SqlUtil.write(new String[] { endCode, "1", refTableBean.getDepart(), String.valueOf(i + 1), + refTableBean.getMessage(), result, refTableBean.getUser().getText(), + refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } - for(int i=7;i<11;i++) { - RefTableBean refTableBean = items.get(i); - String result = refTableBean.getShYes().isSelected()?"":""; - SqlUtil.write( - new String[] {endCode,"2",refTableBean.getDepart(),String.valueOf(i-6), - refTableBean.getMessage(),result,refTableBean.getUser().getText(), - refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); + for (int i = 7; i < 11; i++) { + RefTableBean refTableBean = items.get(i); + String result = refTableBean.getShYes().isSelected() ? "" : ""; + SqlUtil.write(new String[] { endCode, "2", refTableBean.getDepart(), String.valueOf(i - 6), + refTableBean.getMessage(), result, refTableBean.getUser().getText(), + refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } - for(int i=11;i<15;i++) { - RefTableBean refTableBean = items.get(i); - String result = refTableBean.getShYes().isSelected()?"":""; - SqlUtil.write( - new String[] {endCode,"3",refTableBean.getDepart(),String.valueOf(i-10), - refTableBean.getMessage(),result,refTableBean.getUser().getText(), - refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); + for (int i = 11; i < 15; i++) { + RefTableBean refTableBean = items.get(i); + String result = refTableBean.getShYes().isSelected() ? "" : ""; + SqlUtil.write(new String[] { endCode, "3", refTableBean.getDepart(), String.valueOf(i - 10), + refTableBean.getMessage(), result, refTableBean.getUser().getText(), + refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } - for(int i=15;i<19;i++) { - RefTableBean refTableBean = items.get(i); - String result = refTableBean.getShYes().isSelected()?"":""; - SqlUtil.write( - new String[] {endCode,"4",refTableBean.getDepart(),String.valueOf(i-14), - refTableBean.getMessage(),result,refTableBean.getUser().getText(), - refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); + for (int i = 15; i < 19; i++) { + RefTableBean refTableBean = items.get(i); + String result = refTableBean.getShYes().isSelected() ? "" : ""; + SqlUtil.write(new String[] { endCode, "4", refTableBean.getDepart(), String.valueOf(i - 14), + refTableBean.getMessage(), result, refTableBean.getUser().getText(), + refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } - for(int i=19;i<24;i++) { - RefTableBean refTableBean = items.get(i); - String result = refTableBean.getShYes().isSelected()?"":""; - SqlUtil.write( - new String[] {endCode,"5",refTableBean.getDepart(),String.valueOf(i-18), - refTableBean.getMessage(),result,refTableBean.getUser().getText(), - refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); + for (int i = 19; i < 24; i++) { + RefTableBean refTableBean = items.get(i); + String result = refTableBean.getShYes().isSelected() ? "" : ""; + SqlUtil.write(new String[] { endCode, "5", refTableBean.getDepart(), String.valueOf(i - 18), + refTableBean.getMessage(), result, refTableBean.getUser().getText(), + refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } - for(int i=24;i<27;i++) { - RefTableBean refTableBean = items.get(i); - String result = refTableBean.getShYes().isSelected()?"":""; - SqlUtil.write( - new String[] {endCode,"6",refTableBean.getDepart(),String.valueOf(i-23), - refTableBean.getMessage(),result,refTableBean.getUser().getText(), - refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); + for (int i = 24; i < 27; i++) { + RefTableBean refTableBean = items.get(i); + String result = refTableBean.getShYes().isSelected() ? "" : ""; + SqlUtil.write(new String[] { endCode, "6", refTableBean.getDepart(), String.valueOf(i - 23), + refTableBean.getMessage(), result, refTableBean.getUser().getText(), + refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } - for(int i=27;i<28;i++) { - RefTableBean refTableBean = items.get(i); - String result = refTableBean.getShYes().isSelected()?"":""; - SqlUtil.write( - new String[] {endCode,"7",refTableBean.getDepart(),String.valueOf(i-26), - refTableBean.getMessage(),result,refTableBean.getUser().getText(), - refTableBean.getCompDate().getText(),refTableBean.getMark().getText()}, insertSql); + for (int i = 27; i < 28; i++) { + RefTableBean refTableBean = items.get(i); + String result = refTableBean.getShYes().isSelected() ? "" : ""; + SqlUtil.write(new String[] { endCode, "7", refTableBean.getDepart(), String.valueOf(i - 26), + refTableBean.getMessage(), result, refTableBean.getUser().getText(), + refTableBean.getCompDate().getText(), refTableBean.getMark().getText() }, insertSql); } - }catch(Exception e) { - e.printStackTrace(); - }finally { - SqlUtil.freeAll(); - } - createBtn.setDisable(true); - } - /** - * @param ݼ - * @param ļ· - * @param - * 滻excelļ - */ - protected void createOrReplace(TCComponentDataset dataset, File file, String changeName) { + } catch (Exception e) { + e.printStackTrace(); + } finally { + SqlUtil.freeAll(); + } + createBtn.setDisable(true); + } + + /** + * @param ݼ + * @param ļ· + * @param 滻excelļ + */ + protected void createOrReplace(TCComponentDataset dataset, File file, String changeName) { // 20200407ɾ try { FileInputStream fis = new FileInputStream(file); @@ -344,7 +337,7 @@ public class CreateEcnController extends KFXPanelController { sheet.getRow(1).getCell(13).setCellValue(ecnId.getText()); // int page = 0; List mergeRegions = null; - + for (int i = 0; i < pages; i++) { int pace = 0; if (sheet.getRow(2 + i * 23) == null) { @@ -410,7 +403,7 @@ public class CreateEcnController extends KFXPanelController { file2 = new File(filePath); FileOutputStream fos = new FileOutputStream(file2); workBook.write(fos); - + Util.deMerge(filePath, filePath, pages); Util.delete(filePath, filePath, pages); dataset.setFiles(new String[] { filePath }, new String[] { "excel" }); @@ -419,28 +412,28 @@ public class CreateEcnController extends KFXPanelController { } } - - private String contractNo; //ͬ - private String contractName;//ͬ - private String productModel; //Ʒͺ - private String changeType; //ʽʱ - private String changeTime;//ʵʩ - private String changeUnit1; //Ա - - /** - * @param item - * @param changeName - * @throws Exception - * @function ޸ı - */ - protected void setItemProperty(TCComponentItem item, String changeName) throws Exception { - - contractNo = contractText.getText(); //ͬ - contractName = htNameText.getText();//ͬ - productModel = pmCombox.getSelectionModel().getSelectedItem(); //Ʒͺ + + private String contractNo; // ͬ + private String contractName;// ͬ + private String productModel; // Ʒͺ + private String changeType; // ʽʱ + private String changeTime;// ʵʩ + private String changeUnit1; // Ա + + /** + * @param item + * @param changeName + * @throws Exception + * @function ޸ı + */ + protected void setItemProperty(TCComponentItem item, String changeName) throws Exception { + + contractNo = contractText.getText(); // ͬ + contractName = htNameText.getText();// ͬ + productModel = pmCombox.getSelectionModel().getSelectedItem(); // Ʒͺ String productName = prodNameComb.getSelectionModel().getSelectedItem(); String fileName = markText.getText(); - changeType = changeName; //ʽʱ + changeType = changeName; // ʽʱ item.setProperty("zt2_ContractNo", contractNo); item.setProperty("zt2_ContractName", contractName); item.setProperty("zt2_ProductModel", productModel); @@ -455,9 +448,9 @@ public class CreateEcnController extends KFXPanelController { item.setDateProperty("zt2_ChangeDate", date); } StringBuilder unit = new StringBuilder(""); - for(int j=0;j 0) { unit.append(";").append(radioButton.getText()); } else { @@ -465,11 +458,11 @@ public class CreateEcnController extends KFXPanelController { } } } - changeUnit1 = unit.toString(); //Ա + changeUnit1 = unit.toString(); // Ա item.setProperty("zt2_ChangeUnit1", changeUnit1); ObservableList items = tableView.getItems(); int rowCount = items.size(); - + System.out.println(rowCount); changeDrawingNo = new String[rowCount]; sign = new String[rowCount]; @@ -479,12 +472,12 @@ public class CreateEcnController extends KFXPanelController { changeAfter1 = new String[rowCount]; changeReason = new String[rowCount]; processType1 = new String[rowCount]; - szVersionBefs = new String[rowCount]; - szVersionAfts = new String[rowCount]; - - productSzs = new String[rowCount]; - processSzs = new String[rowCount]; - + szVersionBefs = new String[rowCount]; + szVersionAfts = new String[rowCount]; + + productSzs = new String[rowCount]; + processSzs = new String[rowCount]; + int modulus = changeDrawingNo.length % 5; int dlivery = changeDrawingNo.length / 5; if (modulus == 0) { @@ -502,17 +495,17 @@ public class CreateEcnController extends KFXPanelController { changeBefore1[i] = ecnBean.getOverChange().getText(); changeAfter1[i] = ecnBean.getAfterChange().getText(); String reasonItem = ecnBean.getChangeReason().getSelectionModel().getSelectedItem(); - changeReason[i] = reasonItem==null?"":reasonItem; + changeReason[i] = reasonItem == null ? "" : reasonItem; String processTypeItem = ecnBean.getWipTreat().getSelectionModel().getSelectedItem(); - processType1[i] = processTypeItem==null?"":processTypeItem; + processType1[i] = processTypeItem == null ? "" : processTypeItem; szVersionBefs[i] = ecnBean.getOverVersion().getText(); szVersionAfts[i] = ecnBean.getAfterVersion().getText(); productSzs[i] = ecnBean.getProductSz().getSelectionModel().getSelectedItem(); - processSzs[i] = rb_product.isSelected() ? "Y":"N"; + processSzs[i] = rb_product.isSelected() ? "Y" : "N"; } item.getTCProperty("zt2_ChangeDrawingNo").setStringValueArray(changeDrawingNo); item.getTCProperty("zt2_Sign").setStringValueArray(sign); - item.getTCProperty("zt2_PlacesNo").setStringValueArray(partition); // + item.getTCProperty("zt2_PlacesNo").setStringValueArray(partition); // item.getTCProperty("zt2_ChangeBefore1").setStringValueArray(changeBefore1); item.getTCProperty("zt2_ChangeAfter1").setStringValueArray(changeAfter1); item.getTCProperty("zt2_ChangeReason").setStringValueArray(changeReason); @@ -522,36 +515,38 @@ public class CreateEcnController extends KFXPanelController { item.getTCProperty("zt2_SZProduct").setStringValueArray(productSzs); item.getTCProperty("zt2_SZProcess").setStringValueArray(processSzs); } - private int pages = 0; - private String[] changeDrawingNo; //zt2_ChangeDrawingNo - private String[] sign; //zt2_Sign + + private int pages = 0; + private String[] changeDrawingNo; // zt2_ChangeDrawingNo + private String[] sign; // zt2_Sign // private String[] placesNo; //zt2_PlacesNo - private String[] partition; //zt2_Partition - private String[] changeBefore1; //zt2_ChangeBefore1 - private String[] changeAfter1; //zt2_ChangeAfter1 - private String[] changeReason; //zt2_ChangeReason - private String[] processType1; //zt2_ProcessType1 - private String[] szVersionBefs; // ǰ汾 - private String[] szVersionAfts; // 汾 - private String[] productSzs; // 汾 - private String[] processSzs; // 汾 - /** - * @param event - * @function رҳ - */ - @FXML - void disposeClick(ActionEvent event) { - frame.dispose(); - } - - /** - * @throws Exception - * @function ʼҳ - */ - private void initText() throws Exception { - List productModelList = new ArrayList<>(); - productModelList = Util.getproductModel(target, productModelList); - factoryText.setEditable(false); + private String[] partition; // zt2_Partition + private String[] changeBefore1; // zt2_ChangeBefore1 + private String[] changeAfter1; // zt2_ChangeAfter1 + private String[] changeReason; // zt2_ChangeReason + private String[] processType1; // zt2_ProcessType1 + private String[] szVersionBefs; // ǰ汾 + private String[] szVersionAfts; // 汾 + private String[] productSzs; // 汾 + private String[] processSzs; // 汾 + + /** + * @param event + * @function رҳ + */ + @FXML + void disposeClick(ActionEvent event) { + frame.dispose(); + } + + /** + * @throws Exception + * @function ʼҳ + */ + private void initText() throws Exception { + List productModelList = new ArrayList<>(); + productModelList = Util.getproductModel(target, productModelList); + factoryText.setEditable(false); pmCombox.getItems().addAll(productModelList); List unitList = new ArrayList<>(); contractText.setText(Util.getProjectNo(target)); @@ -560,27 +555,27 @@ public class CreateEcnController extends KFXPanelController { htNameText.setEditable(false); ecnId.setEditable(false); rb_product.setSelected(true); - if(target.getType().equals("ZT2_ProjectItem")) { - //ȡƷ - List ccpNameFromProject = KUtil.getCCPNameFromProject(target, session); - prodNameComb.getItems().addAll(ccpNameFromProject); - }else { - //Ϊʱ IDʱ䣬Ʒͺš - List productNameList = new ArrayList<>(); - productNameList = Util.getProductNames(target, productNameList); - prodNameComb.getItems().addAll(productNameList); - String productModel = target.getProperty("zt2_ProductModel"); - pmCombox.getSelectionModel().select(productModel); - assignBtn.setDisable(true); - ecnId.setText(target.getProperty("item_id")); - TCProperty[] properties = null; + if (target.getType().equals("ZT2_ProjectItem")) { + // ȡƷ + List ccpNameFromProject = KUtil.getCCPNameFromProject(target, session); + prodNameComb.getItems().addAll(ccpNameFromProject); + } else { + // Ϊʱ IDʱ䣬Ʒͺš + List productNameList = new ArrayList<>(); + productNameList = Util.getProductNames(target, productNameList); + prodNameComb.getItems().addAll(productNameList); + String productModel = target.getProperty("zt2_ProductModel"); + pmCombox.getSelectionModel().select(productModel); + assignBtn.setDisable(true); + ecnId.setText(target.getProperty("item_id")); + TCProperty[] properties = null; try { Date date = target.getDateProperty("zt2_ChangeDate"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); if (date != null) { changeDate.getEditor().setText(sdf.format(date)); } - //ʼѡй + // ʼѡй if (target.getType().equals("ZT2_Change")) { String[] changeUnit1 = target.getProperty("zt2_ChangeUnit1").split(";"); for (int j = 0; j < changeUnit1.length; j++) { @@ -591,8 +586,8 @@ public class CreateEcnController extends KFXPanelController { target.refresh(); properties = target.getTCProperties( new String[] { "zt2_ChangeDrawingNo", "zt2_Sign", "zt2_PlacesNo", "zt2_Partition", - "zt2_ChangeBefore1", "zt2_ChangeAfter1", "zt2_ChangeReason", "zt2_ProcessType1" ,"zt2_SZVersionbefore", - "zt2_SZRevisedversion", "zt2_SZProduct", "zt2_SZProcess"}); + "zt2_ChangeBefore1", "zt2_ChangeAfter1", "zt2_ChangeReason", "zt2_ProcessType1", + "zt2_SZVersionbefore", "zt2_SZRevisedversion", "zt2_SZProduct", "zt2_SZProcess" }); } catch (TCException e1) { e1.printStackTrace(); } @@ -608,7 +603,7 @@ public class CreateEcnController extends KFXPanelController { String[] szVersionAft = properties[9].getStringArrayValue(); String[] szProduct = properties[10].getStringArrayValue(); String[] szProcess = properties[11].getStringArrayValue(); - if(szProcess.length>0) { + if (szProcess.length > 0) { rb_Process.setSelected(szProcess[0].equals("N")); } String fileName = target.getProperty("zt2_FileName"); @@ -624,63 +619,66 @@ public class CreateEcnController extends KFXPanelController { int rowNum = 0; for (int j = 0; j < ChangeDrawingNo.length; j++) { rowNum++; - EcnBean ecnBean = new EcnBean(rowNum, reasons, wips, ChangeDrawingNo[j], sign[j], placesNo[j] - , ChangeBefore1[j], ChangeAfter1[j], ChangeReason[j], ProcessType1[j], szVersionBef[j], szVersionAft[j]); + EcnBean ecnBean = new EcnBean(rowNum, reasons, wips, ChangeDrawingNo[j], sign[j], placesNo[j], + ChangeBefore1[j], ChangeAfter1[j], ChangeReason[j], ProcessType1[j], szVersionBef[j], + szVersionAft[j]); ecnBeans.add(ecnBean); ecnBean.setProductSz(szProduct[j]); } - } - tableView.getItems().addAll(ecnBeans); - for(int i=0;i items = refTable.getItems(); - int i=0; - String refTableSql = "select * from CHINT_ECN_NOTIFICATION where \"ecncode\" = '"+ecnId.getText()+"' order by \"code\" asc , \"no\" asc "; - System.out.println("refTableSql==>"+refTableSql); - ResultSet read = SqlUtil.read(refTableSql); - while(read.next()) { + } + tableView.getItems().addAll(ecnBeans); + for (int i = 0; i < parts.size(); i++) { + CheckBox btn = new CheckBox(parts.get(i)); + partBtns.add(btn); + departPane.getChildren().add(btn); + if (unitList.contains(parts.get(i))) { + btn.setSelected(true); + } + } + + try { + SqlUtil.getTCDataConnection(database); + ObservableList items = refTable.getItems(); + int i = 0; + String refTableSql = "select * from CHINT_ECN_NOTIFICATION where \"ecncode\" = '" + ecnId.getText() + + "' order by \"code\" asc , \"no\" asc "; + System.out.println("refTableSql==>" + refTableSql); + ResultSet read = SqlUtil.read(refTableSql); + while (read.next()) { // \"result\",\"principal\",\"pctime\",\"remark\" - RefTableBean refTableBean = items.get(i); - refTableBean.setCompDate(read.getString("pctime")); - refTableBean.setMark(read.getString("remark")); - refTableBean.setUser(read.getString("principal")); - String result = read.getString("result"); - System.out.println("refTableSql==>"+read.getString("principal")); - if(result.equals("")) { - refTableBean.setShNo(true); - } - i=i+1; - } - refTable.setItems(items); + RefTableBean refTableBean = items.get(i); + refTableBean.setCompDate(read.getString("pctime")); + refTableBean.setMark(read.getString("remark")); + refTableBean.setUser(read.getString("principal")); + String result = read.getString("result"); + System.out.println("refTableSql==>" + read.getString("principal")); + if (result.equals("")) { + refTableBean.setShNo(true); + } + i = i + 1; + } + refTable.setItems(items); // if() // refTable.getItems().clear(); // refTable.getItems().addAll(items); - }catch(Exception e) { - e.printStackTrace(); - }finally { - SqlUtil.freeAll(); - } + } catch (Exception e) { + e.printStackTrace(); + } finally { + SqlUtil.freeAll(); + } } - /* - * - */ - /** - * @param type - * @param ̶1 - * @return ݼģ - * @throws TCException - * @function ͻȡݼģ - */ - protected TCComponentDataset getDataset(String type, int i) throws TCException { + + /* + * + */ + /** + * @param type + * @param ̶1 + * @return ݼģ + * @throws TCException + * @function ͻȡݼģ + */ + protected TCComponentDataset getDataset(String type, int i) throws TCException { TCComponentDataset dataset = null; TCComponentDataset newDataset = null; @@ -710,7 +708,7 @@ public class CreateEcnController extends KFXPanelController { // util.disconnect(conn, stmt, rs_get); } catch (SQLException e) { e.printStackTrace(); - }finally { + } finally { SqlUtil.freeAll(); } if (i == 0) { @@ -719,12 +717,13 @@ public class CreateEcnController extends KFXPanelController { return newDataset; } } - /** - * @param targetĿ - * @return ĵļ - * @function ȡĿĸĵļ - */ - private TCComponent getTargetFolder(TCComponent target) { + + /** + * @param targetĿ + * @return ĵļ + * @function ȡĿĸĵļ + */ + private TCComponent getTargetFolder(TCComponent target) { try { TCComponent[] folders = target.getRelatedComponents("IMAN_reference"); for (int i = 0; i < folders.length; i++) { @@ -742,52 +741,53 @@ public class CreateEcnController extends KFXPanelController { } return null; } - /** - * - * @function ʼӰı bean - */ - private void createDetailTable() { + + /** + * + * @function ʼӰı bean + */ + private void createDetailTable() { // TODO Auto-generated method stub - - TableColumn tc_beforChange = new TableColumn("ǰ"); - TableColumn tc_afterChange = new TableColumn("ĺ"); - TableColumn tc_afterVer = new TableColumn("ĺ汾"); - - TableColumn tc_drawNo = new TableColumn("ͼ"); - TableColumn tc_mark = new TableColumn(""); - TableColumn tc_xh = new TableColumn(""); - TableColumn> tc_wipTreat = new TableColumn>("Ʒ"); - TableColumn tc_beforVer = new TableColumn("ǰ汾"); - TableColumn> productSz = new TableColumn>("Եȼ"); - TableColumn> tc_reason = new TableColumn>("ԭ"); - TableColumn tc_poiNum = new TableColumn(""); - tableView.getColumns().addAll(tc_xh, tc_drawNo, tc_mark,tc_poiNum,tc_beforChange, tc_beforVer, tc_afterChange, - tc_afterVer,productSz,tc_reason,tc_wipTreat); - - tc_xh.setSortable(false); - tc_drawNo.setSortable(false); - tc_mark.setSortable(false); - tc_poiNum.setSortable(false); - tc_beforChange.setSortable(false); - tc_beforVer.setSortable(false); - tc_afterChange.setSortable(false); - tc_afterVer.setSortable(false); - tc_reason.setSortable(false); - productSz.setSortable(false); - tc_wipTreat.setSortable(false); - //аbean - tc_xh.setCellValueFactory(new PropertyValueFactory("num")); - tc_drawNo.setCellValueFactory(new PropertyValueFactory("drawNo")); - tc_mark.setCellValueFactory(new PropertyValueFactory("mark")); - tc_poiNum.setCellValueFactory(new PropertyValueFactory("poiNum")); - tc_beforChange.setCellValueFactory(new PropertyValueFactory("overChange")); - tc_beforVer.setCellValueFactory(new PropertyValueFactory("overVersion")); - tc_afterChange.setCellValueFactory(new PropertyValueFactory("afterChange")); - tc_afterVer.setCellValueFactory(new PropertyValueFactory("afterVersion")); - tc_reason.setCellValueFactory(new PropertyValueFactory>("changeReason")); - tc_wipTreat.setCellValueFactory(new PropertyValueFactory>("wipTreat")); - productSz.setCellValueFactory(new PropertyValueFactory>("productSz")); - + + TableColumn tc_beforChange = new TableColumn("ǰ"); + TableColumn tc_afterChange = new TableColumn("ĺ"); + TableColumn tc_afterVer = new TableColumn("ĺ汾"); + + TableColumn tc_drawNo = new TableColumn("ͼ"); + TableColumn tc_mark = new TableColumn(""); + TableColumn tc_xh = new TableColumn(""); + TableColumn> tc_wipTreat = new TableColumn>("Ʒ"); + TableColumn tc_beforVer = new TableColumn("ǰ汾"); + TableColumn> productSz = new TableColumn>("Եȼ"); + TableColumn> tc_reason = new TableColumn>("ԭ"); + TableColumn tc_poiNum = new TableColumn(""); + tableView.getColumns().addAll(tc_xh, tc_drawNo, tc_mark, tc_poiNum, tc_beforChange, tc_beforVer, tc_afterChange, + tc_afterVer, productSz, tc_reason, tc_wipTreat); + + tc_xh.setSortable(false); + tc_drawNo.setSortable(false); + tc_mark.setSortable(false); + tc_poiNum.setSortable(false); + tc_beforChange.setSortable(false); + tc_beforVer.setSortable(false); + tc_afterChange.setSortable(false); + tc_afterVer.setSortable(false); + tc_reason.setSortable(false); + productSz.setSortable(false); + tc_wipTreat.setSortable(false); + // аbean + tc_xh.setCellValueFactory(new PropertyValueFactory("num")); + tc_drawNo.setCellValueFactory(new PropertyValueFactory("drawNo")); + tc_mark.setCellValueFactory(new PropertyValueFactory("mark")); + tc_poiNum.setCellValueFactory(new PropertyValueFactory("poiNum")); + tc_beforChange.setCellValueFactory(new PropertyValueFactory("overChange")); + tc_beforVer.setCellValueFactory(new PropertyValueFactory("overVersion")); + tc_afterChange.setCellValueFactory(new PropertyValueFactory("afterChange")); + tc_afterVer.setCellValueFactory(new PropertyValueFactory("afterVersion")); + tc_reason.setCellValueFactory(new PropertyValueFactory>("changeReason")); + tc_wipTreat.setCellValueFactory(new PropertyValueFactory>("wipTreat")); + productSz.setCellValueFactory(new PropertyValueFactory>("productSz")); + tc_xh.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06)); tc_drawNo.prefWidthProperty().bind(tableView.widthProperty().multiply(0.18)); tc_mark.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06)); @@ -797,11 +797,12 @@ public class CreateEcnController extends KFXPanelController { tc_afterChange.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10)); productSz.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06)); tc_afterVer.prefWidthProperty().bind(tableView.widthProperty().multiply(0.06)); - tc_reason.prefWidthProperty().bind(tableView.widthProperty().multiply(0.14)); //0.4 + tc_reason.prefWidthProperty().bind(tableView.widthProperty().multiply(0.14)); // 0.4 tc_wipTreat.prefWidthProperty().bind(tableView.widthProperty().multiply(0.10)); } - @FXML - public TableView refTable; + + @FXML + public TableView refTable; /** * @@ -809,7 +810,7 @@ public class CreateEcnController extends KFXPanelController { */ private void createRefTable() { // TODO Auto-generated method stub - //Ӱ + // Ӱ // protected SimpleStringProperty depart;// // protected SimpleStringProperty message; //ж // protected CheckBox shYes = new CheckBox();// @@ -817,80 +818,82 @@ public class CreateEcnController extends KFXPanelController { // protected TextField user;//ǰ汾 // protected TextField compDate;//ĺ // protected TextField mark;//ĺ汾 - TableColumn deapart = new TableColumn(""); - TableColumn message = new TableColumn("жҪ֤ݣ"); - TableColumn shYes = new TableColumn(""); //Ҫֵƣ - TableColumn shNo = new TableColumn(""); - TableColumn user = new TableColumn(""); - TableColumn compDate = new TableColumn("ʱ"); // - TableColumn mark = new TableColumn("ע"); // - - deapart.setCellValueFactory(new PropertyValueFactory("depart")); - message.setCellValueFactory(new PropertyValueFactory("message")); - shYes.setCellValueFactory(new PropertyValueFactory("shYes")); - shNo.setCellValueFactory(new PropertyValueFactory("shNo")); - user.setCellValueFactory(new PropertyValueFactory("user")); - compDate.setCellValueFactory(new PropertyValueFactory("compDate")); - mark.setCellValueFactory(new PropertyValueFactory("mark")); - - deapart.setSortable(false); - message.setSortable(false); - shYes.setSortable(false); - shNo.setSortable(false); - user.setSortable(false); - compDate.setSortable(false); - mark.setSortable(false); - refTable.getColumns().addAll(deapart, message, shYes,shNo,user, compDate, mark); + TableColumn deapart = new TableColumn(""); + TableColumn message = new TableColumn("жҪ֤ݣ"); + TableColumn shYes = new TableColumn(""); // Ҫֵƣ + TableColumn shNo = new TableColumn(""); + TableColumn user = new TableColumn(""); + TableColumn compDate = new TableColumn("ʱ"); // + TableColumn mark = new TableColumn("ע"); // + + deapart.setCellValueFactory(new PropertyValueFactory("depart")); + message.setCellValueFactory(new PropertyValueFactory("message")); + shYes.setCellValueFactory(new PropertyValueFactory("shYes")); + shNo.setCellValueFactory(new PropertyValueFactory("shNo")); + user.setCellValueFactory(new PropertyValueFactory("user")); + compDate.setCellValueFactory(new PropertyValueFactory("compDate")); + mark.setCellValueFactory(new PropertyValueFactory("mark")); + + deapart.setSortable(false); + message.setSortable(false); + shYes.setSortable(false); + shNo.setSortable(false); + user.setSortable(false); + compDate.setSortable(false); + mark.setSortable(false); + refTable.getColumns().addAll(deapart, message, shYes, shNo, user, compDate, mark); // //ÿ - deapart.prefWidthProperty().bind(refTable.widthProperty().multiply(0.14)); - message.prefWidthProperty().bind(refTable.widthProperty().multiply(0.36)); - shYes.prefWidthProperty().bind(refTable.widthProperty().multiply(0.05)); - shNo.prefWidthProperty().bind(refTable.widthProperty().multiply(0.05)); - user.prefWidthProperty().bind(refTable.widthProperty().multiply(0.13)); - compDate.prefWidthProperty().bind(refTable.widthProperty().multiply(0.13)); - mark.prefWidthProperty().bind(refTable.widthProperty().multiply(0.14)); - List refTableBeans = new ArrayList(); - //ʼ д - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("ƷͼĿ¼Ƶ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("DFMEAƷҪȷּ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("BOMϸ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("װͼ/淶"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("ǩ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("ͻŵļ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("Ҫ"))); - - refTableBeans.add(new RefTableBean(new SimpleStringProperty("ղ"),new SimpleStringProperty("ͼPFMEA"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty("ղ"),new SimpleStringProperty("ҵָ顢װָ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty("ղ"),new SimpleStringProperty("ͻŵعļ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty("ղ"),new SimpleStringProperty("ģߡװ豸"))); - - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("Ƽƻ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("//Ʒļ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("Ӧ̲Ʒ鱨"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("ͻŵļ"))); - - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("ϵʶл"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("Ʒȷϼ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("Ʒȷϼ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("ƻȷϼ"))); - - refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"),new SimpleStringProperty("ɹ۸仯"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"),new SimpleStringProperty("Ϣ(ϡ۸)"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"),new SimpleStringProperty("ϸ񹩷ۣʱ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"),new SimpleStringProperty("Ӧ̺ͬ޸"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"),new SimpleStringProperty("Ӧ̴Ʒȷ"))); - - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("֪ͨͻ"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("ͻ׼"))); - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("޸ĿͻЭ"))); - - refTableBeans.add(new RefTableBean(new SimpleStringProperty(""),new SimpleStringProperty("ۼ۸仯"))); - - refTable.getItems().addAll(refTableBeans); - - + deapart.prefWidthProperty().bind(refTable.widthProperty().multiply(0.14)); + message.prefWidthProperty().bind(refTable.widthProperty().multiply(0.36)); + shYes.prefWidthProperty().bind(refTable.widthProperty().multiply(0.05)); + shNo.prefWidthProperty().bind(refTable.widthProperty().multiply(0.05)); + user.prefWidthProperty().bind(refTable.widthProperty().multiply(0.13)); + compDate.prefWidthProperty().bind(refTable.widthProperty().multiply(0.13)); + mark.prefWidthProperty().bind(refTable.widthProperty().multiply(0.14)); + List refTableBeans = new ArrayList(); + // ʼ д + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("ƷͼĿ¼Ƶ"))); + refTableBeans.add( + new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("DFMEAƷҪȷּ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("BOMϸ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("װͼ/淶"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("ǩ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("ͻŵļ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("Ҫ"))); + + refTableBeans + .add(new RefTableBean(new SimpleStringProperty("ղ"), new SimpleStringProperty("ͼPFMEA"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty("ղ"), new SimpleStringProperty("ҵָ顢װָ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty("ղ"), new SimpleStringProperty("ͻŵعļ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty("ղ"), new SimpleStringProperty("ģߡװ豸"))); + + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("Ƽƻ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("//Ʒļ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("Ӧ̲Ʒ鱨"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("ͻŵļ"))); + + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("ϵʶл"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("Ʒȷϼ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("Ʒȷϼ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("ƻȷϼ"))); + + refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"), new SimpleStringProperty("ɹ۸仯"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"), new SimpleStringProperty("Ϣ(ϡ۸)"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"), new SimpleStringProperty("ϸ񹩷ۣʱ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"), new SimpleStringProperty("Ӧ̺ͬ޸"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty("ɹ"), new SimpleStringProperty("Ӧ̴Ʒȷ"))); + + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("֪ͨͻ"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("ͻ׼"))); + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("޸ĿͻЭ"))); + + refTableBeans.add(new RefTableBean(new SimpleStringProperty(""), new SimpleStringProperty("ۼ۸仯"))); + + refTable.getItems().addAll(refTableBeans); + } - // + + // /** * @param frame * @function ҳļ @@ -898,143 +901,149 @@ public class CreateEcnController extends KFXPanelController { private void addWindListener(CreateEcnFrame frame) { // TODO Auto-generated method stub - frame.addComponentListener(new ComponentListener() { - + frame.addComponentListener(new ComponentListener() { + @Override public void componentShown(ComponentEvent e) { // TODO Auto-generated method stub - + } - + @Override public void componentResized(ComponentEvent e) { // TODO Auto-generated method stub // System.out.println("=============="); double width = e.getComponent().getSize().getWidth(); // // double width = primaryStage.getWidth(); - System.out.println("width==>"+width); - scollPane.setPrefWidth(width * 0.98); - gridPane.setPrefWidth(width * 0.98); - tableView.setPrefWidth(width * 0.97); - refTable.setPrefWidth(width * 0.97); + System.out.println("width==>" + width); + scollPane.setPrefWidth(width * 0.98); + gridPane.setPrefWidth(width * 0.98); + tableView.setPrefWidth(width * 0.97); + refTable.setPrefWidth(width * 0.97); } - + @Override public void componentMoved(ComponentEvent e) { // TODO Auto-generated method stub - + } - + @Override public void componentHidden(ComponentEvent e) { // TODO Auto-generated method stub - + } }); - - SqlUtil.getTCDataConnection(database); - try { - - String sql = "select PART,REASON,MANAGE,DATASET,UNIT,GRADE from CHINT_ECN_TYPE where CODE = ?"; - ResultSet read = SqlUtil.read(sql, new String[] {SAPUtil.getGroupID()}); - if(read.next()) { - String part = read.getString(1); - String reason = read.getString(2); - String manage = read.getString(3); - String dataset = read.getString(4); - String factory = read.getString(5); - String grade = read.getString(6); - factoryText.setText(factory); - String[] partArray = part.split(";"); - String[] reasonArray = reason.split(";"); - String[] manageArray = manage.split(";"); - String[] grades = grade.split(";"); - parts = new ArrayList(Arrays.asList(partArray)); - reasons = new ArrayList(Arrays.asList(reasonArray)); - wips = new ArrayList(Arrays.asList(manageArray)); - products = new ArrayList(Arrays.asList(grades)); - } - - }catch(Exception e) { - e.printStackTrace(); - }finally { - SqlUtil.freeAll(); - } - + + SqlUtil.getTCDataConnection(database); + try { + + String sql = "select PART,REASON,MANAGE,DATASET,UNIT,GRADE from CHINT_ECN_TYPE where CODE = ?"; + ResultSet read = SqlUtil.read(sql, new String[] { SAPUtil.getGroupID() }); + if (read.next()) { + String part = read.getString(1); + String reason = read.getString(2); + String manage = read.getString(3); + String dataset = read.getString(4); + String factory = read.getString(5); + String grade = read.getString(6); + factoryText.setText(factory); + String[] partArray = part.split(";"); + String[] reasonArray = reason.split(";"); + String[] manageArray = manage.split(";"); + String[] grades = grade.split(";"); + parts = new ArrayList(Arrays.asList(partArray)); + reasons = new ArrayList(Arrays.asList(reasonArray)); + wips = new ArrayList(Arrays.asList(manageArray)); + products = new ArrayList(Arrays.asList(grades)); + } + + } catch (Exception e) { + e.printStackTrace(); + } finally { + SqlUtil.freeAll(); + } + } - + /** * @param event * @function 5 */ @FXML - void addRows(ActionEvent event) { - for(int i=0;i<5;i++) { - ecnBeans.add(new EcnBean(ecnBeans.size()+1, reasons, wips, products)); - } - ObservableList data = FXCollections.observableArrayList(ecnBeans); - tableView.getItems().clear(); + void addRows(ActionEvent event) { + for (int i = 0; i < 5; i++) { + ecnBeans.add(new EcnBean(ecnBeans.size() + 1, reasons, wips, products)); + } + ObservableList data = FXCollections.observableArrayList(ecnBeans); + tableView.getItems().clear(); tableView.setItems(data); - } - /** - * @param event - * @function - */ - @FXML - void addRow(ActionEvent event) { - ecnBeans.add(new EcnBean(ecnBeans.size()+1, reasons, wips, products)); - ObservableList data = FXCollections.observableArrayList(ecnBeans); - tableView.getItems().clear(); + } + + /** + * @param event + * @function + */ + @FXML + void addRow(ActionEvent event) { + ecnBeans.add(new EcnBean(ecnBeans.size() + 1, reasons, wips, products)); + ObservableList data = FXCollections.observableArrayList(ecnBeans); + tableView.getItems().clear(); tableView.setItems(data); - } - /** - * @param event - * @function ɾ - */ - @FXML - void deleteRow(ActionEvent event) { - int selectedIndex = tableView.getSelectionModel().getSelectedIndex(); - System.out.println("selectedIndex==>"+selectedIndex); - ecnBeans.remove(selectedIndex); - for(int i=selectedIndex;i data = FXCollections.observableArrayList(ecnBeans); - tableView.getItems().clear(); + } + + /** + * @param event + * @function ɾ + */ + @FXML + void deleteRow(ActionEvent event) { + int selectedIndex = tableView.getSelectionModel().getSelectedIndex(); + System.out.println("selectedIndex==>" + selectedIndex); + ecnBeans.remove(selectedIndex); + for (int i = selectedIndex; i < ecnBeans.size(); i++) { + ecnBeans.get(i).setNum(new SimpleIntegerProperty(i + 1)); + } + ObservableList data = FXCollections.observableArrayList(ecnBeans); + tableView.getItems().clear(); tableView.setItems(data); - } - /** - * @param event - * @function ָɰť - */ - @FXML - void assignClick(ActionEvent event) { + } + + /** + * @param event + * @function ָɰť + */ + @FXML + void assignClick(ActionEvent event) { // rb_tempChange // assignBtn ecnId - try { - AssignIdDialog dialog = new AssignIdDialog(session,SAPUtil.getGroupID(),ecnId,target,rb_tempChange.isSelected(),assignBtn); + try { + AssignIdDialog dialog = new AssignIdDialog(session, SAPUtil.getGroupID(), ecnId, target, + rb_tempChange.isSelected(), assignBtn); dialog.start(new Stage()); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } - } - @FXML - public TextField relateEcnText; - /** - * @param event - * @function 뵥ť - */ - @FXML - void relateClick(ActionEvent event) { - RelateEcnDialog dialog = new RelateEcnDialog(session,controller); - try { + } + + @FXML + public TextField relateEcnText; + + /** + * @param event + * @function 뵥ť + */ + @FXML + void relateClick(ActionEvent event) { + RelateEcnDialog dialog = new RelateEcnDialog(session, controller); + try { dialog.start(new Stage()); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); } - - } + + } } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnFrame.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnFrame.java index dbc02b6..fb76417 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnFrame.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnFrame.java @@ -8,7 +8,7 @@ import com.chint.plm.fxUtil.KFrame; import javafx.embed.swing.JFXPanel; -public class CreateEcnFrame extends KFrame{ +public class CreateEcnFrame extends KFrame { public CreateEcnFrame() { super(); diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnPanel.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnPanel.java index 4ea8bd4..a80bf4c 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnPanel.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/CreateEcnPanel.java @@ -4,10 +4,10 @@ import java.awt.Window; import com.chint.plm.fxUtil.KFXPanel; -public class CreateEcnPanel extends KFXPanel{ +public class CreateEcnPanel extends KFXPanel { public CreateEcnPanel(Window dialog) { - super(dialog,"ChangeNoticePanel.fxml"); + super(dialog, "ChangeNoticePanel.fxml"); // TODO Auto-generated constructor stub } } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/EcnBean.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/EcnBean.java index 988fb14..596ff89 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/EcnBean.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/EcnBean.java @@ -1,6 +1,5 @@ package com.chint.plm.createEcn; - import java.util.ArrayList; import java.util.List; @@ -10,84 +9,87 @@ import javafx.scene.control.ComboBox; import javafx.scene.control.TextArea; public class EcnBean { - + protected SimpleIntegerProperty num; - protected TextArea drawNo;//ͼ - protected TextArea mark; // - protected TextArea poiNum; // - protected TextArea overChange;//ǰ - protected TextArea overVersion;//ǰ汾 - protected TextArea afterVersion;//ĺ汾 - protected TextArea afterChange;//ĺ - protected ComboBox productSz = new ComboBox();//Եȼ - protected ComboBox changeReason = new ComboBox();//ԭ - protected ComboBox wipTreat = new ComboBox();//Ʒ - + protected TextArea drawNo;// ͼ + protected TextArea mark; // + protected TextArea poiNum; // + protected TextArea overChange;// ǰ + protected TextArea overVersion;// ǰ汾 + protected TextArea afterVersion;// ĺ汾 + protected TextArea afterChange;// ĺ + protected ComboBox productSz = new ComboBox();// Եȼ + protected ComboBox changeReason = new ComboBox();// ԭ + protected ComboBox wipTreat = new ComboBox();// Ʒ + public ComboBox getProductSz() { return productSz; } + public void setProductSz(String productSz) { this.productSz.getSelectionModel().select(productSz); } - EcnBean(int ind, List reasons, List wips,List products) { + + EcnBean(int ind, List reasons, List wips, List products) { num = new SimpleIntegerProperty(ind); - drawNo = new TextArea(); //ComboBoxTextArea + drawNo = new TextArea(); // ComboBoxTextArea drawNo.setPrefSize(200, 40); - - mark = new TextArea(); //ComboBoxTextArea + + mark = new TextArea(); // ComboBoxTextArea mark.setPrefSize(200, 40); - - poiNum = new TextArea(); //ComboBoxTextArea + + poiNum = new TextArea(); // ComboBoxTextArea poiNum.setPrefSize(200, 40); - - overChange = new TextArea(); //ComboBoxTextArea + + overChange = new TextArea(); // ComboBoxTextArea overChange.setPrefSize(200, 40); - - overVersion = new TextArea(); //ComboBoxTextArea + + overVersion = new TextArea(); // ComboBoxTextArea overVersion.setPrefSize(200, 40); - - afterChange = new TextArea(); //ComboBoxTextArea + + afterChange = new TextArea(); // ComboBoxTextArea afterChange.setPrefSize(200, 40); - - afterVersion = new TextArea(); //ComboBoxTextArea + + afterVersion = new TextArea(); // ComboBoxTextArea afterVersion.setPrefSize(200, 40); wipTreat.getItems().addAll(wips); productSz.getItems().addAll(products); productSz.getSelectionModel().selectFirst(); changeReason.getItems().addAll(reasons); } - EcnBean(int ind, List reasons, List wips, String drawNoVal, String markVal, - String placesNo, String changeBefore, String changeAfter, String reasonVal, String processType, - String szRevisionBef, String szRevisionAft) { + + EcnBean(int ind, List reasons, List wips, String drawNoVal, String markVal, String placesNo, + String changeBefore, String changeAfter, String reasonVal, String processType, String szRevisionBef, + String szRevisionAft) { num = new SimpleIntegerProperty(ind); - drawNo = new TextArea(); //ComboBoxTextArea + drawNo = new TextArea(); // ComboBoxTextArea drawNo.setPrefSize(200, 40); drawNo.setText(drawNoVal); - - mark = new TextArea(); //ComboBoxTextArea + + mark = new TextArea(); // ComboBoxTextArea mark.setPrefSize(200, 40); mark.setText(markVal); - - poiNum = new TextArea(); //ComboBoxTextArea + + poiNum = new TextArea(); // ComboBoxTextArea poiNum.setPrefSize(200, 40); poiNum.setText(placesNo); - - overChange = new TextArea(); //ComboBoxTextArea + + overChange = new TextArea(); // ComboBoxTextArea overChange.setPrefSize(200, 40); overChange.setText(changeBefore); - - overVersion = new TextArea(); //ComboBoxTextArea + + overVersion = new TextArea(); // ComboBoxTextArea overVersion.setPrefSize(200, 40); overVersion.setText(szRevisionBef); - - afterChange = new TextArea(); //ComboBoxTextArea + + afterChange = new TextArea(); // ComboBoxTextArea afterChange.setPrefSize(200, 40); afterChange.setText(changeAfter); - - afterVersion = new TextArea(); //ComboBoxTextArea + + afterVersion = new TextArea(); // ComboBoxTextArea afterVersion.setPrefSize(200, 40); afterVersion.setText(szRevisionAft); - + wipTreat.getItems().addAll(wips); wipTreat.getSelectionModel().select(processType); changeReason.getItems().addAll(reasons); @@ -174,6 +176,4 @@ public class EcnBean { this.wipTreat = wipTreat; } - - } diff --git a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/Util.java b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/Util.java index 1f56910..5e55766 100644 --- a/com.connor.chint.wuhan/src/com/chint/plm/createEcn/Util.java +++ b/com.connor.chint.wuhan/src/com/chint/plm/createEcn/Util.java @@ -18,6 +18,9 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.util.CellRangeAddress; +import org.apache.poi.xssf.usermodel.XSSFCell; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; import com.connor.chint.sap2.util.KUtil; import com.connor.chint.sap2.util.POIUtil; @@ -26,6 +29,7 @@ import com.teamcenter.rac.kernel.TCComponent; import com.teamcenter.rac.kernel.TCComponentDataset; import com.teamcenter.rac.kernel.TCComponentTcFile; import com.teamcenter.rac.kernel.TCException; +import com.teamcenter.rac.kernel.TCPreferenceService; import com.teamcenter.rac.kernel.TCSession; import com.teamcenter.rac.util.MessageBox; @@ -52,6 +56,60 @@ public class Util { return conn; } + /** + * + * @param session + * @param PreServiceName:ѡ + * @param Filetype:excelͣMSExcelX + * @return + */ + public static File getFile(TCSession session,String PreServiceName,String Filetype) { + TCPreferenceService service = session.getPreferenceService(); + String puid = service.getStringValue(PreServiceName); + if (puid == null) + { + System.out.println("δҵѡ"); + return null; + } + TCComponentDataset dat; + try { + dat = (TCComponentDataset)session + .stringToComponent(puid); + + TCComponentTcFile[] tcFile = dat.getTcFiles(); + if(tcFile != null && tcFile.length == 0) + { + System.out.println("δҵļ"); + } + else + { + return tcFile[0].getFmsFile(); + } + } catch (TCException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; + } + private static void setCellValue(XSSFCell cell2,int index,XSSFRow row0,String cellValue) { + // TODO Auto-generated method stub + + if(cell2 == null) { + cell2 = row0.createCell(index); + } + + cell2.setCellValue(cellValue); + + } + private static XSSFRow getRow(XSSFSheet sheetAt,int rowNum) { + // TODO Auto-generated method stub + + XSSFRow row = sheetAt.getRow(rowNum); + if(row ==null) { + row = sheetAt.createRow(rowNum); + } + return row; + } /** * @param dateset * @return ģļ