Skip to content

B
business-java
Commit 42367e86 authored by mmhatre's avatar mmhatre
Browse files
Options

added checknull for proj_code 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@213987 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a0a9db22
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 36 deletions
webitm-dis/src/ibase/webitm/ejb/dis/SaleContractRelease.java
View file @ 42367e86
...@@ -654,54 +654,54 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea ...@@ -654,54 +654,54 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
//contractType = rs.getString("CONTRACT_TYPE"); //contractType = rs.getString("CONTRACT_TYPE");
contractType = checkNullandTrim(rs.getString("CONTRACT_TYPE"));//changed by jaffar S on 20-03-2019 contractType = checkNullandTrim(rs.getString("CONTRACT_TYPE"));//changed by jaffar S on 20-03-2019
System.out.println("CONTRACT_TYPE.............."+contractType); System.out.println("CONTRACT_TYPE.............."+contractType);
itemSer = rs.getString("ITEM_SER"); itemSer = checkNull(rs.getString("ITEM_SER"));
transMode = rs.getString("TRANS_MODE"); transMode = checkNull(rs.getString("TRANS_MODE"));
currCode = rs.getString("CURR_CODE"); currCode = checkNull(rs.getString("CURR_CODE"));
currCodeIns = rs.getString("CURR_CODE__INS"); currCodeIns = checkNull(rs.getString("CURR_CODE__INS"));
orderDb = rs.getString("ORDER_DB"); orderDb = checkNull(rs.getString("ORDER_DB"));
stanCodeInit = rs.getString("STAN_CODE__INIT"); stanCodeInit = checkNull(rs.getString("STAN_CODE__INIT"));
exchRateCom = rs.getDouble("EXCH_RATE__COMM"); exchRateCom = rs.getDouble("EXCH_RATE__COMM");
exchRateCom1 = rs.getDouble("EXCH_RATE__COMM_1"); exchRateCom1 = rs.getDouble("EXCH_RATE__COMM_1");
exchRateCom2 = rs.getDouble("EXCH_RATE__COMM_2"); exchRateCom2 = rs.getDouble("EXCH_RATE__COMM_2");
accCodeSal = rs.getString("ACCT_CODE__SAL"); accCodeSal = checkNull(rs.getString("ACCT_CODE__SAL"));
cctrCodeSal = rs.getString("CCTR_CODE__SAL"); cctrCodeSal = checkNull(rs.getString("CCTR_CODE__SAL"));
remark = rs.getString("REMARKS"); remark = checkNull(rs.getString("REMARKS"));
remark2 = rs.getString("REMARKS2"); remark2 = checkNull(rs.getString("REMARKS2"));
remark3 = rs.getString("REMARKS3"); remark3 = checkNull(rs.getString("REMARKS3"));
custPord = rs.getString("CUST_PORD"); custPord = checkNull(rs.getString("CUST_PORD"));
quotNo = rs.getString("QUOT_NO"); quotNo = checkNull(rs.getString("QUOT_NO"));
taxOpt = rs.getString("TAX_OPT"); taxOpt = checkNull(rs.getString("TAX_OPT"));
priceList = rs.getString("PRICE_LIST"); priceList = checkNull(rs.getString("PRICE_LIST"));
partyQty = rs.getString("PART_QTY"); partyQty = checkNull(rs.getString("PART_QTY"));
exchRate = rs.getDouble("EXCH_RATE"); exchRate = rs.getDouble("EXCH_RATE");
tranCode = rs.getString("TRAN_CODE"); tranCode = checkNull(rs.getString("TRAN_CODE"));
frtTerm = rs.getString("FRT_TERM"); frtTerm = checkNull(rs.getString("FRT_TERM"));
frtAmt = rs.getDouble("FRT_AMT"); frtAmt = rs.getDouble("FRT_AMT");
currCodeFrt = rs.getString("CURR_CODE__FRT"); currCodeFrt = checkNull(rs.getString("CURR_CODE__FRT"));
salesPers = rs.getString("SALES_PERS"); salesPers = checkNull(rs.getString("SALES_PERS"));
commPerc = rs.getDouble("COMM_PERC"); commPerc = rs.getDouble("COMM_PERC");
commPerc1 = rs.getDouble("COMM_PERC_1"); commPerc1 = rs.getDouble("COMM_PERC_1");
commPerc2 = rs.getDouble("COMM_PERC_2"); commPerc2 = rs.getDouble("COMM_PERC_2");
commPercOn = rs.getString("COMM_PERC__ON"); commPercOn = checkNull(rs.getString("COMM_PERC__ON"));
commPercOn2 = rs.getString("COMM_PERC_ON_2"); commPercOn2 = checkNull(rs.getString("COMM_PERC_ON_2"));
commPercOn2= commPercOn2 == null ? "" : commPercOn2;//added by nandkumar gadkari on 16/12/19 //commPercOn2= commPercOn2 == null ? "" : commPercOn2;//added by nandkumar gadkari on 16/12/19
advPerc = rs.getDouble("ADV_PERC"); advPerc = rs.getDouble("ADV_PERC");
distRoute = rs.getString("DIST_ROUTE"); distRoute = checkNull(rs.getString("DIST_ROUTE"));
consumeFc = rs.getString("CONSUME_FC"); consumeFc = checkNull(rs.getString("CONSUME_FC"));
projCode = rs.getString("PROJ_CODE"); projCode = checkNull(rs.getString("PROJ_CODE"));
udfNum1 = rs.getDouble("UDF__NUM1"); udfNum1 = rs.getDouble("UDF__NUM1");
udfNum2 = rs.getDouble("UDF__NUM2"); udfNum2 = rs.getDouble("UDF__NUM2");
udfStr1 = rs.getString("UDF__STR1"); udfStr1 = checkNull(rs.getString("UDF__STR1"));
udfStr3 = rs.getString("UDF__STR3"); udfStr3 = checkNull(rs.getString("UDF__STR3"));
udfDate = rs.getTimestamp("UDF__DATE1"); udfDate = rs.getTimestamp("UDF__DATE1");
salesPers1 = rs.getString("SALES_PERS__1"); salesPers1 = checkNull(rs.getString("SALES_PERS__1"));
salesPers2 = rs.getString("SALES_PERS__2"); salesPers2 = checkNull(rs.getString("SALES_PERS__2"));
currCodeCom = rs.getString("CURR_CODE__COMM"); currCodeCom = checkNull(rs.getString("CURR_CODE__COMM"));
currCodeCom1 = rs.getString("CURR_CODE__COMM_1"); currCodeCom1 = checkNull(rs.getString("CURR_CODE__COMM_1"));
currCodeCom2 = rs.getString("CURR_CODE__COMM_2"); currCodeCom2 = checkNull(rs.getString("CURR_CODE__COMM_2"));
siteCode = rs.getString("SITE_CODE"); siteCode = checkNull(rs.getString("SITE_CODE"));
dlvTerm = rs.getString("DLV_TERM"); dlvTerm = checkNull(rs.getString("DLV_TERM"));
crTerm = rs.getString("CR_TERM"); crTerm = checkNull(rs.getString("CR_TERM"));
// 09-08-2006 manoharan // 09-08-2006 manoharan
siteCodeShip = rs.getString("SITE_CODE__SHIP"); siteCodeShip = rs.getString("SITE_CODE__SHIP");
// end 09-08-2006 manoharan // end 09-08-2006 manoharan
...@@ -1932,6 +1932,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea ...@@ -1932,6 +1932,7 @@ public class SaleContractRelease extends ProcessEJB implements SaleContractRelea
conn.rollback(); conn.rollback();
System.out.println("Inside else"); System.out.println("Inside else");
retString = itmDBAccessEJB.getErrorString("","VTPROUNSU2","","",conn); //added by manish mhatre on 11-nov-2019 retString = itmDBAccessEJB.getErrorString("","VTPROUNSU2","","",conn); //added by manish mhatre on 11-nov-2019
System.out.println("retstring>>>>>>"+retString);
return retString; return retString;
} }
} }
...@@ -2556,6 +2557,15 @@ private static void writeLog(File f,String ex,boolean flag) ...@@ -2556,6 +2557,15 @@ private static void writeLog(File f,String ex,boolean flag)
} }
return input.trim(); return input.trim();
} }
private String checkNull(String input)
{
if (input == null || "null".equalsIgnoreCase(input) || "undefined".equalsIgnoreCase(input))
{
input= "";
}
return input.trim();
}
/* private void writeException(Exception e) /* private void writeException(Exception e)
{ {
......
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