Index: branches/b_4_13_00_00/source/UBL/programs/TMS120.BA =================================================================== diff -u -r256091 -r256500 --- branches/b_4_13_00_00/source/UBL/programs/TMS120.BA (.../TMS120.BA) (revision 256091) +++ branches/b_4_13_00_00/source/UBL/programs/TMS120.BA (.../TMS120.BA) (revision 256500) @@ -43,6 +43,8 @@ : : :***********************************************************************: : Modificiation History: +: 2024-06-26 : SOW/SRI/RSV :[MSAPP-1911] +: Modified toggle between UBL and Python : 2024-06-10 : SOW/SRI :[MSAPP-1911] : Added condition to toggle between UBL and Python : 2024-05-29 : SRI :[MSAPP-1983] @@ -219,7 +221,7 @@ : : :*********************************************************************** -00010 REM : TMS120 : Receive Transactions from TAMS/ms Server : 2024-06-05 : SOW/SRI +00010 REM : TMS120 : Receive Transactions from TAMS/ms Server : 2024-06-26 : SOW/SRI/RSV 00020 REM : Copyright (c) 2024 by Genuine Parts Company (GPC) : : Written : 04/15/2003 : JCF @@ -238,6 +240,7 @@ DIM DE11$[64],M4_INTERVAL$[23] DIM FILE_COUNT$[10],KEY_VALUE$[10] DIM PAUSE_TMS$[1] :{MSAPP-1741] + DIM PROGRAM_NAME$[60] : : ***** Initialize Variables ***** @@ -542,18 +545,18 @@ : ** If the amount of information to pass to the child program is too big to : ** fit in the common block, open a temp file to pass it. : -IF TTYPE = 5 OR TTYPE = 2 OR TTYPE=41 OR TTYPE=40 OR TTYPE = 42 OR TTYPE = 60 OR TTYPE = 61 OR TTYPE = 62 OR TTYPE=91 OR TTYPE=998 OR TTYPE=999 THEN :[20182] - IF TTYPE = 91 OR TTYPE=40 THEN - GOSUB @WRITE_PYTHON_DE - ELSE +IF TTYPE = 5 OR TTYPE = 2 OR TTYPE=41 OR TTYPE=40 OR TTYPE = 42 OR TTYPE = 60 OR TTYPE = 61 OR TTYPE = 62 OR TTYPE=998 OR TTYPE=999 THEN :[20182] +: IF TTYPE = 91 OR TTYPE=40 THEN +: GOSUB @WRITE_PYTHON_DE +: ELSE LET DECHN=$CHN IF DECHN=-1 THEN STMA 19,24 :** Open output file for passing of transaction data. OPEN FILE[DECHN,10],"TAMS120_DE" LET BW_BUFF$[1,6192] = REF_FAPS_ID$,LOC$,IPADDR$,BUFF$, FILL$(0) WRITE FILE(DECHN), BW_BUFF$[1,6192] CLOSE FILE(DECHN) - END IF +: END IF ELSE : ** otherwise, use the Common Block LET BW_BUFF$[1,2048] = REF_FAPS_ID$,LOC$,IPADDR$,BUFF$, FILL$(0) @@ -580,20 +583,26 @@ : : :Toggle between UBL and Python [MSAPP-1911] - LET B$="cat /usr/tams/database/tms_jobs.txt|grep ",TTYPE," |cut -d '=' -f 2 |awk '{$1=$1};1'" + + LET RUN_UBL = 0 + LET RUN_PYTHON = 0 + + LET B$="cat /usr/tams/database/tms_jobs.csv | grep '^.*,.*,",TTYPE,",' |cut -d',' -f4" REM $EXECUTE B$,KEY_VALUE$,IER LET KEY_VALUE$=TRUN$(KEY_VALUE$,1) - :PRINT "key value from:",KEY_VALUE$ - IF TTYPE = 002 AND KEY_VALUE$="0" THEN SWAP "TMS12002" :customer - IF TTYPE = 003 AND KEY_VALUE$="0" THEN SWAP "TMS12003" :employee - IF TTYPE = 004 AND KEY_VALUE$="0" THEN SWAP "TMS12004" :hazardous - IF TTYPE = 005 AND KEY_VALUE$="0" THEN SWAP "TMS12005" :jif trans - IF TTYPE = 007 AND KEY_VALUE$="0" THEN SWAP "TMS12007" :inventory messages - IF TTYPE = 008 AND KEY_VALUE$="0" THEN SWAP "TMS12008" :jif prices - IF TTYPE = 009 AND KEY_VALUE$="0" THEN SWAP "TMS12009" :jif quantity - IF TTYPE = 011 AND KEY_VALUE$="0" THEN SWAP "TMS12011" :jif special sale - IF TTYPE = 013 AND KEY_VALUE$="0" THEN SWAP "TMS12013" :mif trans - IF TTYPE = 015 AND KEY_VALUE$="0" THEN SWAP "TMS12015" :supersede + + IF KEY_VALUE$ = '0' THEN RUN_UBL = 1 + IF KEY_VALUE$ = '1' THEN RUN_PYTHON = 1 + + IF RUN_UBL THEN LET B$="cat /usr/tams/database/tms_jobs.csv | grep '^.*,.*,",TTYPE,",' |cut -d',' -f1" + IF RUN_PYTHON THEN LET B$="cat /usr/tams/database/tms_jobs.csv | grep '^.*,.*,",TTYPE,",' |cut -d',' -f2" + + REM $EXECUTE B$,PROGRAM_NAME$,IER + LET PROGRAM_NAME$=TRUN$(PROGRAM_NAME$,1) + + +: PRINT "Program Name ",PROGRAM_NAME$ + : IF TTYPE = 23 OR TTYPE = 49 OR TTYPE = 51 OR TTYPE=53 OR TTYPE=997 THEN : @@ -606,11 +615,10 @@ SWAP_ERR=1 STMA 2,2,SWAP_ERR :set attempt number 1 $DO_UNTIL SWAP_ERR=0 :if po transfer OK, SWAP_ERR is 0. - IF TTYPE = 023 AND KEY_VALUE$="0" THEN SWAP "TMS12023" - IF TTYPE = 049 AND KEY_VALUE$="0" THEN SWAP "TMS12049" :custom pricing - IF TTYPE = 051 AND KEY_VALUE$="0" THEN SWAP "TMS12051" - IF TTYPE = 053 AND KEY_VALUE$="0" THEN SWAP "TMS12053" : pricing_profile_detail - IF TTYPE = 997 AND KEY_VALUE$="0" THEN SWAP "TMS12097" : store message record + + IF RUN_UBL THEN SWAP PROGRAM_NAME$ + IF RUN_PYTHON THEN GOSUB @CALL_PYTHON + STMA 1,2,SWAP_ERR IF SWAP_ERR>0 THEN IF SYS(4)<0 THEN :running in background @@ -625,46 +633,19 @@ END IF IF SWAP_ERR=5 THEN GOSUB @REPORT_FAILURE :report & set SWAP_ERR to 0 $END_DO + + ELSE : For all other DE TYPES + + IF TTYPE>0 THEN + + IF RUN_UBL THEN SWAP PROGRAM_NAME$ + IF RUN_PYTHON THEN GOSUB @CALL_PYTHON + + END IF + END IF : - IF TTYPE = 027 AND KEY_VALUE$="0" THEN SWAP "TMS12027" : line out of class - IF TTYPE = 029 AND KEY_VALUE$="0" THEN SWAP "TMS12029" : product line - IF TTYPE = 035 AND KEY_VALUE$="0" THEN SWAP "TMS12035" : supplier - IF TTYPE = 036 AND KEY_VALUE$="0" THEN SWAP "TMS12036" : process a/r from branch to main - IF TTYPE = 038 AND KEY_VALUE$="0" THEN SWAP "TMS12038" : inventory renumber - IF TTYPE = 040 AND KEY_VALUE$="0" THEN SWAP "TMS12040" : customer_note - IF TTYPE = 041 AND KEY_VALUE$="0" THEN SWAP "TMS12041" : customer_contact - IF TTYPE = 042 AND KEY_VALUE$="0" THEN SWAP "TMS12042" : customer_ar - IF TTYPE = 043 AND KEY_VALUE$="0" THEN SWAP "TMS12043" : ar_terms - IF TTYPE = 044 AND KEY_VALUE$="0" THEN SWAP "TMS12044" : ar_profile - IF TTYPE = 045 AND KEY_VALUE$="0" THEN SWAP "TMS12045" : customer_delivery - IF TTYPE = 047 AND KEY_VALUE$="0" THEN SWAP "TMS12047" : cust_statement_addr - IF TTYPE = 048 AND KEY_VALUE$="0" THEN SWAP "TMS12048" : delivery_priority - IF TTYPE = 050 AND KEY_VALUE$="0" THEN SWAP "TMS12050" : delivery_route - IF TTYPE = 052 AND KEY_VALUE$="0" THEN SWAP "TMS12052" : customer_pricing_profile - IF TTYPE = 054 AND KEY_VALUE$="0" THEN SWAP "TMS12054" : pricing_profile - IF TTYPE = 055 AND KEY_VALUE$="0" THEN SWAP "TMS12055" : store_category - IF TTYPE = 056 AND KEY_VALUE$="0" THEN SWAP "TMS12056" : store_group - IF TTYPE = 057 AND KEY_VALUE$="0" THEN SWAP "TMS12057" : department - IF TTYPE = 058 AND KEY_VALUE$="0" THEN SWAP "TMS12058" : sub_department - IF TTYPE = 060 AND KEY_VALUE$="0" THEN SWAP "TMS12060" : customer_certification :[TII-20182] - IF TTYPE = 061 AND KEY_VALUE$="0" THEN SWAP "TMS12061" : certification_part_group :[TII-20182] - IF TTYPE = 062 AND KEY_VALUE$="0" THEN SWAP "TMS12062" : certification_state :[TII-20182] - IF TTYPE = 063 AND KEY_VALUE$="0" THEN SWAP "TMS12063" : modify the barcode table :[TNSS-3571] - IF TTYPE = 064 AND KEY_VALUE$="0" THEN SWAP "TMS12064" : pulls the information from barcode table and writes into TRANSIN file [MSAPP-1600] - IF TTYPE = 091 THEN - IF KEY_VALUE$="1" THEN GOSUB @CALL_PYTHON - IF KEY_VALUE$="0" THEN SWAP "TMS12091" : X1 records [MSAPP-1645] - END IF - IF TTYPE = 092 AND KEY_VALUE$="0" THEN SWAP "TMS12092" : distribute consolidate order receipts - IF TTYPE = 093 AND KEY_VALUE$="0" THEN SWAP "TMS12093" : create Update Requests for M4 - IF TTYPE = 994 AND KEY_VALUE$="0" THEN SWAP "TMS12094" : update MS - IF TTYPE = 995 AND KEY_VALUE$="0" THEN SWAP "TMS12095" : administrative - IF TTYPE = 996 AND KEY_VALUE$="0" THEN SWAP "TMS12096" : add part to MS - IF TTYPE = 998 AND KEY_VALUE$="0" THEN SWAP "TMS12099" : notice program is different than # - IF TTYPE = 999 AND KEY_VALUE$="0" THEN SWAP "TMS12099" : interstore messages, M4 : -: : ** An M4 batch request may delay the processing of a record. : ** If this occurs, TTYPE is set to -1. IF TTYPE>0 THEN : not delayed @@ -950,7 +931,7 @@ :====================================================================== @CALL_PYTHON :======================================================================= - LET B$="/usr/tams/scripts/run_py.sh /usr/tams/programs/write_into_transin.py" + LET B$="/usr/tams/scripts/run_py.sh /usr/tams/programs/" , PROGRAM_NAME$ REM $EXECUTE B$,IER : RETURN @@ -1208,9 +1189,7 @@ STMA 19,37 :force error END IF DELCUR("GET_MULTI_STORE",IER) - IF PAUSE_TMS$ = "N" THEN - PRINT "continue..," - ELSE + IF PAUSE_TMS$ = "Y" THEN IF SECONDS_DIFF > 3600 LET SQL$ ="UPDATE multi_store_profile " LET SQL$[0]="set pause_tms = null WHERE loc=",LOC FishEye: Tag 256500 refers to a dead (removed) revision in file `branches/b_4_13_00_00/source/UBL/database/tms_jobs.txt'. FishEye: No comparison available. Pass `N' to diff? Index: branches/b_4_13_00_00/source/UBL/database/tms_jobs.csv =================================================================== diff -u --- branches/b_4_13_00_00/source/UBL/database/tms_jobs.csv (revision 0) +++ branches/b_4_13_00_00/source/UBL/database/tms_jobs.csv (revision 256500) @@ -0,0 +1,71 @@ +UBL Program,Python Script,DE_Type,UBL/Python +tms100,,,0 +tms110,,,0 +tms11050,,,0 +tms11055,,,0 +tms110chk,,,0 +tms110err,,,0 +tms111,,,0 +tms111hst,,,0 +tms112,,,0 +tms115,,,0 +tms120,,,0 +tms12002,,2,0 +tms12003,,3,0 +tms12004,,4,0 +tms12005,,5,0 +tms12007,,7,0 +tms12008,,8,0 +tms12009,,9,0 +tms12011,,11,0 +tms12013,,13,0 +tms12015,,15,0 +tms12023,,23,0 +tms12027,,27,0 +tms12029,,29,0 +tms12035,,35,0 +tms12036,,36,0 +tms12038,,38,0 +tms12040,,40,0 +tms12041,,41,0 +tms12042,,42,0 +tms12043,,43,0 +tms12044,,44,0 +tms12045,,45,0 +tms12047,,47,0 +tms12048,,48,0 +tms12049,,49,0 +tms12050,,50,0 +tms12051,,51,0 +tms12052,,52,0 +tms12053,,53,0 +tms12054,,54,0 +tms12055,,55,0 +tms12056,,56,0 +tms12057,,57,0 +tms12058,,58,0 +tms12059,,59,0 +tms12060,,60,0 +tms12061,,61,0 +tms12062,,62,0 +tms12063,,63,0 +tms12064,,64,0 +tms12091,write_into_transin.py,91,0 +tms12092,,92,0 +tms12093,,93,0 +tms12094,,994,0 +tms12095,,995,0 +tms12096,,996,0 +tms12097,,997,0 +tms12099,,998,0 +tms12099,,999,0 +tms120err,,,0 +tms130,,,0 +tms131,,,0 +tms132,,,0 +tms134,,,0 +tms135,,,0 +tms136,,,0 +tms151,,,0 +tms154,,,0 +tms170,,,0