Skip to content

B
business-java
Commit 0a0fb02f authored by smane's avatar smane
Browse files
Options

Update ChargeBackFormAccept.java for changes made in verification for force_verfy flag 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95307 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c52c94a0
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 13 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/ChargeBackFormAccept.java
View file @ 0a0fb02f
...@@ -228,12 +228,12 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack ...@@ -228,12 +228,12 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
rs = null; rs = null;
if(pStmt != null) if(pStmt != null)
pStmt.close(); pStmt.close();
pStmt=null; pStmt=null; //Sql changes made by sagar on 13/06/14
sql = " SELECT LINE_NO,CONTRACT_NO ,LINE_NO__CONTR ,CUST_CODE__END ,QUANTITY ,LOT_NO ,RATE__SELL ,RATE__CONTR,RATE__DIFF,AMOUNT,TAX_AMT ,TAX_CLASS,TAX_CHAP ,"+ sql = " SELECT LINE_NO,CONTRACT_NO ,LINE_NO__CONTR ,CUST_CODE__END ,QUANTITY ,LOT_NO ,RATE__SELL ,RATE__CONTR,RATE__DIFF,AMOUNT,TAX_AMT ,TAX_CLASS,TAX_CHAP ,"+
" TAX_ENV,INVOICE_ID,ITEM_SER,DISCOUNT_PER ,DISCOUNT_AMT ,PORDER_NO,PORDER_DATE , BUYERS_PROD_CODE ,DISC_AMT ,CUST_GRP ,ITEM_REF, NET_AMT ,TRAN_ID__CRN ,"+ " TAX_ENV,INVOICE_ID,ITEM_SER,DISCOUNT_PER ,DISCOUNT_AMT ,PORDER_NO,PORDER_DATE , BUYERS_PROD_CODE ,DISC_AMT ,CUST_GRP ,ITEM_REF, NET_AMT ,TRAN_ID__CRN ,"+
" ERROR_MSG,PRICELIST_RATE,CONTRACT_RATE ,ERROR_CODE ,ITEM_CODE__NDC,UNCONF_CLAIMED,DISCOUNT_PER_UNIT ,"+ " ERROR_MSG,PRICELIST_RATE,CONTRACT_RATE ,ERROR_CODE ,ITEM_CODE__NDC,UNCONF_CLAIMED,DISCOUNT_PER_UNIT ,"+
" CONF_CLAIMED ,SALE_QTY ,SALE_RET_QTY,ITEM_CODE FROM CHARGE_BACK_FORM_DET WHERE TRAN_ID IN(SELECT TRAN_ID FROM CHARGE_BACK_FORM WHERE TRAN_ID = ? AND VERIFY_FLAG IN ( 'Y','P')) " + " CONF_CLAIMED ,SALE_QTY ,SALE_RET_QTY,ITEM_CODE FROM CHARGE_BACK_FORM_DET WHERE TRAN_ID IN(SELECT TRAN_ID FROM CHARGE_BACK_FORM WHERE TRAN_ID = ? AND VERIFY_FLAG IN ( 'Y','P')) " +
" AND (length(error_code) = 0 or error_code is null) "; " AND VERIFY_FLAG='Y' ";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, tranId.trim()); pStmt.setString(1, tranId.trim());
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
......
webitm-dis/ibase/webitm/ejb/dis/adv/ChargeBackFormVerify.java
View file @ 0a0fb02f
...@@ -60,7 +60,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -60,7 +60,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
String itemCode="",lotNo="",porderNo="",porderDate= "",itemSer= ""; String itemCode="",lotNo="",porderNo="",porderDate= "",itemSer= "";
String errString = null,sql=""; String errString = null,sql="";
int rowcount = 0,errorCount=0; int rowcount = 0,errorCount=0;
String siteCode="",custCode="",tranDatestr="",tranType="",verifyFlag=""; String siteCode="",custCode="",tranDatestr="",tranType="",verifyFlag="",verifyFlagDet="",forceVerifyDet="";
String custCodeCredit = "",loginSite; String custCodeCredit = "",loginSite;
Connection conn = null; Connection conn = null;
ConnDriver connDriver = null; ConnDriver connDriver = null;
...@@ -102,6 +102,8 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -102,6 +102,8 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
//parentNodeListLength = parentNodeList.getLength(); //parentNodeListLength = parentNodeList.getLength();
loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"); loginSite = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
rejectedFlag = false; rejectedFlag = false;
// System.out.println("parentNodeListLength------------------->"+parentNodeListLength); // System.out.println("parentNodeListLength------------------->"+parentNodeListLength);
sql = " select count(*) from charge_back_form where tran_id = ? and VERIFY_FLAG = 'Y'"; sql = " select count(*) from charge_back_form where tran_id = ? and VERIFY_FLAG = 'Y'";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
...@@ -122,6 +124,26 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -122,6 +124,26 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
return errString; return errString;
} }
//delete older error code and error messages from charge_back_form and charge_back_form_det added by sagar on 12/06/14 start..
System.out.println(">>>>>>>>>>>delete older entries from charge_back_form table");
sql ="update charge_back_form set error_msg = ?,error_code= ? where tran_id = ? ";
pStmt =conn.prepareStatement(sql);
pStmt.setString(1,null);
pStmt.setString(2,null);
pStmt.setString(3, tranId.trim());
pStmt.executeUpdate();
pStmt.close();
pStmt = null;
System.out.println(">>>>>>>>>delete older entries from charge_back_form_det table");
sql ="update charge_back_form_det set error_code = ? ,error_msg = ? where tran_id = ? " ;
pStmt =conn.prepareStatement(sql);
pStmt.setString(1,null);
pStmt.setString(2,null);
pStmt.setString(3, tranId.trim());
pStmt.executeUpdate();
pStmt.close();
pStmt = null;
//delete older error code and error messages from charge_back_form and charge_back_form_det added by sagar on 12/06/14 end..
sql = " select site_code ,cust_code , cust_code__credit,verify_flag ,tran_date,tran_type from charge_back_form where tran_id = ? "; sql = " select site_code ,cust_code , cust_code__credit,verify_flag ,tran_date,tran_type from charge_back_form where tran_id = ? ";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
...@@ -407,8 +429,12 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -407,8 +429,12 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
} }
sql = "select item_code,lot_no,porder_no,porder_date,item_ser,quantity,rate__contr, NET_AMT,RATE__SELL, " + //comment by sagar on 09/06/14
" sale_qty,sale_ret_qty,unconf_claimed,conf_claimed,line_no from charge_back_form_det where tran_id = ? "; //sql = "select item_code,lot_no,porder_no,porder_date,item_ser,quantity,rate__contr, NET_AMT,RATE__SELL, " +
// " sale_qty,sale_ret_qty,unconf_claimed,conf_claimed,line_no from charge_back_form_det where tran_id = ? ";
sql="SELECT item_code,lot_no,porder_no,porder_date,item_ser,quantity,rate__contr, NET_AMT,RATE__SELL,sale_qty,sale_ret_qty,unconf_claimed,conf_claimed,line_no," +
" CASE WHEN verify_flag IS NULL THEN 'N' ELSE verify_flag END verify_flag,CASE WHEN force_verify IS NULL THEN 'N' ELSE force_verify END force_verify " +
" FROM charge_back_form_det WHERE tran_id = ?";
pStmt1 = conn.prepareStatement(sql); pStmt1 = conn.prepareStatement(sql);
pStmt1.setString(1, tranId.trim()); pStmt1.setString(1, tranId.trim());
rs1 = pStmt1.executeQuery(); rs1 = pStmt1.executeQuery();
...@@ -430,6 +456,8 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -430,6 +456,8 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
confclaimed = rs1.getDouble("conf_claimed"); confclaimed = rs1.getDouble("conf_claimed");
netAmt = rs1.getDouble("NET_AMT"); netAmt = rs1.getDouble("NET_AMT");
rateSell = rs1.getDouble("RATE__SELL"); rateSell = rs1.getDouble("RATE__SELL");
verifyFlagDet=rs1.getString("verify_flag");
forceVerifyDet=rs1.getString("force_verify");
if(netAmt == 0) if(netAmt == 0)
{ {
...@@ -635,13 +663,20 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -635,13 +663,20 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
saleretqty = rs1.getDouble("sale_ret_qty"); saleretqty = rs1.getDouble("sale_ret_qty");
unconfclaimed = rs1.getDouble("unconf_claimed"); unconfclaimed = rs1.getDouble("unconf_claimed");
confclaimed = rs1.getDouble("conf_claimed"); confclaimed = rs1.getDouble("conf_claimed");
System.out.println(">>>>>qty:"+qty);
System.out.println(">>>>>saleqty:"+saleqty);
System.out.println(">>>>>saleretqty:"+saleretqty);
System.out.println(">>>>>unconfclaimed:"+unconfclaimed);
System.out.println(">>>>>confclaimed:"+confclaimed);
double test= saleqty - saleretqty-unconfclaimed - confclaimed;
System.out.println(">>>>>test:"+test);
if(qty > 0.0) if(qty > 0.0)
{ {
if (qty > (saleqty - saleretqty if (qty > (saleqty - saleretqty
- unconfclaimed - confclaimed)) - unconfclaimed - confclaimed))
{ {
errCodeDet.append("VTINVQUANT,"); errCodeDet.append("VTINVQUANT,");
System.out.println(">>>>>Added VTINVQUANT test:"+test);
sql = " SELECT MSG_DESCR FROM MESSAGES WHERE MSG_NO = 'VTINVQUANT' "; sql = " SELECT MSG_DESCR FROM MESSAGES WHERE MSG_NO = 'VTINVQUANT' ";
pstmtMsg = conn.prepareStatement(sql); pstmtMsg = conn.prepareStatement(sql);
rsMsg = pstmtMsg.executeQuery(); rsMsg = pstmtMsg.executeQuery();
...@@ -678,7 +713,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -678,7 +713,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
} }
errCodeString = errCodeDet.toString(); errCodeString = errCodeDet.toString();
if(errCodeString != null && errCodeString.trim().length() > 0) /*if(errCodeString != null && errCodeString.trim().length() > 0)
{ {
errorCount ++; errorCount ++;
errorflag = true; errorflag = true;
...@@ -686,7 +721,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -686,7 +721,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
}else }else
{ {
verifyDetailFlag = true; verifyDetailFlag = true;
} }*/
String errMsgDetString = errMsgDet.toString(); String errMsgDetString = errMsgDet.toString();
if(errMsgDetString != null && errMsgDetString.trim().length() > 0) if(errMsgDetString != null && errMsgDetString.trim().length() > 0)
errMsgDetString = errMsgDetString.substring(0,errMsgDetString.length()-1); errMsgDetString = errMsgDetString.substring(0,errMsgDetString.length()-1);
...@@ -695,18 +730,48 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -695,18 +730,48 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
System.out.println(" errCodeDet String ::"+errCodeString); System.out.println(" errCodeDet String ::"+errCodeString);
System.out.println(" errMsgDetString ::"+errMsgDetString); System.out.println(" errMsgDetString ::"+errMsgDetString);
//Condition added by sagar on 11/06/14 start
if(errCodeString != null && errCodeString.trim().length() > 0 && "Y".equalsIgnoreCase(forceVerifyDet))
{
System.out.println(">>>>>>>>errCodeString is not null and force Y :");
verifyFlagDet="Y";
verifyDetailFlag = true;
errCodeString = errCodeString.substring(0,errCodeString.length()-1);
}
else if(errCodeString != null && errCodeString.trim().length() > 0 && "N".equalsIgnoreCase(forceVerifyDet))
{
System.out.println(">>>>>>>>errCodeString is not null and force N :");
verifyFlagDet="N";
errorflag = true;
errCodeString = errCodeString.substring(0,errCodeString.length()-1);
}
else if(errCodeString.trim().length() <= 0 && "Y".equalsIgnoreCase(forceVerifyDet))
{
System.out.println(">>>>>>>>errCodeString is null and force Y :");
verifyFlagDet="N";
errorflag = true;
}
else
{
System.out.println(">>>>>>>>errCodeString is null");
verifyFlagDet="Y";
verifyDetailFlag = true;
}
//Condition added by sagar on 11/06/14 end..
// if(errCodeString.trim().length() > 0) // if(errCodeString.trim().length() > 0)
// { // {
sql= " update charge_back_form_det set error_code = ?,error_msg = ? where tran_id = ? and line_no = ? "; sql= " update charge_back_form_det set error_code = ?,error_msg = ?,verify_flag= ? where tran_id = ? and line_no = ? ";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, errCodeString.trim()); pStmt.setString(1, errCodeString.trim());
pStmt.setString(2, errMsgDetString.trim()); pStmt.setString(2, errMsgDetString.trim());
pStmt.setString(3, tranId.trim()); pStmt.setString(3, verifyFlagDet);
pStmt.setInt(4, Integer.parseInt(rs1.getString("line_no"))); pStmt.setString(4, tranId.trim());
pStmt.setInt(5, Integer.parseInt(rs1.getString("line_no")));
int detupd = pStmt.executeUpdate(); int detupd = pStmt.executeUpdate();
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
System.out.println(" detail updated ::"+detupd); System.out.println(">>>>>>>>charge_back_form_det updated ::"+detupd);
// if(errCodeString.trim().length() > 0) // if(errCodeString.trim().length() > 0)
// { // {
// sql= " update charge_back_form_det set VERIFY_FLAG = 'R' where tran_id = ? and line_no = ? "; // sql= " update charge_back_form_det set VERIFY_FLAG = 'R' where tran_id = ? and line_no = ? ";
...@@ -752,8 +817,9 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -752,8 +817,9 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
} }
else else
{ {
System.out.println(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Success All errorflag:"+errorflag);
sql= " update charge_back_form set verify_flag = 'Y' , error_code = ?, error_msg = ? where tran_id = ? "; sql= " update charge_back_form set verify_flag = 'Y' , error_code = ?, error_msg = ? where tran_id = ? ";
// errString= "success"; //errString= "success";
errString = itmDBAccessEJB.getErrorString("","VTCHBSUC ","","",conn); errString = itmDBAccessEJB.getErrorString("","VTCHBSUC ","","",conn);
} }
...@@ -772,6 +838,8 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -772,6 +838,8 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
} }
System.out.println(">>>>>>>>>>>>>>Before update errCodeHedString:"+errCodeHedString);
System.out.println(">>>>>>>>>>>>>>Before update errMsgHedString:"+errMsgHedString);
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, errCodeHedString.trim()); pStmt.setString(1, errCodeHedString.trim());
pStmt.setString(2, errMsgHedString.trim()); pStmt.setString(2, errMsgHedString.trim());
......
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