Commit 43d36c76 authored by pbhosale's avatar pbhosale

updated on [14/11/2019] changes in sql query

AllowDednSalComp.java


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@212006 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 415bcc01
...@@ -87,7 +87,7 @@ public class AllowDednSalComp ...@@ -87,7 +87,7 @@ public class AllowDednSalComp
System.out.println("seqNo::::"+seqNo);//need to chnage below sql System.out.println("seqNo::::"+seqNo);//need to chnage below sql
//Modified by Poonam B[14/11/2019][START][As suggested by Sir to remove APPLICABLE_TO from sql query] //Modified by Poonam B[14/11/2019][START][As suggested by Sir to remove APPLICABLE_TO from sql query]
sdCodesSql = /*"SELECT AD_CODE,SH_DESCR,DESCR,TYPE,SEQ_NO,RND_OFF,RND_TO,PROP_YN,PROP_ON,PAYABLE,POST_YN,SLAB_OPTION,BASE_FORMULA,SLAB_FORMULA,RES_FORMULA,BAL_OPT,FOR_CONDN,SQL_EXPR,SQL_INPUT,MIN_VAL,MAX_VAL,IT_PROJ,IT_SECTION,PRT_SEQ,DROP_YN,COST_COMPANY,SPLIT_YN,ACCT_CODE__SAL,CCTR_CODE__SAL,CHG_DATE,CHG_USER,CHG_TERM,PAY_TAX,TAUTH_CODE,DIRECT_VOUCHER,DELETE_ARR,BAL_FROM,BAL_TO,DROP_OPT,DROP_SEQ,FREQUENCY,IT_PROOF_REQ,PRINT_OPT,GEN_NEGT_ARR,UDF_TYPE,APPLICABLE_IN_FFS,INPUT_TYPE,APPLICABLE_TO FROM ALLWDEDN WHERE NVL(SEQ_NO , ' ') < ?"*/ sdCodesSql = /*"SELECT AD_CODE,SH_DESCR,DESCR,TYPE,SEQ_NO,RND_OFF,RND_TO,PROP_YN,PROP_ON,PAYABLE,POST_YN,SLAB_OPTION,BASE_FORMULA,SLAB_FORMULA,RES_FORMULA,BAL_OPT,FOR_CONDN,SQL_EXPR,SQL_INPUT,MIN_VAL,MAX_VAL,IT_PROJ,IT_SECTION,PRT_SEQ,DROP_YN,COST_COMPANY,SPLIT_YN,ACCT_CODE__SAL,CCTR_CODE__SAL,CHG_DATE,CHG_USER,CHG_TERM,PAY_TAX,TAUTH_CODE,DIRECT_VOUCHER,DELETE_ARR,BAL_FROM,BAL_TO,DROP_OPT,DROP_SEQ,FREQUENCY,IT_PROOF_REQ,PRINT_OPT,GEN_NEGT_ARR,UDF_TYPE,APPLICABLE_IN_FFS,INPUT_TYPE,APPLICABLE_TO FROM ALLWDEDN WHERE NVL(SEQ_NO , ' ') < ?"*/
"SELECT AD_CODE,SH_DESCR,DESCR,TYPE,SEQ_NO,RND_OFF,RND_TO,PROP_YN,PROP_ON,PAYABLE,POST_YN,SLAB_OPTION,BASE_FORMULA,SLAB_FORMULA,RES_FORMULA,BAL_OPT,FOR_CONDN,SQL_EXPR,SQL_INPUT,MIN_VAL,MAX_VAL,IT_PROJ,IT_SECTION,PRT_SEQ,DROP_YN,COST_COMPANY,SPLIT_YN,ACCT_CODE__SAL,CCTR_CODE__SAL,CHG_DATE,CHG_USER,CHG_TERM,PAY_TAX,TAUTH_CODE,DIRECT_VOUCHER,DELETE_ARR,BAL_FROM,BAL_TO,DROP_OPT,DROP_SEQ,FREQUENCY,IT_PROOF_REQ,PRINT_OPT,GEN_NEGT_ARR,UDF_TYPE,APPLICABLE_IN_FFS,INPUT_TYPE FROM ALLWDEDN WHERE NVL(SEQ_NO , ' ') < ?" "SELECT AD_CODE,SH_DESCR,DESCR,TYPE,SEQ_NO,RND_OFF,RND_TO,PROP_YN,PROP_ON,PAYABLE,POST_YN,SLAB_OPTION,BASE_FORMULA,SLAB_FORMULA,RES_FORMULA,BAL_OPT,FOR_CONDN,SQL_EXPR,SQL_INPUT,MIN_VAL,MAX_VAL,IT_PROJ,IT_SECTION,PRT_SEQ,DROP_YN,COST_COMPANY,SPLIT_YN,ACCT_CODE__SAL,CCTR_CODE__SAL,CHG_DATE,CHG_USER,CHG_TERM,PAY_TAX,TAUTH_CODE,DIRECT_VOUCHER,DELETE_ARR,BAL_FROM,BAL_TO,DROP_OPT,DROP_SEQ,FREQUENCY,IT_PROOF_REQ,PRINT_OPT,GEN_NEGT_ARR,UDF_TYPE,APPLICABLE_IN_FFS FROM ALLWDEDN WHERE NVL(SEQ_NO , ' ') < ?"
//Modified by Poonam B[14/11/2019][END][As suggested by Sir to remove APPLICABLE_TO from sql query] //Modified by Poonam B[14/11/2019][END][As suggested by Sir to remove APPLICABLE_TO from sql query]
//+" AND ad_code in('DW008','DW002','DW009','CW005','DW009_S','D0005','DW005','DW006','DW001','DW010''DW015','CW001')" //+" AND ad_code in('DW008','DW002','DW009','CW005','DW009_S','D0005','DW005','DW006','DW001','DW010''DW015','CW001')"
+ " ORDER BY CASE WHEN SEQ_NO IS NULL THEN ' ' ELSE SEQ_NO END, AD_CODE"; + " ORDER BY CASE WHEN SEQ_NO IS NULL THEN ' ' ELSE SEQ_NO END, AD_CODE";
...@@ -162,9 +162,10 @@ public class AllowDednSalComp ...@@ -162,9 +162,10 @@ public class AllowDednSalComp
String strGenNegtArr = rstAdCodes.getString("GEN_NEGT_ARR"); String strGenNegtArr = rstAdCodes.getString("GEN_NEGT_ARR");
String strUdfType = rstAdCodes.getString("UDF_TYPE"); String strUdfType = rstAdCodes.getString("UDF_TYPE");
String strApplicableInFfs = rstAdCodes.getString("APPLICABLE_IN_FFS"); String strApplicableInFfs = rstAdCodes.getString("APPLICABLE_IN_FFS");
String strInputType = rstAdCodes.getString("INPUT_TYPE");
//Modified by Poonam B[14/11/2019][START][As suggested by Sir] //Modified by Poonam B[14/11/2019][START][As suggested by Sir]
//String strInputType = rstAdCodes.getString("INPUT_TYPE");
//String strApplicableTo = rstAdCodes.getString("APPLICABLE_TO"); //String strApplicableTo = rstAdCodes.getString("APPLICABLE_TO");
String strInputType = "";
String strApplicableTo = ""; String strApplicableTo = "";
//Modified by Poonam B[14/11/2019][END][As suggested by Sir] //Modified by Poonam B[14/11/2019][END][As suggested by Sir]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment