From 02d73b5cab48962baa3e775daec25085bbd61f0f Mon Sep 17 00:00:00 2001 From: Richard Derks Date: Tue, 4 Jan 2005 12:53:38 +0000 Subject: [PATCH] CGEY#098 - PRS: Personen die uitdienst zijn verwijderen uit Facilitor svn path=/Customer/trunk/; revision=12682 --- CAPG/Sap2FCLT/Doc/import sap.doc | Bin 111104 -> 111104 bytes CAPG/Sap2FCLT/Fip_perslid_sap.ctl | 1 + CAPG/Sap2FCLT/Fip_perslid_sap.sql | 49 ++++++++++++++++++++++++++---- CAPG/Sap2FCLT/create_fip.sql | 7 +++-- 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/CAPG/Sap2FCLT/Doc/import sap.doc b/CAPG/Sap2FCLT/Doc/import sap.doc index 2504f9222d1fbf7b0533edbffca37adf50bd130c..949ef8d05ab78a8b375f3c975a109b4eef1cb70a 100644 GIT binary patch delta 10894 zcmeI&dstOvzQFPK-Jl|ff+#mZ_ZBcPM92#lMNtto74brhXdRK8+Yk^Dyyey|j@L4` zvaK^yW=Y;M$6cV+s54TQrej{3PFb3jcCztOnocUt_Xn;-p6MKWp3|8>&e=Ynz23d{ zyVm->zjy8Ru6N;kWzf=7~R*3O&eDt+7K4Rm~vZ1^Z2h=Z(&5fnelKOA!TlNVb zENti7U^`=bV=2e^vAOD|8tTzpK&GZy(*Ol+nN4`YW}N?+>Oa)v|umx_8-60UO5B zx@gu&Kg;Vl^`2v?bLu{-H`)Ht+n+s@5kTSqXH64(+mwD;g=JZV59bzGCqHa1&zfeQ zWX&xx7g}>m&DKJ5Sy55RENgCIq?vbfS#C)VUlwPTWaXD+W#yTBngS%vJdWV&@qDbY;JEnyQX zM-XOiUTKs$vxp`{nsW$J0xGp<`-O!~x0af7NXfKP!YeGAQkR?}b75}o?TTi5v7dj7 zpBkDI<>}PPPq;eu{VuNV^EpAhl9jq~!}&t;x7zvRh)$i_KOdmf8oZ15a0aG8r8*-& z(7xuwH0P6LbG1#r`w(B@G^C!Uj?|4sN?m=WCb6_)GNzyqWhloC%*1c85Kmz_p2iBS z#f#X0jo5_E*b}HyRSkuG*pCA^h|h2WU*R;);A@=4x44AM_yJe&Bd)>4?zz;jW9xQG z`JfHj!XE*!pd&)t*;~&%7nRQj(kf|@w59|`i=;KulBJN=_^aki1~ zUC|WoXbDO4&uz1SZH#V^E|ByGL%QJSwpmDyj4leJUIe-zrk%a0VU89jXl+L3bx>NRAC1W;0TW5uQ-QGxZFZ?iOFByO9|xlkdQooJ4}^+Duj?QBo@F2+5Q(lK_Tsfc_O#~$ooUZ))ixj2 z`9bOhKfa05CJJ27D<6LUz#q>Hd-vL zEyn_<Vw7MSrlSnyn2kAj1at9QEW~0g!7@CFr?3*MPyq*C!aBT+_1K6_p`1{g zDeS|39Kr`Uj3YRKlQ@Mh@D)zu3|zywdZIbp;ei%t3t#vn0PPTjU|7%*AqYiWSOzBy zgva>z&cdg)Bmu^B6*dZNXP*u%PQ1hFO1}U;IvdxP4XwXle|gJjC`G^ zd=a%y%XX^OQq)9hq)}2R>66q++Jfwsox#pNZ~R$XjOK zE*^yJW(ka4t)eWub3k^v6UJ_9D8G$&uostb89(3}uHy!3ac?+3_Q-JV%@B)tY(W*O zQG+8mieu;zp;R(bFbIP&1otBqBQP3ckd6nCfpHj*3CO~=OJ`61$F)l=oVEK*Iza-K zV2wZ}NC~iEY;hdlh)-gZcm_pqdl2M&;Qfu-+lWVEkvPUUy$_z(@kS^ThJ+x8pNJe- zQHUZ;MHyye4(8gu55_u+4=vX=W0P!F%Vv`xn@)kTc`;?##dOGSX5pt@QMTbRJdTA} zgvD5aN4n6m`^YASTq1HwEAkj*cPvVY9og+VdRVOwK*a-GB2^N)oxV+*fbYJE&2u25#V}>*F zBYrbdb=|G1wJfDt(5-4^Mpc$GF&lHS2#c`<%izF{Bz}s}{g@8H8|@I&pL|1RnMhy6H!gE-;KHS83HuW%Y)<6B(7C0xc8T*FPc_z^vt!W}Kq8a`-?00hH=jtD~p zx*!Jkp(h68Q9R*i;|7$%BCNrSsKm?Ih%MNL*HMKXIDkVqf}{8=&fy|1;WDn`I+Q;F zqY2#50$yl?w(z&{7KLtzMI7RhfL`d0M5JI4#^4w2*S`Eu}DBK48TB)K?X804mrp}F{Ysm z<(PxHScoNf(rn}GrLYPPtiyV2!e+dND%4;v_F+Fhz!99p7dVYGIFE~{g|^W5XaaY% zfG+|NgkW^E@fM1B^hRGKAq9gm1{ui2IAkLiQ&Ea?%)mU%M+GWTh28iQ-oZXx#otj2 zQ%BAL*kX9=i3Ci76@@6qX`I2|a2~-S+_NDRogh;?nca@ZLonuU6_i(F7k1-q?8Rls zB=kCJ5h)XvE}`}FtT>i3+1!F^9D^}exS!j+5s-V~bjbbicw}KBa$rRviXb<|WtfdQ zm&+$9z*%Ph(tPuGQ1AMaAe}Gu8g1f8lxCbN27>8%M@c3 z#`olo56j{>vG5cecoq}l2^PheiP`uJCvCh{GU%?yO=xZtTo8;7D8~%U#4OClVl2Tr z3}K*dnaD_h&WP&6?;FE0r!Osp452p6!+f+%;@W`KN-1aFcLgE#liv+?9B!)%+RFny zA9_Znv2r&qcerv3C8M@?vSYljo@J8RTAq&#ethllb^OdfN| zGc0)~CC`}TnUOpLl4m*cd`6xh$QdLvf0@?HoZXk>%1m3PdNPlbNt(>SWO^m@rj#)L zpd-C2!O0{*?&9SRRPG?}R9x`J62pP3% zAtRTG!9Yf>=8%!g6Eb>v`|%Tyq01jKd<8*1 zn$oRq@P#~E?uBH`#2m=;-X)Ok{}7+yb1dN$Sc$_pX5;M|YSA*7=W#fR|Aa5YSOEH> zKSp63-oh>%#xZ=2vvBD^P-q2j$gmd*8Re28qgobZ6q^sZ^xC3$i$)ye+PML8{oIAC zoOqh^Os*!gZk=af(hDF$jYP^XWe1q>Xlq=a7e1uQ%B~IfKuHaad zjZ|}ai;CtzSkA9!HJ-umaGJ~9d0fCH9OF`V9J_il6yo1wX(=M(xQoFkjK$+v47vRM z9=`E(CFC-g1GyBIW3yZWU&U5bVHav}5??@OQ2&OoUR>gkflSQBA_Vki97R8*pb({4 zg5`JyYp?^mp%Xbr@Ox~)XeV!PAg~Vu0H&f8Td*B6MRA33{ajD^5DvqX#P{$-OSA&l zR!6Z}`{`!YbqmKmAv(I+X4c!aZYSTg^K@0sl%bg;EmZqCY$4h$-?$Y0cOl4S{4T;! zE*!^&Bi*T)BQ;b9jIPl9B?ec~#Kfu9q5fX6++2UBB=;C{PhkvXGWJNqWo)?t3E}`; z8nk<7sO~UCTGmW8fl1xG*+!8j{#2f$?p0%DMy%5KRHP=WT$Qa#`8--pQQi4Bp3nKL zovA|j<9ED@b3}*fF8mVyf3yEHDY>UQBtn1hVf){lkKUS#Hk^vu{snWlrIP1$N!6)Ix`&G;H00@&Q;*GBkgCdDnLagVy2*W*R@{g)#6RX$ zRQ=KbJyn}hllYH!k*3Tj7Hz7>4%9E3`0p>>D+cRmy}3GOuzKwr5s$A5`Zk_H3+UlnQ`!vb#BUI zlw0X#53Qu~RLA)ty2{1PJ=EcquYDam@7H^DdVP8IQ2mkX$|mju>poU59;U;!$8dIW zpZmzBNiLC&KMvQC9^E3s%Ok>Ly2ZvtIKCOK`ku8Z%5x@tXn&hd#$?Cp^1F){zz?goFAcm9D_$`t2S3}8>N>t zVK04tqgQzWA!#yKR5T%`dHdzY9}{+?`G-= zZmu7>xbLZ7-9KCJXLZXQU2AeZ(agP5HOZJCqSx1dy?(K-bS-gnUtRaHdeRcT+MTY8 zs;JPrTNe?D!iE{2u*et!(RkSEVu&vQ=iKWBVCv)Aldd+*=+ z?LB*~wK4m2_3YEt*9O^ax$#D@Ez(v!))-)$@4nnlmA@)4qgfN#Ua4U$b6EbOm3qwA zTW`?_rS{pBn%7aOF09&9v8>+7`+e2r7ZvNPE}iU$-Sk#L6y)_smd&V_nWj_-Th1A+ z)EYj=vHfkvi}res`zk{Gq7xtMyQ?0t>Sx(dUT5OHOKWp$X|=@rty1#&AAA_ZcJ(W5 zXKimS?igXkX?-pGjkW(4XJ{X#9$~wM##iB&aCX$a$7m z0PFKucDTR%qZ&;#Gk*K*r>p?Z#GBiFjN6=v4?Q?$!lW@{#)nME7&9p(V?xMd4?Xlq zR>qhK=Bt78!p-TuX4=h=-cz)x`&F|$sKTG?pApHlKfNx^~NVYp@9gka`Cob^V-5Info}5QA8BM?Cr=0sWDPzhM|g<9>`m zIv&I0n1<l zCE95DlYB|8wnOsuTf8^MF(Xbpt$a!@C6Av%a(T0Do?;s- z*OF(+@kvOYZ??@Wwz1BGoCC>!DSr4T+sr0M^1Ym*E4T_BsFY8j@lfR)<-}=sSw$Vi z_fp4RUXObY%NlSX2tzOw!!R6=ViK}21=BDcPhtk1K@Oh7Ygma@cpckNgk6DL$a^U4 z!+spb5qyRd_!8%F0k$B1S*VFx2tXY;@qCC#(3t(>By?t-9i0|4F67o&B)wh9acHfr>S2x*|(5b zzaXRg_6Q?+drfoLf@L~VPJlnGlTe#-%*$vNB9Z1KuLu6oMnZ~c3>xp@F8|%4=$lJls^A5g&$Fd zE4YQxiZ2}SLrv5|ZA79qIvE{a+wH1GZOMt`LvkT`kQ`X;k1$T`Q<&wfR|AJ&&bW4l4(5nXXk-lQc*Qr1{cx ztJ(W0A4G}aS{7{%S+i2RO89sY-i&yYA&HPANCIk^t~c1Dm4gPXYJ_mKgq4$M)AirSb>!=u>l*Ak4-4RW*o*59K+{0juSYK5?sJVe1l6U#SgfQA5jMX+wbLq zxt)sz0jP_5xD}1yL?D9D9N}nzmS}}Yv_=B@V;m+U%NVrob(iE-aw_?hTv~aQ97_I% znXdJmDM_KE&q|%7O;RT5l2o}(*9NMQt@32eW|@NpSOhD1%T3ots!9GNcak^BnU$|X z$~#bOy56B$F~tM0(kLmE^hxR@ZI=w!8^PwC1s`aal|9LvWK9w#$+8mVG+kTRqvT5R zBsr4&Sh?v$xifm1uJ?}X#=R)s1uJC(DG!3AF3WHg1REpr{LMaFH)(ektDZp)49v$% zco_@vD)O)!d+-rHK`{>CAgYD&qlXV_z=4{mg|6s^81zH|He)M32xE}2jY1(Vp%mZZ zN0fz`3%8}~MiQU|X9XrfNkDsOM`I(gsJ+p+_Y%Xg<8q7@o`fc0Ss_U{5{eZ@Jmt!v z5QZu=WB#X5$4DSn5M`8qLPT?}M?|45Mj;L3Fdhcx<7G3ZsF3jwn_Q{bG@RAe=B+8q zF4{nLGZNOWGAPULG9kO12Wz(rD8Gz_ScD?%!iU(4efR{$xZa!}y9#IE1wYip4CG)A z7GNb-VKr(*DAf>71R@BH5san?MRSBB0xi%Itr3Ox=zyQU|LVk%pTB2eUi;9dyGXzi ztQDvPDFIfF&7b32@kwkFPhbSYgCO&sJ!^CwD;|kO;s`hEeEf~>Y=t6WNC|o4P<8C3Xw=bDh6T@ z?u}QS)L;rzFcq`#G-l%&ynwlQ5%XX`rujU4dhe*yIC?b1c*X88e>&=;2ej%>6cXhC zNTgPTlPNbQl9M=vYp}7CYOuox5~b{XKI8zajVC{Q+Xy;VQ!g?Cjy1RG0HgDJOLHvAG|;jmZRF!K>JegSdvS^||g5i+J=# zKO`U#!!Qb?aX-@WII=Je(~*q@ScE(*#%ov#vp%DAzd)P4CG)5HsTYU#W`HS*SHGRgzE`*_`_X`x5fxTD4HPxEzt!rh(mYu zMFNImI7T52W08Sr$i_@Og=g_RmSQ{f7zc0|NANjLpad6j38lC!2P#8N9wG#w9&UvbK?p}nM4~l1p)-2n zE+n8o24WD#AqzQ}kC(6zdDw%GP>h4HH>IIIyg5({-4KI#^h5zR;{z0;6yKr@KS5?_ zGD(d>TUb-Dag@iyzwZkH|c-iLHgg^(_4C!~A&7}7-* zL%OMhkS^*Nq?`Hz(p8;-bW<0k-;=)T5~RQS9@1C+0_m?5y@K>vcJxFaq+lSVTY3`G zHT@mZ)$E0IH=jbfoI{ZA<~XFwIR)u<&S6?ZveA(1{v3r8bZtbd@j1@nJT4%NGu#^T zkhvK0@c1*7KpqI!=1ez4B9b8wX-7h?f;Cu=w=t3{;Q_3`YV1X^o41qr3L6?L^)5UIa zAU8_`d${&wE-tr@0Tq{?%wKmh>)3}=IEzd84jEjA3OiXI zLQpsFz0bPmwTk7O<6bFeP%`E(t?{sFL&+VX+iB9 znm`MlYo;59R*v)c$~I+}=o`3WGY)bm`EHe{ z+VgLi8m-2vF>1035bHPDmXT(`ROKRfwPPX40nq}W zu>0RM3;v^%V9x&{I*2?h#&Y~iX2I;I4FBgO*iEnW&t}1YcJ}*cC%^80@$9#J^7|(y zy!Za$8E@6u?(a=Rt$C#HklcgM3mU3`e%Bv5e5}4KVl6AhyFV%O_&|9>sL8aNAZ~E$u{GY4~o_#}f zeb0OSbfNa~mKP-G!}er{JY1b(_B0qY7F4elod(gOK-AHG6h9>JT zY#CiVUrf-AJolvNI;?vjMTfF@Hbqa7uO1$&>v@7w^;oU)pGwtpeDoMkz+nASU`7Mw zjV8?RZb#*4LNYvC2bb^Tw0GeLnp;Qf-K;(_ zT3@r-Z4Sp+Zz{^tb!Mo3(px7hN3XE|R}Dv=_q#50^a4k2uHIVrK^iU@mjuZ2quBi7 zT)nVf^|f>R^8fTakF3$NbO+CsHTt^EH!=UG*Y!AE+xy*iU9l{`Q275>v7Umq+CP8a Jf9ojw{{n?`oNWLA diff --git a/CAPG/Sap2FCLT/Fip_perslid_sap.ctl b/CAPG/Sap2FCLT/Fip_perslid_sap.ctl index a03cb157b..3fdda653e 100644 --- a/CAPG/Sap2FCLT/Fip_perslid_sap.ctl +++ b/CAPG/Sap2FCLT/Fip_perslid_sap.ctl @@ -24,6 +24,7 @@ FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '"' TRAILING NULLCOLS ,PRS_PERSLID_WACHTWOORD POSITION(999:1000) ,PERSLID_EMAIL POSITION(193:242) ,KAMERNUMMER POSITION(243:252) + ,UITDIENST POSITION(303:304) ,IMPORTROW POSITION(1:304) ) diff --git a/CAPG/Sap2FCLT/Fip_perslid_sap.sql b/CAPG/Sap2FCLT/Fip_perslid_sap.sql index 860955b62..f2270d7b1 100644 --- a/CAPG/Sap2FCLT/Fip_perslid_sap.sql +++ b/CAPG/Sap2FCLT/Fip_perslid_sap.sql @@ -1,4 +1,4 @@ --- Versie 2.3 +-- Versie 2.4 SET ECHO ON SET HEADING ON @@ -34,14 +34,21 @@ set fip_error = IMPORTROW ,PRS_PERSLID_OSLOGIN = LTRIM(RTRIM(PRS_PERSLID_OSLOGIN)) ,PRS_PERSLID_WACHTWOORD = LTRIM(RTRIM(PRS_PERSLID_WACHTWOORD)) ,PERSLID_EMAIL = LTRIM(RTRIM(PERSLID_EMAIL)) - ,KAMERNUMMER = LTRIM(RTRIM(KAMERNUMMER)); + ,KAMERNUMMER = LTRIM(RTRIM(KAMERNUMMER)) + ,UITDIENST = LTRIM(RTRIM(UITDIENST)); -- PRS_PERSLID DECLARE CURSOR c1 IS SELECT * - FROM fip_perslid_sap - ORDER BY fip_perslid_sap_key; + FROM fip_perslid_sap ps + WHERE not exists (select 'x' + from prs_perslid p + where upper(ltrim(rtrim(ps.prs_perslid_nr))) = upper(ltrim(rtrim(p.prs_perslid_nr))) + and ps.uitdienst = 'UD' + and p.prs_perslid_verwijder is not null + and rownum = 1) + ORDER BY ps.fip_perslid_sap_key; rec c1%rowtype; teller integer; locatie_key number(10); @@ -693,8 +700,38 @@ commit; update fip_perslid_sap set fip_error = update_msg where fip_perslid_sap_key = rec.fip_perslid_sap_key; - - commit; -- Geen fouten opgetreden, rollback niet meer nodig + + -- Persoon is weer up2date. Moet deze nu "verwijderd"/"uit dienst genomen" worden? + IF rec.UITDIENST = 'UD' THEN + + errorMsg := ' (error : bepalen of en hoeveel verplichtingen de te verwijderen persoon heeft met prs_perslid_key = [' || to_char(perslid_key) || '])'; + + SELECT count(*) + INTO nCount + FROM prs_v_verplichting + WHERE prs_perslid_key = 0; + + IF nCount = 0 THEN + + errorMsg := ' (error : de te verwijderen persoon heeft geen verplichtingen (meer) en kan verwijderd worden met prs_perslid_key = [' || to_char(perslid_key) || '])'; + + update prs_perslid + set prs_perslid_verwijder = sysdate + where prs_perslid_key = perslid_key; + + ELSE + + errorMsg := ' (error : de te verwijderen persoon heeft wel verplichtingen en kan niet verwijderd worden met prs_perslid_key = [' || to_char(perslid_key) || '])'; + + update prs_perslid + set prs_perslid_einddatum = sysdate + where prs_perslid_key = perslid_key; + + END IF; + + END IF; + + commit; -- Geen fouten opgetreden, rollback niet meer nodig .... -- Eventuele warnings loggen ... update fip_perslid_sap diff --git a/CAPG/Sap2FCLT/create_fip.sql b/CAPG/Sap2FCLT/create_fip.sql index be5d335cc..ee774359a 100644 --- a/CAPG/Sap2FCLT/create_fip.sql +++ b/CAPG/Sap2FCLT/create_fip.sql @@ -2,11 +2,11 @@ set echo on show user ---DROP SEQUENCE fip_s_fip_perslid_sap_key; +DROP SEQUENCE fip_s_fip_perslid_sap_key; ---DROP trigger fip_t_fip_prs_sap_B_IU; +DROP trigger fip_t_fip_prs_sap_B_IU; ---DROP table fip_perslid_sap; +DROP table fip_perslid_sap; CREATE TABLE fip_perslid_sap ( @@ -30,6 +30,7 @@ CREATE TABLE fip_perslid_sap PRS_PERSLID_WACHTWOORD VARCHAR2 (30), PERSLID_EMAIL VARCHAR2 (50), KAMERNUMMER VARCHAR2 (10), + UITDIENST VARCHAR2 (2), IMPORTROW VARCHAR2 (1024), FIP_PERSLID_SAP_KEY NUMBER(10), FIP_ERROR VARCHAR2 (2048),