From cd398f258cafe1f2c61c61e8611f27a784d8f22c Mon Sep 17 00:00:00 2001 From: hardya Date: Fri, 15 Feb 2008 20:34:04 +0000 Subject: [PATCH] Changes made following test of the training environment. git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@3608 248e525c-4dfb-0310-94bc-949c084e9493 --- Data/BulkLoad/LeadTimes.csv | 18 ++++++++++++++++++ Data/BulkLoad/LeadTimes.xls | Bin 0 -> 79360 bytes Modules/mip_quotation.pck | 37 +++++++++++++++++++++++++----------- 3 files changed, 44 insertions(+), 11 deletions(-) create mode 100644 Data/BulkLoad/LeadTimes.csv create mode 100644 Data/BulkLoad/LeadTimes.xls diff --git a/Data/BulkLoad/LeadTimes.csv b/Data/BulkLoad/LeadTimes.csv new file mode 100644 index 0000000..7dc01a5 --- /dev/null +++ b/Data/BulkLoad/LeadTimes.csv @@ -0,0 +1,18 @@ +Enquiry,Type of Meter,To Meter Size,Service Pressure Type, +ENTY_CODE,METY_CODE,MESC_CODE,SVCPT_CODE,LEAD_TIME +INSTALL,DIAPHRAGM,U25,LP,10 +INSTALL,DIAPHRAGM,U65,LP,15 +INSTALL,DIAPHRAGM,U160,LP,20 +INSTALL,DIAPHRAGM,U25,MP,15 +INSTALL,DIAPHRAGM,U65,MP,20 +INSTALL,DIAPHRAGM,U160,MP,30 +INSTALL,ROTARY,,LP,20 +INSTALL,ROTARY,,MP,30 +REMOVE,DIAPHRAGM,U25,LP,10 +REMOVE,DIAPHRAGM,U160,LP,15 +REMOVE,DIAPHRAGM,U25,MP,10 +REMOVE,DIAPHRAGM,U160,MP,15 +REMOVE,ROTARY,,LP,15 +REMOVE,ROTARY,,MP,15 +REMOVE,TURBINE,,LP,15 +REMOVE,TURBINE,,MP,15 diff --git a/Data/BulkLoad/LeadTimes.xls b/Data/BulkLoad/LeadTimes.xls new file mode 100644 index 0000000000000000000000000000000000000000..45205ced3b1d29a0400ccd432b2096ab0c1efcb9 GIT binary patch literal 79360 zcmeHPZLA&FRh|1j?C1FF*$$?(G&}-rzTA=zlC+dGcI=nL!H$jXq)90xj`K|1IClEt zv`uMRr){7>3k_*0NR?=%{6SPuR1uJkbrA?vYGT$tYi8Yj z&)j$K+_@ipSnYs7cQTq>H+w#&E{`9rq&Z6?3MH9&llmd0C3Z2$PT=m_c@Jon}N;3?9A7~=3wh!7s2d|3)=*LGYpSF zwgt8owheYM?1y06VLuFe4eUo?uZ6u1_M@=Z!!CjS7;FLd~ z_rl%@`vus$V800aCD?ti`(a0655SJW9)vByj>CQ#_7Lm@?A@@3VJBgaz)rzV!ybjb z2eu4*40Z2sJj;WNdeTf@99%zqMiUkUTh5cy=7 zZwjAHAn(i;?9;%$ukM+;G^}mH+{*quRb0KcH2=`m&|O)p0iKu+ZOL!JhW@yOW{-ax$J+>FMwQ(7ZxmTHx=Ul zQ!Q@gy75$=8g@g#(P<~r-H z=@Nf-3UBn;?7Us)&rXNyma}WZb?e!gaNTxxZMa^1cJ}=J;XQd8Z{OeAPXv5U9DZnN z>C812Ila+EuC>TF?I%LPx$YDA^w@zv|AB8Z{BAh+fGuWg&RveVwSm7orh(1u8O>k5 za4lljW$Vw`?~K2~uadd!sTO{h%)QXsiFs#s$#?M?mZ6C`h|S@b$K3zn$I17zZ-#Gm z`(=XnWAW5`9zU`C1XxF&cywvu^znuLOJ|mr%|A`JaQMUrmhk)K@Y3>oPaIoXIJms@ z*kg|`FD+OC>Mh=ReuEu4aAen^dkrk^ zKXA8+9J%YzEqm`=Jda;w+p>QJ9rqi4o$*tAzT;DT13oGq#D3eS+!p)T!0)xW?E8QC z-LLO|;NZ>oh4|U<8xKnuZ?GpKYqg%j%2#Ku3>jC2`6GdQF;=lV*+)a{V_|+H^1t(6 zHvaAA%N)KO_#ZEO^6Qs9`JJ1uaQF+^rT9hppw+>jscc7UM{C3L_pg8c{+Dhpt}XnA znnKQ#;qJ2RTkG-6V3==NcWh|;Q(!*h{AoNx-`dt*pTU!NN1mTeg@-c#MzDu?Zpxk; zd;VJX$f2ptA!g2O9y{CG9%8nCMXcc2vl+*15965Cieos|QVb_tirK3i=i(tM#qjKv zV(Yua?1_o>?DdUfwpVe?_BD>#4#qM2JAseA9G+1=Jy}Mtg=fk3ncfsU+hKas@N93* zGtPFLP~o-U*?w|u3ZCsGy=i#1hxBIP+3uNV+MC1QW$3lw*^behf@gb0ZyKKM(ubxj zZwB6#`I`0AR+&a`ZIx+oH``}WP_gH*tuh@{>~9@b!S1E4f@jaE%mfwNdosO>J*LuE}zFSh4xm9-rz zYdh{}ZHLO*pkjYJu{*M}YOBlz6??k4=67PQqq@Bf?YwmzdFwjrt?Q^~=f64p{naYi zlh(d>JNfoAaZykyo(Vg__A_C-+*VoNp|ZZ?-q&}itPd*1Ghy0o75kiP_hO&p?Orx? z+|h=PUhL^>t8DC0+1Sy`#txN@9lhAo*H+mSREl%h)Nv1+I`ZrZYv*n5$lKgeZ*xbU zX}9y{L!N!p+o{ZV)SK_fvrn0J-j+olK+8($I@r%0n zVr}2O-{u9s&DigOw;4J1VHdVJl-SuWgnv%5M=OkQjzF)@ZNA!XGd@lR-e%+syv^<) z5^UxU*jrQlyRQ8*F`UM$X9rq1ar3_RocW6^;#nefVa`+_Y?SY+xOfB%io zz4>+X&wh3;yK2Yx{&){!vr)|cP5w17dk@U)8{cyO{pFS8SiWG!O8aMf@zT?O@ZaA% z@X-7pJ%jzb?92aTzm7h*&3?{suMXmBpBeYS?3dJ|FkAaL%)W&`4YS|JpNH8m+%LlH zH|k%&?AP1hz>2-T1lZPgoqBM2>3s{gA6r^UgP&Svs@k?LhN7PVZSdv*ztU^EyuNSvs@k?LhN7PVZSdv*ztU z^EyuNSvs@k?LhN7PVZSdv*ztU^EyuNSvs@k?LhN7PVZSdv*ztU^EyuNSvs@k?LhN7 zPVZSdv*ztU^EyuNSvs@k?LhN7PVZSdv*ztU^EyuNSvs@k?LhN7PVZSdv*ztU^EyuN zSvs@k?LhN7PVZSdv*ztU^EyuNSvs@k?LhN7PVZSdv*ztU^EyuNSvs@k?LhN7PVZSd zv*ztU^EyuNSvs@k?LhN7PVZSdv*ztU^EyuNSvs@k?LhN7PVZSdv*ztU^EyuNSvs@k z?LhN7PVZSdv*ztU^E$Tw<92kdS%9}<%f%?us@!goonI-Upj-hgRgs+lN1d?S2~@0D zBHul-)m$DeE?rj#DgbgJmOmmZ)k3_Y^0;YgSYX^0E9zT6p!!)Z0hbiCgh94d{H{PH zxH^zBa>qK+}@l`>HlTq#7DOa`kckDH@T*x0zsRoAzE!1l9T0xl_N34^=};&%lq z!PSA3kvrC*W(eetwP+P_bdnFS3usp+6DY1ABYg|3l<3pT7?Hlp6CkJ!-{A!6_ARk0 zcBgNbiQso2otfW_W?*~o(Wzzuwr|VDDAW4hB2t-EXslRE%)XivBd{g)Ke4)f3+0b7HW{4AHiw;n~{_8yY;B2lob+go-rtG;Jc zlslQ~J*uFSe6X#;YrhsgPN9fXMcs=qoslTsLu&F%=#xd&@Z@{wS}|{{>skt~&K*c+ zwmQ$HS6BAlV_mZVlWe&dWm+%cuvVnDuM#N(ktiz{KoJ7D`H`Z6)mMlH=#13%eq&K{uL>R1_7n9-x$;>*eBVIYKb!p@O6oYQ5#{dH3K<6%O&8Ff|gJ`_z3nMWQL4< z0^bMe`Ur8ErU(Fsvg9hapbT}D8UQipp+rZK9NGyJ)Y?vQD(q5mR*c*pZIDT2KTEbO z$fa^z>0F9jWeJE@8%PR(qqfv&6Z5Z%(TXOuvF<=Rv$1aPSj6q6hp=V=RXG2KhXEHTmmjBXbHuGk6`aXX2{4V@O_Z3j}Vt> ziU4pZ3vPrZQgG{BCE~^F2#q=i{p1761+*&*5h$)8BYm3@O**PVP!=S!9QS;!68PB{ z^6?s2od5{e&>4A3el{c5O@iawfpli$+uLy|=WjjVeRJH`8)`DbnXZCWI`Zj}h|~l` zrm|cBMF`|Z9J-z}43?T27)EV`x%pjF(RZ0IgiF`eDor38G)b+5N#JUERyx%{;GpYg z#7QnFLtRyFgqlM&R3uwJz^;Z~8Tkah57PA!;xbJU01jozRc=8U z>MFIU&`_eINJc;TfLa0VN^t_k6=bAu1ENVsRS3$0WR~NeuT=uSki~k5T7G+ih-&HY=0*ySg|K4D1~Zt74)t!z-kz59-XN3)zDSmkJ|EE zte^+Pm@5w5ZTbFvEx%e(c>**x@8<~=ty02T0*jgB#fPk2NL7rcfkV_HGiuVBWpp3~RxylW#B|+Ufn#~V`!3Zl@v4vdAT~w6$h>Rn}T7quZ&J-kp<;kzu zN>_0oRA~X}M>GfTYKsvJ#Zsvrf?7c@R&E|)}V1yN{ z*j=vWE~-@qVo_W!fFcBPBMx2983y~h!ovuTD%WlkT6PITxGP`~bHxEkFmvgZu`f-& zpOsEEm8Ki5(iLYI;FU)xJ4{Q=wPt{Pe-c%Y1SN>j7jzZ(K`Q$QG2?z!5daRK8Y992o>>n|3V@@Y z&d9U!lNh;f5**(Sq%#}e-i}MzUV3P2=7&J!lHh|C+mV`pYL$WKs3LwdRS5b9QAZYp4IUUF>>`JIF21iXEu&q9j~Un z^r)bj9|Dm}f)7?~N@@bCRR*4;iVU(GFo9gHa*3{jo?HVL7M$}te^+P zm@5u1*aNdVG{y0ltKz7153XPGV|iVIX}MY#YRtfh)& z02-A6UIzLIt{;Vc4E8kaS7E;f`#9{^VZQvXtU5y{?1BQ5nBrbOSqCC zAbt-Jr874QQoJ0D;&gp2s`-dGU6&$eUsodPt#8U?2>D4&rdX;nk{w8AHj-_esEEDy zD5#mA1CdLD4_53^Y67ZN2A-pe46+^9+n!#>xqmb%Nm0&`}0^q4~Q{W z9A2;oW_4(a<1tsoQE8DyU>4(|)dtd`er=tRCt5!cWm{2m3X;Iu#2<}3!St-8>y>^t%ZR&u70&*2T?jjq9Db~!6;7G*QFXG!UCRI z4@(L_xSrH#v+|P|t!Ppk>kgzd8|(ItMLd7&`Rt~CZl_UEyJ9uQ-$IJ{sF%<9k-$78OFqtazEvlthx zHjqxabZyO%Bw9ZZVp~yj3X;Hj|NCTqP2hmCK1@3ixuKKPWaG<_NGxk6>4VPiHP^R-hP>Cc>UsUKK$=e1JkVzm}Jx zh+L_afj9yY$GgCEIWtAr1COO#8$hjnW*$qiVo)?C0wCxImk<$0xGN|JmDpEYxdRoA z^nES`CF@-U*_F>?L<9kH>dg>o4;530B_+-HN;JPJj({`;umns3FU$Rl$yXwRTi6sIz8okalqSkZSx^J$ljtBx>X;HANcohXEMrviZBF!h( zNMSk?F?+SHSj+^{4vcCC4rQnD=S;ScEoP^1UCy2uNP2rVt0%XG%=x*gkpBWzZsnzO z-T-%}kulzZ>dV=~*#n`EhZ!7T-kMF}PnONV?5(MiYW$n#$!ul2QTdVV(d+YmJ&dN6x0U4;5Y?LqGU;#_t%JDfd^`+p=m8qR(%o`U1y zOe}IHI{|#EM+=wd^=HAUT7M(BU);tAU^d%>3dceZOW_F|te>~kxPLpZGd=EU(4|55 Q-~M+ogVyN9AEy5Q1Iqd97XSbN literal 0 HcmV?d00001 diff --git a/Modules/mip_quotation.pck b/Modules/mip_quotation.pck index 7ae85c6..051f82f 100644 --- a/Modules/mip_quotation.pck +++ b/Modules/mip_quotation.pck @@ -4,17 +4,17 @@ CREATE OR REPLACE PACKAGE mip_quotation IS -- Created : 15/11/2007 11:27:58 -- Purpose : Handle life-cycle of quotations - /** Determines whether the given enquiry is ready to quote for + /** Determines whether the given enquiry is ready to quote for i.e. have all the mandatory fields been completed - + %param p_enqu_id the id of the enquiry to be checked %return TRUE if the enquiry can be quoted for */ FUNCTION ready_for_quote(p_enqu_id IN enquiries.id%TYPE) RETURN BOOLEAN; - /** Determines whether the given enquiry is ready to quote for + /** Determines whether the given enquiry is ready to quote for i.e. have all the mandatory fields been completed - + %param p_enqu_id the id of the enquiry to be checked %p_mandatory_checks contains reasons for the enquiry *not* being ready to quote for %p_quote_is_ready TRUE if the enquiry can be quoted for @@ -40,7 +40,7 @@ CREATE OR REPLACE PACKAGE mip_quotation IS ,p_field_name IN VARCHAR2) RETURN VARCHAR2; /** Generate quotes in response to a 'request for quote' against an enquiry - + %param p_enqu_id the id of the enquiry to be checked %param p_prty_id the id of the party that requested the quotes %param p_owner_prty_id the id of party that owns the quotes (defaults to the requestor) @@ -736,9 +736,9 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); WHERE enqu_id = p_enqu_id AND v.quote_id = id ORDER BY total_cost) LOOP - + produce_quote_summary(l_qute.id); - + al(' '); END LOOP; @@ -1159,7 +1159,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); ,p_reason IN quote_reasoning.reason%TYPE ,p_internal_or_external IN quote_reasoning.internal_or_external%TYPE DEFAULT gc_external_reason) IS BEGIN - + pl('add_quote_reason:' || p_enqu_id || ':' || p_reason); INSERT INTO quote_reasoning (enqu_id ,reason @@ -1179,7 +1179,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); BEGIN pl('get_u_meter_size'); - -- get the smallest meter code that will support the given Qmax + -- get the smallest meter code that will support the given Qmax SELECT code INTO l_meter_size_code FROM (SELECT code @@ -1510,7 +1510,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); RETURN t_rec_additional_costs IS l_rec_costs t_rec_additional_costs; BEGIN - pl('get_aico'); + pl('get_aico:' || p_adit_code || ':' || p_regi_code); SELECT lead_time ,selling_price ,cost_price @@ -1545,11 +1545,16 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); WHERE adit.code = cost.adit_code AND adit.code = p_adit_code; + pl('get_aico:exit'); RETURN l_rec_costs; EXCEPTION WHEN no_data_found THEN + pl('get_aico:exit:NDF'); RETURN l_rec_costs; + WHEN OTHERS THEN + pl('get_aico:exit:' || SQLERRM); + RAISE; END get_aico; FUNCTION get_laco(p_enty_code IN enquiry_types.code%TYPE @@ -1610,6 +1615,8 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); l_days NUMBER; BEGIN + pl('get_lead_time:' || p_enty_code || ':' || p_mety_code || ':' || + p_svcp_code || ':' || p_qmax); SELECT days INTO l_days FROM (SELECT enty_code @@ -1630,11 +1637,16 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); AND ((v.svcp_code = p_svcp_code) OR (v.svcp_code IS NULL AND p_svcp_code IS NULL)); + pl('get_lead_time:exit:' || l_days); RETURN l_days; EXCEPTION WHEN no_data_found THEN + pl('get_lead_time:exit:NDF'); RETURN NULL; + WHEN OTHERS THEN + pl('get_lead_time:exit:' || SQLERRM); + RAISE; END get_lead_time; PROCEDURE produce_module_quotes(p_enqu IN t_enqu @@ -2180,6 +2192,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); END IF; + pl('produce_module_quotes:exit'); END produce_module_quotes; PROCEDURE produce_install_quotes(p_enqu IN t_enqu @@ -2202,6 +2215,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); ,p_owner_prty_id => p_owner_prty_id ,p_manual_or_automatic_quote => p_manual_or_automatic_quote); + pl('produce_install_quotes:exit'); END produce_install_quotes; PROCEDURE produce_exchange_quotes(p_enqu IN t_enqu @@ -2445,7 +2459,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); -- -- check whether we have the required prices -- if we do not, then we may need to produce a manual quote - -- + -- IF p_enqu.amr_required = 'YES' THEN l_amr_costs := get_aico(p_adit_code => 'AMR' ,p_regi_code => l_regi_code); @@ -2676,6 +2690,7 @@ RECEIVED AT THIS ADDRESS CANNOT BE RESPONDED TO.'); cout_err.report_and_stop(p_exception_message => 'Attempted to produce automatic quote for unexpected enquiry type of ' || p_enqu.enty_code); END IF; + pl('produce_automatic_quotes:exit'); END produce_automatic_quotes; PROCEDURE produce_quotes(p_enqu_id IN enquiries.id%TYPE