Skip to content

B
business-java
Commit a9d9f0c3 authored by cpatil's avatar cpatil
Browse files
Options

merge from branch 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101323 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 8eeae584
Show whitespace changes
Inline Side-by-side
Showing with 3305 additions and 2735 deletions
webitm-dis/ibase/webitm/ejb/dis/DespatchConfirm.java
View file @ a9d9f0c3
...@@ -255,9 +255,13 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -255,9 +255,13 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
/**************************For despatch GP NO Generation********************************************************************/ /**************************For despatch GP NO Generation********************************************************************/
varValue= distCommon.getDisparams("999999", "GP_NO_REQ", conn);
if("NULLFOUND".equalsIgnoreCase(varValue))
{
varValue = "Y";
}
if("Y".equals(varValue))
{
sql1 = "select site_code__exc " sql1 = "select site_code__exc "
+" from site where site_code = ? "; +" from site where site_code = ? ";
...@@ -335,7 +339,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -335,7 +339,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
}
//despatch_edit.setitem(ll_ctr,"confirmed", 'Y') //Ruchira 21/09/2k5 taken out of abovve if ... endif statement. //despatch_edit.setitem(ll_ctr,"confirmed", 'Y') //Ruchira 21/09/2k5 taken out of abovve if ... endif statement.
// CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT // CHECKING WHETHER PURCHASE IS INTEGRATED WITH SALES OR NOT
...@@ -1370,23 +1374,38 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm ...@@ -1370,23 +1374,38 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
//Boolean adjDrcrFlag= false, adjAdv=false, adjNewProdInvFlag=false; //Boolean adjDrcrFlag= false, adjAdv=false, adjNewProdInvFlag=false;
clubOrder = "N"; clubOrder = "N";
clubPendingOrd="N"; clubPendingOrd="N";
adjDrcr="N"; //adjDrcr="N";
adjCustAdv="N"; //adjCustAdv="N";
advAdjMode="C"; //advAdjMode="C";
adjNewProdInv="N"; //adjNewProdInv="N";
adjDrcr = checkNull(distCommon.getDisparams("999999","ADJUST_DR_CR_NOTE",conn));
adjCustAdv = checkNull(distCommon.getDisparams("999999","ADJUST_CUST_ADV",conn));
adjNewProdInv = checkNull(distCommon.getDisparams("999999","ADJUST_NEW_PRODUCT_INVOICE",conn));
advAdjMode = checkNull(distCommon.getDisparams("999999","ADJ_ADV_CUST_SALE",conn));
PostOrderProcess postOrderProcess = new PostOrderProcess(); System.out.println("@@@@@adjDrcr["+adjDrcr+"]adjCustAdv["+adjCustAdv+"]adjNewProdInv["+adjNewProdInv+"]advAdjMode["+advAdjMode+"]");
PostOrderProcess postOrderProcess = new PostOrderProcess();
// fromSaleOrder, toSaleOrder, fromCustCode, toCustCode, tranIdDespatch, orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn // fromSaleOrder, toSaleOrder, fromCustCode, toCustCode, tranIdDespatch, orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn
long startTime = System.currentTimeMillis();
System.out.println("START TIME FOR POST ORDER PROCESS IN SECONDS:::["+startTime/1000+"]");
errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId , orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn); errString= postOrderProcess.invPosting( fromSaleOrder, fromSaleOrder, fromCustCode, fromCustCode, tranId , orderType, fromDate, clubOrder, clubPendingOrd, adjDrcr, adjCustAdv, advAdjMode, adjNewProdInv, siteCodeShip, conn);
long endTime = System.currentTimeMillis();
System.out.println("END TIME FOR POST ORDER PROCESS IN SECONDS:::["+endTime/1000+"]");
System.out.println("DIFFERANCE IN TIME FOR POST ORDER PROCESS IN SECONDS:::["+(endTime-startTime)/1000+"]for SALE_ORDER["+fromSaleOrder+"]");
System.out.println("@@@@@@@@@689 invPosting() errString::::::["+errString+"]"); System.out.println("@@@@@@@@@689 invPosting() errString::::::["+errString+"]");
if(errString.indexOf("Success") > -1)
{
errString = "";
} }
} }
}
System.out.println("@@@@@@@@@689 out:::::["+errString+"]");
if( errString == null || errString.trim().length() == 0) if( errString == null || errString.trim().length() == 0)
{ {
System.out.println("errCode in despatch posting===="+errString); System.out.println("errCode in despatch posting===="+errString);
......
webitm-dis/ibase/webitm/ejb/dis/InvoiceDrcrAdj.java
View file @ a9d9f0c3
...@@ -62,7 +62,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -62,7 +62,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
double lcAdj = 0; double lcAdj = 0;
String xmlValues = null; String xmlValues = null;
String mTranId="", mTranSer="", mRefNo=""; String mTranId="", mTranSer="", mRefNo="";
String sqlStr1 = "";
try try
{ {
...@@ -71,8 +71,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -71,8 +71,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
genericUtility = new E12GenericUtility(); genericUtility = new E12GenericUtility();
itmDBAccessEJB = new ITMDBAccessEJB(); itmDBAccessEJB = new ITMDBAccessEJB();
//24/01/14 manoharan FI3JSUN007 adjust freight dr note also //24/01/14 manoharan FI3JSUN007 adjust freight dr note alsof
drnNotIn = " ";
if (frtDrnArr.length == 1) if (frtDrnArr.length == 1)
{ {
...@@ -84,11 +83,16 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -84,11 +83,16 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
drnNotIn =""; drnNotIn ="";
for(int i = 0; i < frtDrnArr.length; i++) for(int i = 0; i < frtDrnArr.length; i++)
{
if( frtDrnArr[i] != null && frtDrnArr[i].trim().length() > 0)
{ {
drnNotIn =drnNotIn+"'"+frtDrnArr[i]+"',"; drnNotIn =drnNotIn+"'"+frtDrnArr[i]+"',";
} }
}
if( drnNotIn != null && drnNotIn.trim().length() > 0)
{
drnNotIn =drnNotIn.substring(0,drnNotIn.length()-1); drnNotIn =drnNotIn.substring(0,drnNotIn.length()-1);
System.out.println("12-Mar-16 manoharan drnNotIn after ["+drnNotIn + "]"); }System.out.println("12-Mar-16 manoharan drnNotIn after ["+drnNotIn + "]");
adjustNewProduct = distCommon.getDisparams("999999","ADJUST_NEWPRODUCT",conn); adjustNewProduct = distCommon.getDisparams("999999","ADJUST_NEWPRODUCT",conn);
if (!"NULLFOUND".equals(adjustNewProduct) || "Y".equals(adjustNewProduct) ) if (!"NULLFOUND".equals(adjustNewProduct) || "Y".equals(adjustNewProduct) )
{ {
...@@ -257,23 +261,23 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -257,23 +261,23 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
//ended by bhavin //ended by bhavin
System.out.println("@@@@@@@@264 drnNotIn["+drnNotIn+"]");
//24/01/14 Manoharan FI3JSUN007 adjust all the freight drn //24/01/14 Manoharan FI3JSUN007 adjust all the freight drn
if (drnNotIn.trim().length() > 0 ) if (drnNotIn.trim().length() > 0 )
{ {
sqlStr = "insert into receivables_adj " sqlStr1 = "insert into receivables_adj "
+ "(tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) " + "(tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
+ " values (?, ?, ?, ?, ?, 0, ?, ? ,?) "; + " values (?, ?, ?, ?, ?, 0, ?, ? ,?) ";
pstmtInsert = conn.prepareStatement(sqlStr); pstmtInsert = conn.prepareStatement(sqlStr1);
//old logic kept in this Condition //old logic kept in this Condition
sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables " sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables "
+ " where tran_ser = 'MDRCRD' and ref_no in ( ? ) " //( " + drnNotIn + ") ) " + " where tran_ser = 'MDRCRD' and ref_no in ( "+drnNotIn+" ) "
+ " and tot_amt - adj_amt > 0 " + " and tot_amt - adj_amt > 0 "
+ " and site_code = '" + siteCode + "' " + " and site_code = '" + siteCode + "' "
+ " and item_ser = '" + itemSer + "' " + " and item_ser = '" + itemSer + "' "
+ " and cust_code = '" + custCode + "' order by tran_id "; + " and cust_code = '" + custCode + "' order by tran_id ";
pstmt = conn.prepareStatement(sqlStr); pstmt = conn.prepareStatement(sqlStr);
pstmt.setString(1,mOrderNo); //pstmt.setString(1,drnNotIn);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
...@@ -328,7 +332,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -328,7 +332,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
//04-09-2005 manoharan //04-09-2005 manoharan
//reverted on 15-09-2005 as per sun requirement //reverted on 15-09-2005 as per sun requirement
//if (adjDrCr = TRUE ) //Commented by jasmina-19/01/10-DI89SUN228 //if (adjDrCr = TRUE ) //Commented by jasmina-19/01/10-DI89SUN228
System.out.println("@@@@@@@@335 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdInv+"]adjustNewProduct["+adjustNewProduct+"]ordTypeNewPrd["+ordTypeNewPrd+"]");
if (adjDrCr || (adjNewProdInv && ("Y".equals(adjustNewProduct) && ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0) ) ) //Added by jasmina-19/01/10-DI89SUN228 if (adjDrCr || (adjNewProdInv && ("Y".equals(adjustNewProduct) && ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0) ) ) //Added by jasmina-19/01/10-DI89SUN228
{ {
//if (adjDrCr or adjustNewProduct = 'Y' ) //if (adjDrCr or adjustNewProduct = 'Y' )
...@@ -353,8 +357,10 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -353,8 +357,10 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
// //
String[] arrStr; String[] arrStr;
System.out.println("@@@@@@@@360 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdInv+"]");
if (adjDrCr && adjNewProdInv ) //if (condition Added by jasmina-19/01/10-DI89SUN228 if (adjDrCr && adjNewProdInv ) //if (condition Added by jasmina-19/01/10-DI89SUN228
{ {
System.out.println("1@@@@@@@@ tranTypeFinChrgDrn["+tranTypeFinChrgDrn+"]");
//old logic kept in this Condition //old logic kept in this Condition
sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables "; sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0) if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0)
...@@ -394,6 +400,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -394,6 +400,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
//} //}
// 04-09-2005 manoharan // 04-09-2005 manoharan
//if ((not isnull(ordTypeNewPrd)) and (len(trim(ordTypeNewPrd)) > 0) ) //if ((not isnull(ordTypeNewPrd)) and (len(trim(ordTypeNewPrd)) > 0) )
System.out.println("@@@@@@@@ ordTypeNewPrd["+ordTypeNewPrd+"]adjustNewProduct["+adjustNewProduct+"]tranTypeFinChrgDrn["+tranTypeFinChrgDrn+"]");
if (ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0 && "Y".equals(adjustNewProduct) ) if (ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0 && "Y".equals(adjustNewProduct) )
{ {
// end 04-09-2005 manoharan // end 04-09-2005 manoharan
...@@ -418,7 +425,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -418,7 +425,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
} }
else else
{ {
sqlStr = sqlStr + " ) "; // sqlStr = sqlStr + " ) ";//TEST
} }
} }
sqlStr = sqlStr + " and tot_amt - adj_amt > 0 " sqlStr = sqlStr + " and tot_amt - adj_amt > 0 "
...@@ -430,6 +437,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -430,6 +437,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
} }
else if (adjDrCr && (!adjNewProdInv) ) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228 else if (adjDrCr && (!adjNewProdInv) ) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
{ {
System.out.println("2@@@@@@@@ ");
sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables "; sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0) if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0)
{ {
...@@ -476,6 +484,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -476,6 +484,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
} }
else if (!adjDrCr && adjNewProdInv ) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228 else if (!adjDrCr && adjNewProdInv ) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
{ {
System.out.println("3@@@@@@@@ ");
if ( ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0 && "Y".equals(adjustNewProduct) ) if ( ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0 && "Y".equals(adjustNewProduct) )
{ {
...@@ -503,10 +512,10 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -503,10 +512,10 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
sqlStr = "insert into receivables_adj " sqlStr1 = "insert into receivables_adj "
+ "(tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) " + "(tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
+ " values (?, ?, ?, ?, ?, 0, ?, ? ,?) "; + " values (?, ?, ?, ?, ?, 0, ?, ? ,?) ";
pstmtInsert = conn.prepareStatement(sqlStr); pstmtInsert = conn.prepareStatement(sqlStr1);
pstmt = conn.prepareStatement(sqlStr); pstmt = conn.prepareStatement(sqlStr);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -593,6 +602,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -593,6 +602,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
//String[] arrStr; //String[] arrStr;
if (adjDrCr && adjNewProdInv) //if (condition Added by jasmina-19/01/10-DI89SUN228 if (adjDrCr && adjNewProdInv) //if (condition Added by jasmina-19/01/10-DI89SUN228
{ {
System.out.println("4@@@@@@@@ ");
//old logic kept in this Condition //old logic kept in this Condition
sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables "; sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0) if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0)
...@@ -658,7 +668,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -658,7 +668,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
} }
else else
{ {
sqlStr = sqlStr + " ) "; //sqlStr = sqlStr + " ) ";
} }
} }
sqlStr = sqlStr + " and tot_amt - adj_amt > 0 " sqlStr = sqlStr + " and tot_amt - adj_amt > 0 "
...@@ -670,6 +680,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -670,6 +680,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
} }
else if (adjDrCr && !adjNewProdInv) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228 else if (adjDrCr && !adjNewProdInv) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
{ {
System.out.println("5@@@@@@@@ tranTypeFinChrgDrn["+tranTypeFinChrgDrn+"]");
sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables "; sqlStr = "select tran_id, tran_ser, ref_no, tot_amt, adj_amt from receivables ";
if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0) if (tranTypeFinChrgDrn != null && tranTypeFinChrgDrn.trim().length() > 0)
{ {
...@@ -716,7 +727,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -716,7 +727,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
} }
else if (!adjDrCr && adjNewProdInv) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228 else if (!adjDrCr && adjNewProdInv) //Else if (Condtion Added by jasmina 22/01/10-DI89SUN228
{ {
System.out.println("6@@@@@@@@ ");
if ((ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0) && "Y".equals(adjustNewProduct)) if ((ordTypeNewPrd != null && ordTypeNewPrd.trim().length() > 0) && "Y".equals(adjustNewProduct))
{ {
arrStr = ordTypeNewPrd.split(","); arrStr = ordTypeNewPrd.split(",");
...@@ -972,11 +983,11 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -972,11 +983,11 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
nextID = tg.generateTranSeqID("R-ADJ", "tran_id", keystr, conn); nextID = tg.generateTranSeqID("R-ADJ", "tran_id", keystr, conn);
System.out.println("nextID ["+nextID + "]"); System.out.println("nextID ["+nextID + "]");
// 09-01-02 End Arif // 09-01-02 End Arif
sqlStr = "insert into receivables_adj " sqlStr1 = "insert into receivables_adj "
+ " (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) " + " (tran_id, ref_ser, ref_no, tot_amt, adj_amt, net_amt,ref_ser_adj,ref_no_adj, tran_id__rcv) "
+ " values (?, ?, ?, ?, ?, ?, ?, ? ,?) "; + " values (?, ?, ?, ?, ?, ?, ?, ? ,?) ";
pstmtInsert.close(); pstmtInsert.close();
pstmtInsert = conn.prepareStatement(sqlStr); pstmtInsert = conn.prepareStatement(sqlStr1);
pstmtInsert.setString(1,nextID); pstmtInsert.setString(1,nextID);
pstmtInsert.setString(2,mTranSer); pstmtInsert.setString(2,mTranSer);
...@@ -1015,18 +1026,18 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -1015,18 +1026,18 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
nextID = tg.generateTranSeqID("R-ADJ", "tran_id", keystr, conn); nextID = tg.generateTranSeqID("R-ADJ", "tran_id", keystr, conn);
System.out.println("nextID ["+nextID + "]"); System.out.println("nextID ["+nextID + "]");
// 09-01-02 End Arif // 09-01-02 End Arif
sqlStr = "INSERT INTO receivables_adj " sqlStr1 = "INSERT INTO receivables_adj "
+ " (tran_id, ref_ser, ref_no, tot_amt, " + " (tran_id, ref_ser, ref_no, tot_amt, "
+ " adj_amt, ref_ser_adj, ref_no_adj, " + " adj_amt, ref_ser_adj, ref_no_adj, "
+ " net_amt, tran_id__rcv ) " + " net_amt, tran_id__rcv ) "
+ " values (?, ?, ?, ?, ?, ' ', ' ', ?, ' ') "; + " values (?, ?, ?, ?, ?, ' ', ' ', ?, ' ') ";
pstmtInsert = conn.prepareStatement(sqlStr); pstmtInsert = conn.prepareStatement(sqlStr1);
pstmtInsert.setString(1,nextID); pstmtInsert.setString(1,nextID);
pstmtInsert.setString(2,adjTranSer); pstmtInsert.setString(2,adjTranSer);
pstmtInsert.setString(3,adjRefNo); pstmtInsert.setString(3,adjRefNo);
pstmtInsert.setDouble(4,netAmt); pstmtInsert.setDouble(4,netAmt);
pstmtInsert.setDouble(5,(mDrAmt - netAmt) * -1); pstmtInsert.setDouble(5,netAmt-((mDrAmt - netAmt) * -1));
pstmtInsert.setDouble(6,(netAmt - (mDrAmt - netAmt))); pstmtInsert.setDouble(6,(netAmt - (mDrAmt - netAmt)));
pstmtInsert.executeUpdate(); pstmtInsert.executeUpdate();
pstmtInsert.close(); pstmtInsert.close();
...@@ -1037,7 +1048,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode, ...@@ -1037,7 +1048,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
pstmtInsert = conn.prepareStatement(sqlStr); pstmtInsert = conn.prepareStatement(sqlStr);
pstmtInsert.setDouble(1,(mDrAmt - netAmt) * -1); pstmtInsert.setDouble(1,(mDrAmt - netAmt) * -1);
pstmtInsert.setString(1,invoiceId); pstmtInsert.setString(2,invoiceId);
pstmtInsert.executeUpdate(); pstmtInsert.executeUpdate();
} }
......
webitm-dis/ibase/webitm/ejb/dis/PostOrdCreditChk.java
View file @ a9d9f0c3
...@@ -31,7 +31,8 @@ public class PostOrdCreditChk ...@@ -31,7 +31,8 @@ public class PostOrdCreditChk
{ {
//public HashMap CreditCheck (HashMap paramMap, Connection conn) throws RemoteException,ITMException//Amit 27/10/04. This function is a copy of gf_credit_check function. //public HashMap CreditCheck (HashMap paramMap, Connection conn) throws RemoteException,ITMException//Amit 27/10/04. This function is a copy of gf_credit_check function.
public String CreditCheck (HashMap paramMap, Connection conn) throws RemoteException,ITMException //public String CreditCheck (HashMap paramMap, Connection conn) throws RemoteException,ITMException
public ArrayList<String> CreditCheck (HashMap paramMap, Connection conn) throws RemoteException,ITMException//Amit 27/10/04. This function is a copy of gf_credit_check function.
{ {
int mCount=0, mChkDays=0, llIgnGays=0, llSerCount=0, llPolicyNo=0 ; int mCount=0, mChkDays=0, llIgnGays=0, llSerCount=0, llPolicyNo=0 ;
String errString = " ", mStat="", lsCreditTerm="", lsVarValue="", lsItemSerCrPolicy="", lsItemSer="", lsConsiderPbo="", lsOrdNewPrd="" ; String errString = " ", mStat="", lsCreditTerm="", lsVarValue="", lsItemSerCrPolicy="", lsItemSer="", lsConsiderPbo="", lsOrdNewPrd="" ;
...@@ -78,6 +79,8 @@ public class PostOrdCreditChk ...@@ -78,6 +79,8 @@ public class PostOrdCreditChk
int ctr=0; int ctr=0;
String lsMail[]=null,asCheck[]=null,gs_inv_call_fr=""; String lsMail[]=null,asCheck[]=null,gs_inv_call_fr="";
//E12GenericUtility e12GenericUtility = new E12GenericUtility(); //E12GenericUtility e12GenericUtility = new E12GenericUtility();
ArrayList<String> retArrayList = new ArrayList<String>();
try try
{ {
Timestamp currDate = new java.sql.Timestamp(System.currentTimeMillis()); Timestamp currDate = new java.sql.Timestamp(System.currentTimeMillis());
...@@ -397,7 +400,20 @@ public class PostOrdCreditChk ...@@ -397,7 +400,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P01',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P01',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P01",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
retArrayList = credit_check_update(asSorder,"P01",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6 //To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
if ("I".equalsIgnoreCase(asApplyTime)) if ("I".equalsIgnoreCase(asApplyTime))
...@@ -408,7 +424,7 @@ public class PostOrdCreditChk ...@@ -408,7 +424,7 @@ public class PostOrdCreditChk
{ {
lsStr3 = ", Sales Order Amt.=> "+String(adNetAmt); lsStr3 = ", Sales Order Amt.=> "+String(adNetAmt);
} }
lsStr = lcCheckAmt +"\t " +lsStr1 + ", " + lsStr2 +", " + lsStr3; lsStr = lcCheckAmt +"\t" +lsStr1 + ", " + lsStr2 +", " + lsStr3;
if (lcCheckAmt > 0) if (lcCheckAmt > 0)
{ {
...@@ -545,7 +561,20 @@ public class PostOrdCreditChk ...@@ -545,7 +561,20 @@ public class PostOrdCreditChk
//****************** gbf_credit_check_update(asSorder,"P02",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus); //****************** gbf_credit_check_update(asSorder,"P02",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus);
credit_check_update(asSorder,"P02",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P02",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = "Outstanding amount exceeds limit for customer "+lsCustName; lsStr1 = "Outstanding amount exceeds limit for customer "+lsCustName;
lsStr2 = " , Total O/S Amt: " + mTotOsAmt + " for division "+ lsItemSerDescr.trim() + " exceeds limit: "+ mCrLimit ; lsStr2 = " , Total O/S Amt: " + mTotOsAmt + " for division "+ lsItemSerDescr.trim() + " exceeds limit: "+ mCrLimit ;
...@@ -639,7 +668,20 @@ public class PostOrdCreditChk ...@@ -639,7 +668,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P03',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus) //****************** gbf_credit_check_update(asSorder,'P03',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
credit_check_update(asSorder,"P03",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P03",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = "Overall credit check failed for "+lsCustName; lsStr1 = "Overall credit check failed for "+lsCustName;
lsStr2 = " , Total O/S Amt over and above "+ llIgnGays +" days is " + mTotalOsAmt + " exceeds limit: "+String(mIgnCr); lsStr2 = " , Total O/S Amt over and above "+ llIgnGays +" days is " + mTotalOsAmt + " exceeds limit: "+String(mIgnCr);
...@@ -787,7 +829,20 @@ public class PostOrdCreditChk ...@@ -787,7 +829,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P04',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P04',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P04",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P04",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = "Overall total credit check failed for "+lsCustName; lsStr1 = "Overall total credit check failed for "+lsCustName;
lsStr2 = " , Total O/S Amt: "+ mTotOsAmt + " exceeds credit limit: "+ mCrLimit; lsStr2 = " , Total O/S Amt: "+ mTotOsAmt + " exceeds credit limit: "+ mCrLimit;
...@@ -948,7 +1003,20 @@ public class PostOrdCreditChk ...@@ -948,7 +1003,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P05',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P05',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P05",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P05",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = lsCustName + " is on Advance Term"; lsStr1 = lsCustName + " is on Advance Term";
lsStr2 = " , Credit Balance: "+ lcNetAdv + " is less than invoice amount: "+ adNetAmt; lsStr2 = " , Credit Balance: "+ lcNetAdv + " is less than invoice amount: "+ adNetAmt;
...@@ -1103,7 +1171,20 @@ public class PostOrdCreditChk ...@@ -1103,7 +1171,20 @@ public class PostOrdCreditChk
{ {
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P06',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus) //****************** gbf_credit_check_update(asSorder,'P06',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
credit_check_update(asSorder,"P06",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P06",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = lsCustName + " is crossing the business limit"; lsStr1 = lsCustName + " is crossing the business limit";
lsStr2 = " , Sales for the month: " + lcNetAmt + " exceeds defined business limit: "+ lcBusiLimit +"*"+asItemSer; lsStr2 = " , Sales for the month: " + lcNetAmt + " exceeds defined business limit: "+ lcBusiLimit +"*"+asItemSer;
...@@ -1246,7 +1327,20 @@ public class PostOrdCreditChk ...@@ -1246,7 +1327,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P07',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P07',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P07",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P07",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = lsCustName + " is crossing the minimum invoice limit"; lsStr1 = lsCustName + " is crossing the minimum invoice limit";
lsStr2 = " , Net Invoice Amt: " + adNetAmt + " is below the minimum sales value: " + lcMinInvAmt; lsStr2 = " , Net Invoice Amt: " + adNetAmt + " is below the minimum sales value: " + lcMinInvAmt;
...@@ -1342,7 +1436,20 @@ public class PostOrdCreditChk ...@@ -1342,7 +1436,20 @@ public class PostOrdCreditChk
{ {
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P08',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P08',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P08",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P08",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = "Rate is not matching with price list master"; lsStr1 = "Rate is not matching with price list master";
lsStr2 = " , Rate From Master: " + lcPickRate + " does not match with sales order detail rate: " + lcRate; lsStr2 = " , Rate From Master: " + lcPickRate + " does not match with sales order detail rate: " + lcRate;
...@@ -1513,7 +1620,20 @@ public class PostOrdCreditChk ...@@ -1513,7 +1620,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P09',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P09',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P09",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P09",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsSql = "select sp_name from sales_pers where sales_pers = ?"; lsSql = "select sp_name from sales_pers where sales_pers = ?";
...@@ -1640,7 +1760,21 @@ public class PostOrdCreditChk ...@@ -1640,7 +1760,21 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P10',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus) //****************** gbf_credit_check_update(asSorder,'P10',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
credit_check_update(asSorder,"P10",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P10",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsSql = "select sp_name from sales_pers where sales_pers = ?"; lsSql = "select sp_name from sales_pers where sales_pers = ?";
...@@ -1819,7 +1953,20 @@ public class PostOrdCreditChk ...@@ -1819,7 +1953,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P11',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P11',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P11",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P11",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsSql = "select sp_name from sales_pers where sales_pers = ?"; lsSql = "select sp_name from sales_pers where sales_pers = ?";
...@@ -1948,7 +2095,20 @@ public class PostOrdCreditChk ...@@ -1948,7 +2095,20 @@ public class PostOrdCreditChk
{ {
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P12',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P12',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P12",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P12",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsSql = "select sp_name from sales_pers where sales_pers = ?"; lsSql = "select sp_name from sales_pers where sales_pers = ?";
...@@ -2134,7 +2294,20 @@ public class PostOrdCreditChk ...@@ -2134,7 +2294,20 @@ public class PostOrdCreditChk
{ {
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P13',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P13',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P13",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P13",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsSql = "select name from contact where contact_code = ? "; lsSql = "select name from contact where contact_code = ? ";
...@@ -2262,7 +2435,20 @@ public class PostOrdCreditChk ...@@ -2262,7 +2435,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P14',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus) //****************** gbf_credit_check_update(asSorder,'P14',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
credit_check_update(asSorder,"P14",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P14",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsSql = "select name from contact where contact_code = ? "; lsSql = "select name from contact where contact_code = ? ";
...@@ -2369,7 +2555,20 @@ public class PostOrdCreditChk ...@@ -2369,7 +2555,20 @@ public class PostOrdCreditChk
{ {
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P15',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P15',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P15",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P15",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = "Cash discount credit check failed for customer " + lsCustName; lsStr1 = "Cash discount credit check failed for customer " + lsCustName;
lsStr2 = " , Total over due O/S Amt: " + mTotOsAmt; lsStr2 = " , Total over due O/S Amt: " + mTotOsAmt;
...@@ -2508,7 +2707,20 @@ public class PostOrdCreditChk ...@@ -2508,7 +2707,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P16',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P16',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P16",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P16",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = "Advance credit check failed for customer " + lsCustName; lsStr1 = "Advance credit check failed for customer " + lsCustName;
lsStr2 = " , Total Advance Amt: " + mTotOsAmt + " exceeds order amount: " + lcPendOrd; lsStr2 = " , Total Advance Amt: " + mTotOsAmt + " exceeds order amount: " + lcPendOrd;
...@@ -2596,7 +2808,20 @@ public class PostOrdCreditChk ...@@ -2596,7 +2808,20 @@ public class PostOrdCreditChk
{ {
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,'P17',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus); //****************** gbf_credit_check_update(asSorder,'P17',adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus);
credit_check_update(asSorder,"P17",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,"P17",adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
lsStr1 = ""; lsStr1 = "";
lsStr2 = " Total Advance Amt: " + lcAdvVal + " less than advance percentage specified in sale order"; lsStr2 = " Total Advance Amt: " + lcAdvVal + " less than advance percentage specified in sale order";
...@@ -2681,7 +2906,7 @@ public class PostOrdCreditChk ...@@ -2681,7 +2906,7 @@ public class PostOrdCreditChk
} }
lsFail = "F"; lsFail = "F";
System.out.println("@@@@ lsPolicySql====["+lsPolicySql+"]lsPolicyInput["+lsPolicyInput+"]lsPolicyResult["+lsPolicyResult+"]lsPolicyCondition["+lsPolicyCondition+"]");
////If policy_sql is null then credit check will not be done. ////If policy_sql is null then credit check will not be done.
if (lsPolicySql != null && lsPolicySql.trim().length() > 0 ) if (lsPolicySql != null && lsPolicySql.trim().length() > 0 )
{ {
...@@ -2691,7 +2916,7 @@ public class PostOrdCreditChk ...@@ -2691,7 +2916,7 @@ public class PostOrdCreditChk
{ {
arrStr = lsPolicyInput.split(","); arrStr = lsPolicyInput.split(",");
arrSql = lsPolicySql.split ("?"); arrSql = lsPolicySql.split ("\\?");
lsSql = ""; lsSql = "";
int arrCtr = 0; int arrCtr = 0;
for (arrCtr = 0; arrCtr < arrStr.length; arrCtr++) for (arrCtr = 0; arrCtr < arrStr.length; arrCtr++)
...@@ -2722,6 +2947,7 @@ public class PostOrdCreditChk ...@@ -2722,6 +2947,7 @@ public class PostOrdCreditChk
lsValue = "" + adNetAmt; lsValue = "" + adNetAmt;
} }
lsSql = lsSql + arrSql[arrCtr] + lsValue; lsSql = lsSql + arrSql[arrCtr] + lsValue;
System.out.println("@@@@1 lsSql====["+lsSql+"]arrCtr===["+arrCtr+"]");
} }
if (arrStr.length < arrSql.length) if (arrStr.length < arrSql.length)
{ {
...@@ -2733,13 +2959,15 @@ public class PostOrdCreditChk ...@@ -2733,13 +2959,15 @@ public class PostOrdCreditChk
{ {
lsSql = lsPolicySql; lsSql = lsPolicySql;
} }
System.out.println("@@@@2 lsSql====["+lsSql+"]");
////Executing the dynamit sql to get the result. ////Executing the dynamit sql to get the result.
pstmt = conn.prepareStatement(lsSql); pstmt = conn.prepareStatement(lsSql);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
ResultSetMetaData rsmd=rs.getMetaData(); ResultSetMetaData rsmd=rs.getMetaData();
int resultType = Integer.parseInt(rsmd.getColumnTypeName(1)); // int resultType = Integer.parseInt(rsmd.getColumnTypeName(1));
int resultType = rsmd.getColumnType(1);
System.out.println("@@@@@ resultType["+resultType+"]");
lsResult = ""; lsResult = "";
double lcResult = 0; double lcResult = 0;
int liResult = 9; int liResult = 9;
...@@ -2771,11 +2999,13 @@ public class PostOrdCreditChk ...@@ -2771,11 +2999,13 @@ public class PostOrdCreditChk
{ {
if( resultType== 4 || resultType == 5) if( resultType== 4 || resultType == 5)
{ {
liResult = rs.getInt(1); //liResult = rs.getInt(1);
lsResult = rs.getString(1);
} }
else if( resultType >= 2 && resultType <= 8) else if( resultType >= 2 && resultType <= 8)
{ {
lcResult = rs.getDouble(1); //lcResult = rs.getDouble(1);
lsResult = rs.getString(1);
} }
else if( resultType == 1 || resultType == 12) else if( resultType == 1 || resultType == 12)
{ {
...@@ -2792,7 +3022,7 @@ public class PostOrdCreditChk ...@@ -2792,7 +3022,7 @@ public class PostOrdCreditChk
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("@@@@@@@lsPolicyCondition["+lsPolicyCondition+"]lsPolicyResult["+lsPolicyResult+"] lsResult["+lsResult+"]ldtResultResult["+ldtResultResult+"]");
////comparing the sql result with the given result in policy_result using the conditional ////comparing the sql result with the given result in policy_result using the conditional
////operater given in the policy_condition column. ////operater given in the policy_condition column.
if (lsPolicyCondition != null && lsPolicyCondition.trim().length() > 0 && lsPolicyResult != null && lsPolicyResult.trim().length() > 0) if (lsPolicyCondition != null && lsPolicyCondition.trim().length() > 0 && lsPolicyResult != null && lsPolicyResult.trim().length() > 0)
...@@ -2949,9 +3179,11 @@ public class PostOrdCreditChk ...@@ -2949,9 +3179,11 @@ public class PostOrdCreditChk
} }
} }
System.out.println("@@@@ 3182 lsFail["+lsFail+"]");
} }
} }
System.out.println("@@@@ 3185 lsFail["+lsFail+"]");
//Added Ruchira 08/06/2k6 //Added Ruchira 08/06/2k6
//Credit check is failed so adding it into the asCheck array. //Credit check is failed so adding it into the asCheck array.
if("T".equalsIgnoreCase(lsFail)) if("T".equalsIgnoreCase(lsFail))
...@@ -2961,7 +3193,7 @@ public class PostOrdCreditChk ...@@ -2961,7 +3193,7 @@ public class PostOrdCreditChk
sql = " select title from itemser_cr_policy " + sql = " select title from itemser_cr_policy " +
" where item_ser = ? " + " where item_ser = ? " +
" and cr_policy = ? "; " and cr_policy = ? ";
pstmt = conn.prepareStatement(lsSql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,asItemSer); pstmt.setString(1,asItemSer);
pstmt.setString(2,lsCrPolicy); pstmt.setString(2,lsCrPolicy);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -2979,7 +3211,7 @@ public class PostOrdCreditChk ...@@ -2979,7 +3211,7 @@ public class PostOrdCreditChk
{ {
lsStr1 = lsCrPolicy+" Dynamic credit check failed !!!"; lsStr1 = lsCrPolicy+" Dynamic credit check failed !!!";
} }
} //}
//To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6 //To show the Invoice/SO amt in credit chek fail description, Added Ruchira 21/08/2k6
if ("I".equals(asApplyTime)) if ("I".equals(asApplyTime))
...@@ -2998,7 +3230,20 @@ public class PostOrdCreditChk ...@@ -2998,7 +3230,20 @@ public class PostOrdCreditChk
////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6 ////Checking for overriden / failed / balance amt, Ruchira 28/08/2k6
//****************** gbf_credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus) //****************** gbf_credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,'C',lsStatus)
credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn); retArrayList = credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"C",lsStatus,conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
lcCheckAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ lsCrPolicy["+lsCrPolicy+"]lcCheckAmt["+lcCheckAmt+"]lsStatus["+lsStatus+"]");
////Always when credit check fails it must get added into as_mail. ////Always when credit check fails it must get added into as_mail.
if (!"O".equals(lsStatus)) if (!"O".equals(lsStatus))
...@@ -3010,7 +3255,8 @@ public class PostOrdCreditChk ...@@ -3010,7 +3255,8 @@ public class PostOrdCreditChk
{ {
//asCheck[ctr] = lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr; //asCheck[ctr] = lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr;
//ctr = ctr + 1; //ctr = ctr + 1;
asCheckList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr); //asCheckList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
failedPolicyList.add(lsCrPolicy+"\t"+asDespId+"\t"+asSorder+"\t"+lsStr);
} }
} }
...@@ -3021,6 +3267,9 @@ public class PostOrdCreditChk ...@@ -3021,6 +3267,9 @@ public class PostOrdCreditChk
//****************** credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,'U',lsStatus) //****************** credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,'U',lsStatus)
credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn); credit_check_update(asSorder,lsCrPolicy,adNetAmt,asApplyTime,lcCheckAmt,"U",lsStatus,conn);
} }
}
////End Added Ruchira 29/08/2k6 ////End Added Ruchira 29/08/2k6
//End Added Ruchira 08/06/2k6 //End Added Ruchira 08/06/2k6
...@@ -3154,7 +3403,8 @@ public class PostOrdCreditChk ...@@ -3154,7 +3403,8 @@ public class PostOrdCreditChk
} }
} }
return errString; // return errString;
return failedPolicyList;
} }
...@@ -3576,7 +3826,7 @@ public class PostOrdCreditChk ...@@ -3576,7 +3826,7 @@ public class PostOrdCreditChk
return crPolicyList; return crPolicyList;
} }
public void credit_check_update(String SOrder, String cr_policy,double adNetAmt, String asApplyTime, double lcCheckAmt,String as_check_flag,String lsStatus, Connection conn) throws SQLException public ArrayList<String> credit_check_update(String SOrder, String cr_policy,double adNetAmt, String asApplyTime, double lcCheckAmt,String as_check_flag,String lsStatus, Connection conn) throws SQLException
{ {
System.out.println("@@@@@@@@@@@ credit_check_update() called.............as_check_flag["+as_check_flag+"]lsStatus["+lsStatus+"]cr_policy["+cr_policy+"]asApplyTime["+asApplyTime+"]"); System.out.println("@@@@@@@@@@@ credit_check_update() called.............as_check_flag["+as_check_flag+"]lsStatus["+lsStatus+"]cr_policy["+cr_policy+"]asApplyTime["+asApplyTime+"]");
////Updating the overriden records in business_logic_check table by invoice amount. ////Updating the overriden records in business_logic_check table by invoice amount.
...@@ -3594,6 +3844,8 @@ public class PostOrdCreditChk ...@@ -3594,6 +3844,8 @@ public class PostOrdCreditChk
String sql = "", sql2 = ""; String sql = "", sql2 = "";
ResultSet rs = null,rs2 = null; ResultSet rs = null,rs2 = null;
ArrayList<String> retArrayList = new ArrayList<String>();
if("C".equalsIgnoreCase(as_check_flag)) // as_check_flag = 'C' then //Calculate amount if("C".equalsIgnoreCase(as_check_flag)) // as_check_flag = 'C' then //Calculate amount
{ {
sql = " select sum(aprv_amt), count(1)" + sql = " select sum(aprv_amt), count(1)" +
...@@ -3615,6 +3867,7 @@ public class PostOrdCreditChk ...@@ -3615,6 +3867,7 @@ public class PostOrdCreditChk
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("@@@@@@ lc_aprv_amt["+lc_aprv_amt+"]ll_count["+ll_count+"]");
//Checking for status only. //Checking for status only.
if( lc_aprv_amt == 0 && ll_count > 0 ) if( lc_aprv_amt == 0 && ll_count > 0 )
{ {
...@@ -3784,8 +4037,13 @@ public class PostOrdCreditChk ...@@ -3784,8 +4037,13 @@ public class PostOrdCreditChk
pstmt = null; pstmt = null;
} }
System.out.println("@@@ lsStatus["+lsStatus+"]ac_check_amt["+ac_check_amt+"]");
retArrayList.add(lsStatus);
retArrayList.add(""+ac_check_amt);
return retArrayList;
}//end if }//end if
////End Added Ruchira 24/08/2k6 (DI6SUN0120), If approved amt = 0 or status = 'O' then not to make any credit check. ////End Added Ruchira 24/08/2k6 (DI6SUN0120), If approved amt = 0 or status = 'O' then not to make any credit check.
......
webitm-dis/ibase/webitm/ejb/dis/PostOrdInvoiceGen.java
View file @ a9d9f0c3
...@@ -339,7 +339,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -339,7 +339,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
int lineNo=0,lineNoDet=0; int lineNo=0,lineNoDet=0;
Timestamp dueDate=null; Timestamp dueDate=null;
String acctCodeDis="",cctrCodeDis="",acctCodeAr="",cctrCodeAr = "",acctCodePr="",cctrCodePr="",marketReg = "",mfgDateStr="",expDateStr=""; String acctCodeDis="",cctrCodeDis="",acctCodeAr="",cctrCodeAr = "",acctCodePr="",cctrCodePr="",marketReg = "",mfgDateStr="",expDateStr="";
double netAmt=0,taxAmt=0,commAmt=0,discAmt=0,invAmt=0;
/** /**
* Generate Bean object * Generate Bean object
* */ * */
...@@ -564,7 +564,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -564,7 +564,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
xmlBuff.append("<sales_pers_comm_2><![CDATA["+invDespMap.get("sales_pers_comm_2")+"]]></sales_pers_comm_2>"); xmlBuff.append("<sales_pers_comm_2><![CDATA["+invDespMap.get("sales_pers_comm_2")+"]]></sales_pers_comm_2>");
xmlBuff.append("<sales_pers_comm_3><![CDATA["+invDespMap.get("sales_pers_comm_3")+"]]></sales_pers_comm_3>"); xmlBuff.append("<sales_pers_comm_3><![CDATA["+invDespMap.get("sales_pers_comm_3")+"]]></sales_pers_comm_3>");
xmlBuff.append("<round_adj><![CDATA[]]></round_adj>"); // Set round_adj xmlBuff.append("<round_adj><![CDATA[]]></round_adj>"); // Set round_adj
xmlBuff.append("<net_amt><![CDATA[]]></net_amt>"); // Set net_amt xmlBuff.append("<net_amt><![CDATA[0]]></net_amt>"); // Set net_amt
xmlBuff.append("</Detail1>"); xmlBuff.append("</Detail1>");
...@@ -603,8 +603,8 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -603,8 +603,8 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
xmlBuff.append("<tax_class><![CDATA["+invTraceDetMap.get("tax_class")+"]]></tax_class>"); xmlBuff.append("<tax_class><![CDATA["+invTraceDetMap.get("tax_class")+"]]></tax_class>");
xmlBuff.append("<tax_chap><![CDATA["+invTraceDetMap.get("tax_chap")+"]]></tax_chap>"); xmlBuff.append("<tax_chap><![CDATA["+invTraceDetMap.get("tax_chap")+"]]></tax_chap>");
xmlBuff.append("<tax_env><![CDATA["+invTraceDetMap.get("tax_env")+"]]></tax_env>"); xmlBuff.append("<tax_env><![CDATA["+invTraceDetMap.get("tax_env")+"]]></tax_env>");
xmlBuff.append("<tax_amt><![CDATA[]]></tax_amt>"); //tax_amt missing xmlBuff.append("<tax_amt><![CDATA[0]]></tax_amt>"); //tax_amt missing
xmlBuff.append("<net_amt><![CDATA[]]></net_amt>"); //net_amt missing xmlBuff.append("<net_amt><![CDATA[0]]></net_amt>"); //net_amt missing
xmlBuff.append("<unit__std><![CDATA[" + invTraceDetMap.get("sord_unit__std") + "]]></unit__std>"); xmlBuff.append("<unit__std><![CDATA[" + invTraceDetMap.get("sord_unit__std") + "]]></unit__std>");
xmlBuff.append("<conv__qty_stduom><![CDATA[" + invTraceDetMap.get("sord_conv__qty_stduom") + "]]></conv__qty_stduom>"); xmlBuff.append("<conv__qty_stduom><![CDATA[" + invTraceDetMap.get("sord_conv__qty_stduom") + "]]></conv__qty_stduom>");
xmlBuff.append("<quantity__stduom><![CDATA[" + invTraceDetMap.get("desp_quantity__stduom") + "]]></quantity__stduom>"); xmlBuff.append("<quantity__stduom><![CDATA[" + invTraceDetMap.get("desp_quantity__stduom") + "]]></quantity__stduom>");
...@@ -751,7 +751,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -751,7 +751,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
xmlBuff.append("<conv__rtuom_stduom><![CDATA[" + invoiceDetBean.getConv__rtuom_stduom() + "]]></conv__rtuom_stduom>"); xmlBuff.append("<conv__rtuom_stduom><![CDATA[" + invoiceDetBean.getConv__rtuom_stduom() + "]]></conv__rtuom_stduom>");
xmlBuff.append("<rate__stduom><![CDATA[" + invoiceDetBean.getDesp_rate__stduom() + "]]></rate__stduom>"); xmlBuff.append("<rate__stduom><![CDATA[" + invoiceDetBean.getDesp_rate__stduom() + "]]></rate__stduom>");
xmlBuff.append("<discount><![CDATA[" + invoiceDetBean.getDiscount() + "]]></discount>"); xmlBuff.append("<discount><![CDATA[" + invoiceDetBean.getDiscount() + "]]></discount>");
xmlBuff.append("<disc_amt><![CDATA[" + invoiceDetBean.getDisc_amt()+ "]]></disc_amt>"); xmlBuff.append("<disc_amt><![CDATA[" + invoiceDetBean.getDisc_amt() + "]]></disc_amt>");
xmlBuff.append("<disc_schem_billback_amt><![CDATA[" + invoiceDetBean.getDisc_schem_billback_amt()+ "]]></disc_schem_billback_amt>"); xmlBuff.append("<disc_schem_billback_amt><![CDATA[" + invoiceDetBean.getDisc_schem_billback_amt()+ "]]></disc_schem_billback_amt>");
xmlBuff.append("<disc_schem_offinv_amt><![CDATA[" + invoiceDetBean.getDisc_schem_offinv_amt() + "]]></disc_schem_offinv_amt>"); xmlBuff.append("<disc_schem_offinv_amt><![CDATA[" + invoiceDetBean.getDisc_schem_offinv_amt() + "]]></disc_schem_offinv_amt>");
xmlBuff.append("<acc_code__item><![CDATA[" + invoiceDetBean.getAcc_code__item() + "]]></acc_code__item>"); xmlBuff.append("<acc_code__item><![CDATA[" + invoiceDetBean.getAcc_code__item() + "]]></acc_code__item>");
...@@ -769,8 +769,8 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -769,8 +769,8 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
xmlBuff.append("<rate__clg><![CDATA["+invoiceDetBean.getRate__clg()+"]]></rate__clg>"); xmlBuff.append("<rate__clg><![CDATA["+invoiceDetBean.getRate__clg()+"]]></rate__clg>");
xmlBuff.append("<fin_scheme><![CDATA["+invoiceDetBean.getFin_scheme()+"]]></fin_scheme>"); xmlBuff.append("<fin_scheme><![CDATA["+invoiceDetBean.getFin_scheme()+"]]></fin_scheme>");
xmlBuff.append("<cust_item__ref><![CDATA["+invoiceDetBean.getCust_item__ref()+"]]></cust_item__ref>"); xmlBuff.append("<cust_item__ref><![CDATA["+invoiceDetBean.getCust_item__ref()+"]]></cust_item__ref>");
xmlBuff.append("<tax_amt><![CDATA[]]></tax_amt>"); //tax_amt missing xmlBuff.append("<tax_amt><![CDATA[0]]></tax_amt>"); //tax_amt missing
xmlBuff.append("<net_amt><![CDATA[]]></net_amt>"); //net_amt missing xmlBuff.append("<net_amt><![CDATA[0]]></net_amt>"); //net_amt missing
xmlBuff.append("<chg_date><![CDATA["+sysDate+"]]></chg_date>"); xmlBuff.append("<chg_date><![CDATA["+sysDate+"]]></chg_date>");
xmlBuff.append("<chg_user><![CDATA["+userId+"]]></chg_user>"); xmlBuff.append("<chg_user><![CDATA["+userId+"]]></chg_user>");
xmlBuff.append("<chg_term><![CDATA["+termId+"]]></chg_term>"); xmlBuff.append("<chg_term><![CDATA["+termId+"]]></chg_term>");
...@@ -807,6 +807,43 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -807,6 +807,43 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
tranId = arrayForTranIdIssue[1].substring(0, endIndexIssue); tranId = arrayForTranIdIssue[1].substring(0, endIndexIssue);
System.out.println("@V@ Tran id :- [" + tranId + "]"); System.out.println("@V@ Tran id :- [" + tranId + "]");
sql="update invdet set net_amt=(quantity__stduom*rate__stduom)- ( case when disc_amt is null then 0 else disc_amt end ) +tax_amt where invoice_id=?";
//sql="update invdet set net_amt=(quantity__stduom*rate__stduom)-disc_amt+tax_amt where invoice_id=?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,tranId);
pstmt.executeUpdate();
pstmt.close();
pstmt=null;
sql="select sum(net_amt),sum(tax_amt),sum(comm_amt),sum(disc_amt) from invdet where invoice_id=?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs=pstmt.executeQuery();
if(rs.next())
{
netAmt=rs.getDouble(1);
taxAmt=rs.getDouble(2);
commAmt=rs.getDouble(3);
discAmt=rs.getDouble(4);
}
rs.close();
rs=null;
pstmt.close();
pstmt=null;
sql="update invoice set net_amt=?,tax_amt=?,comm_amt=?,disc_amt=?,inv_amt=? where invoice_id=?";
pstmt=conn.prepareStatement(sql);
pstmt.setDouble(1,netAmt);
pstmt.setDouble(2,taxAmt);
pstmt.setDouble(3,commAmt);
pstmt.setDouble(4,discAmt);
pstmt.setDouble(5,netAmt-taxAmt);
pstmt.setString(6,tranId);
pstmt.executeUpdate();
pstmt.close();
pstmt=null;
netAmt=0;
taxAmt=0;
commAmt=0;
discAmt=0;
fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes()); fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes());
/** /**
...@@ -820,7 +857,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB ...@@ -820,7 +857,7 @@ public class PostOrdInvoiceGen extends ActionHandlerEJB
// pstmt=null; // pstmt=null;
String sordNo="",soLineNo="",taxClass="",taxChap="",taxEnv=""; String sordNo="",soLineNo="",taxClass="",taxChap="",taxEnv="";
double taxAmt=0,netAmt=0; //double taxAmt=0,netAmt=0;
double totTaxAmt=0,totNetAmt=0; double totTaxAmt=0,totNetAmt=0;
fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes()); fos1.write(("Invoice successful for Dispatch id :- ["+despIdKey+"] TranId generated is:- [" + tranId +"]\n END \r\n\n").getBytes());
......
webitm-dis/ibase/webitm/ejb/dis/PostOrderProcess.java
View file @ a9d9f0c3
...@@ -8,6 +8,7 @@ import ibase.webitm.ejb.ITMDBAccessEJB; ...@@ -8,6 +8,7 @@ import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ProcessEJB; import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.ejb.fin.InvAcct; import ibase.webitm.ejb.fin.InvAcct;
import ibase.webitm.ejb.sys.UtilMethods; import ibase.webitm.ejb.sys.UtilMethods;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator; import ibase.webitm.utility.TransIDGenerator;
...@@ -33,6 +34,7 @@ import javax.naming.InitialContext; ...@@ -33,6 +34,7 @@ import javax.naming.InitialContext;
import org.w3c.dom.Document; import org.w3c.dom.Document;
//import ibase.utility.CommunicationComp; //import ibase.utility.CommunicationComp;
import org.w3c.dom.NodeList;
@Stateless @Stateless
public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLocal,PostOrderProcessRemote public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLocal,PostOrderProcessRemote
...@@ -52,6 +54,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -52,6 +54,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
String err = ""; String err = "";
boolean postLogYn=false; boolean postLogYn=false;
//Connection conn = null; //Connection conn = null;
public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException
{ {
Document detailDom = null; Document detailDom = null;
...@@ -654,12 +658,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -654,12 +658,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
despatchConfirm = (DespatchConfirmLocal) ctx.lookup("ibase/DespatchConfirm/local"); despatchConfirm = (DespatchConfirmLocal) ctx.lookup("ibase/DespatchConfirm/local");
System.out.println("-----------despatchConfirm------- " + despatchConfirm); System.out.println("-----------despatchConfirm------- " + despatchConfirm);
String forcedFlag="N"; String forcedFlag="N";
errStringConf=despatchConfirm.confirm(tranIdDespatch, xtraParams, forcedFlag,conn); errString=despatchConfirm.confirm(tranIdDespatch, xtraParams, forcedFlag,conn);
System.out.println("errCode in despatch confirmation===="+errStringConf); System.out.println("errCode in despatch confirmation===="+errString);
} }
} }
} }
if( errString.contains("CONFSUCC")|| errString.contains("VTPOSTDES") ) if(errString == null || errString.trim().length()==0 || "".equalsIgnoreCase(errString) || errString.contains("CONFSUCC")|| errString.contains("VTPOSTDES") )
{ {
errString = ""; errString = "";
} }
...@@ -726,7 +730,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -726,7 +730,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
PreparedStatement pstmt=null; PreparedStatement pstmt=null;
ResultSet rs=null; ResultSet rs=null;
String applyTime="I",crPolicy="",lsStatus=""; String applyTime="I",crPolicy="",lsStatus="";
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
String autoInvOnDesp = dis.getDisparams("999999", "AUTO_INV_ON_DESPATCH", conn); String autoInvOnDesp = dis.getDisparams("999999", "AUTO_INV_ON_DESPATCH", conn);
if("Y".equalsIgnoreCase(autoInvOnDesp)) if("Y".equalsIgnoreCase(autoInvOnDesp))
...@@ -791,7 +795,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -791,7 +795,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
System.out.println("invoiceId=====["+invoiceId+"]"); System.out.println("invoiceId=====["+invoiceId+"]");
String itemSer=""; String itemSer="";
double netAmt=0; double netAmt=0,lc_check_amt=0;
sql = " select item_ser,net_amt from invoice where invoice_id = ? "; sql = " select item_ser,net_amt from invoice where invoice_id = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -819,14 +823,47 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -819,14 +823,47 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
System.out.println("@@@@@@@@@@ paramMap["+paramMap+"]"); System.out.println("@@@@@@@@@@ paramMap["+paramMap+"]");
PostOrdCreditChk postOrdCreditChk = new PostOrdCreditChk(); PostOrdCreditChk postOrdCreditChk = new PostOrdCreditChk();
errString = postOrdCreditChk.CreditCheck(paramMap, conn); //errString = postOrdCreditChk.CreditCheck(paramMap, conn);
ArrayList<String> errStringList = new ArrayList<String>();
errStringList = postOrdCreditChk.CreditCheck(paramMap, conn);
System.out.println("@@@@@@@@@@@ errStringList size["+errStringList.size()+"]");
if( errStringList.size() > 0 )
{
conn.rollback();
int retCtr = writeBusinessLogicCheck( errStringList,siteCodeShip,applyTime,conn );
System.out.println("@@@@@@@@@ insert retCtr["+retCtr+"]errStringList.size()["+errStringList.size()+"]");
if( retCtr > 0 )
{
System.out.println("@@@@@@@@@ errorlist and inserted record missmatch........");
conn.commit();
}
//errString = "VTWBLGCCHK";
errString = itmDBAccessEJB.getErrorString("", "VTWBLGCCHK", "","", conn);
System.out.println("@@@@@@@@@@ writeBusinessLogicCheck errString["+errString+"]");
}
System.out.println("@@@@@@@@@2 postOrdCreditChk errString["+errString+"]"); System.out.println("@@@@@@@@@2 postOrdCreditChk errString["+errString+"]");
if( errString == null || errString.trim().length() == 0 ) if( errString == null || errString.trim().length() == 0 )
{ {
ArrayList<String> retArrayList = new ArrayList<String>();
// i_nvo_sales.gbf_credit_check_update(ls_sale_order,ls_cr_policy,mnet_amt,'S',lc_check_amt,'C',ls_status) //Added Ruchira 29/08/2k6, to pass invoice amt. // i_nvo_sales.gbf_credit_check_update(ls_sale_order,ls_cr_policy,mnet_amt,'S',lc_check_amt,'C',ls_status) //Added Ruchira 29/08/2k6, to pass invoice amt.
postOrdCreditChk.credit_check_update(fromSaleOrder, crPolicy, netAmt, "S", netAmt, "C", lsStatus, conn); retArrayList = postOrdCreditChk.credit_check_update(fromSaleOrder, crPolicy, netAmt, "S", lc_check_amt, "C", lsStatus, conn);
// added on 19/04/16 for status and amount
System.out.println("@@@@@@@@@ retArrayList.size()["+ retArrayList.size()+"]");
if( retArrayList.size() > 0)
{
lsStatus = retArrayList.get(0);
}
if( retArrayList.size() > 1)
{
netAmt = Double.parseDouble(retArrayList.get(1)==null?"0":retArrayList.get(1));
}
System.out.println("@@@@@ crPolicy["+crPolicy+"]lc_check_amt["+lc_check_amt+"]lsStatus["+lsStatus+"]");
System.out.println("@@@@@@@@@@@@ postOrdCreditChk()...........finish........."); System.out.println("@@@@@@@@@@@@ postOrdCreditChk()...........finish.........");
System.out.println("@@@@@@@@@@@@ InvoiceDrcrAdj()...........calling.........."); System.out.println("@@@@@@@@@@@@ InvoiceDrcrAdj()...........calling..........");
...@@ -918,6 +955,214 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -918,6 +955,214 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
private int writeBusinessLogicCheck(ArrayList<String> errStringList, String siteCode,String applyTime, Connection conn) throws SQLException, ITMException
{
PreparedStatement pstmt = null;
String sql = "",tranId="";
int cnt = 0,cnt2=0;
ResultSet rs = null;
String lsCrPolicy= "",asDespId="",asSorder="", lsStr="";
System.out.println("@@@@@@@@@@ errStringList["+errStringList.size()+"]");
for( int i = 0 ; i < errStringList.size(); i++)
{
lsCrPolicy= "";asDespId="";asSorder=""; lsStr="";
cnt2=0;
String str = errStringList.get(i).toString();
System.out.println("@@@@@@@ i["+i+"]str["+str+"]");
String strArray[]=str.split("\t");
System.out.println("@@@@@ strArray.length["+strArray.length+"]");
for(int j=0;j<strArray.length;j++)
{
if( strArray.length > 0 )
{
lsCrPolicy=strArray[0];
}
if( strArray.length > 1 )
{
asDespId=strArray[1];
}
if( strArray.length > 2 )
{
asSorder=strArray[2];
}
if( strArray.length > 4 )
{
lsStr=strArray[4];
}
}
System.out.println("@@@@@@@@["+lsCrPolicy+"]["+asDespId+"]["+asSorder+"]["+lsStr+"]");
sql = "select count(1) from BUSINESS_LOGIC_CHECK where " +
" tran_type = ? and sale_order = ? and cr_policy = ? and aprv_stat = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,applyTime);
pstmt.setString(2,asSorder);
pstmt.setString(3,lsCrPolicy);
pstmt.setString(4,"O");
rs = pstmt.executeQuery();
if (rs.next())
{
cnt2 = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("@@@@@@@@@@@@ BUSINESS_LOGIC_CHECK cnt2["+cnt2+"]");
if( cnt2 == 0 )
{
tranId = generateTranId( "T_CRCHKTRACE",siteCode, conn );
if( tranId == null || tranId.trim().length() == 0 )
{
tranId = generateTranId( "GENERAL",siteCode, conn );
}
System.out.println("@@@@@@@@@@ tranId["+tranId+"]");
sql = " insert into BUSINESS_LOGIC_CHECK (" +
" TRAN_ID, TRAN_TYPE, SALE_ORDER, CR_POLICY, DESCR, APRV_STAT" +
// " , APRV_DATE, EMP_CODE__APRV" +
", APRV_AMT, USED_AMT " +
// " , LINE_NO, OS_AMT__CUST, OS_AMT__CONT, REMARKS, AMD_NO " +
" )" +
" values (?,?,?,?,?,?,?,?" +
// " ,?,?,?," +
// " ?,?,?,?,?" +
" ) ";
pstmt = conn.prepareStatement(sql);
//TRAN_ID NOT NULL CHAR(10)
pstmt.setString(1,tranId);
//TRAN_TYPE NOT NULL CHAR(1)
pstmt.setString(2,applyTime);
//SALE_ORDER NOT NULL CHAR(10)
pstmt.setString(3,asSorder);
//CR_POLICY CHAR(3)
pstmt.setString(4,lsCrPolicy);
//DESCR VARCHAR2(500)
pstmt.setString(5,lsStr);
//APRV_STAT CHAR(1)
pstmt.setString(6,"O");
//APRV_AMT NUMBER(14,3)
pstmt.setDouble(7,0);
//USED_AMT NUMBER(14,3)
pstmt.setDouble(8,0);
/* //APRV_DATE DATE
pstmt.setString(7,tranId);
//EMP_CODE__APRV CHAR(10)
pstmt.setString(8,tranId);
//LINE_NO CHAR(3)
pstmt.setString(11,tranId);
//OS_AMT__CUST NUMBER(14,3)
pstmt.setString(12,tranId);
//OS_AMT__CONT NUMBER(14,3)
pstmt.setString(13,tranId);
//REMARKS VARCHAR2(120)
pstmt.setString(14,tranId);
//AMD_NO
pstmt.setString(15,tranId);*/
pstmt.executeUpdate();
pstmt.close();
pstmt = null;
cnt++;
}
}
System.out.println("@@@@@@@@@ insert cnt["+cnt+"]");
return cnt;
}
private String generateTranId( String windowName, String siteCode, Connection conn ) throws ITMException
{
PreparedStatement pstmt = null;
ResultSet rs = null;
String selSql = "";
String tranId = "";
String tranSer = "";
String keyString = "";
String keyCol = "";
String xmlValues = "";
java.sql.Timestamp currDate = null;
GenericUtility genericUtility = GenericUtility.getInstance();
try
{
SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
currDate = new java.sql.Timestamp(System.currentTimeMillis());
String currDateStr = sdfAppl.format(currDate);
selSql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
pstmt = conn.prepareStatement(selSql);
pstmt.setString( 1, windowName );
rs = pstmt.executeQuery();
if (rs.next())
{
keyString = rs.getString("KEY_STRING");
keyCol = rs.getString("TRAN_ID_COL");
tranSer = rs.getString("REF_SER");
}
rs.close();rs = null;
pstmt.close();pstmt = null;
System.out.println("keyString :"+keyString);
System.out.println("keyCol :"+keyCol);
System.out.println("tranSer :"+tranSer);
xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<tran_id></tran_id>";
xmlValues = xmlValues + "<site_code>" + siteCode + "</site_code>";
xmlValues = xmlValues + "<tran_date>" + currDateStr + "</tran_date>";
xmlValues = xmlValues + "</Detail1></Root>";
System.out.println("xmlValues :["+xmlValues+"]");
TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
tranId = tg.generateTranSeqID(tranSer, keyCol, keyString, conn);
System.out.println("tranId :"+tranId);
}
catch (SQLException ex)
{
System.out.println("Exception ::" +selSql+ ex.getMessage() + ":");
ex.printStackTrace();
throw new ITMException(ex);
}
catch (Exception e)
{
System.out.println("Exception ::" + e.getMessage() + ":");
e.printStackTrace();
throw new ITMException(e);
}
finally
{
try
{
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch(Exception e){}
}
return tranId;
}
private String postOrder(String fromSaleOrder, String toSaleOrder,String custCodeFrom, String custCodeTo, Timestamp fromDate,Timestamp toDate, String lotSldom, String siteCodeShip, String xtraParams, private String postOrder(String fromSaleOrder, String toSaleOrder,String custCodeFrom, String custCodeTo, Timestamp fromDate,Timestamp toDate, String lotSldom, String siteCodeShip, String xtraParams,
Connection conn) throws ITMException, IOException Connection conn) throws ITMException, IOException
{ {
......
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