Skip to content

B
business-java
Commit 8b79a20e authored by rtiwari's avatar rtiwari
Browse files
Options

UPDATED 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94214 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 611cb483
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 17 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/ChargeBackFormAccept.java
View file @ 8b79a20e
...@@ -123,13 +123,34 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack ...@@ -123,13 +123,34 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
errString = itmDBAccessEJB.getErrorString("","VTACCALR ","","",conn); errString = itmDBAccessEJB.getErrorString("","VTACCALR ","","",conn);
return errString; return errString;
} }
sql = " select count(*) from charge_back_form where tran_id = ? and VERIFY_FLAG IN('R') ";
pStmt = conn.prepareStatement(sql);
pStmt.setString(1, tranId.trim());
rs = pStmt.executeQuery();
if(rs.next())
{
cnf = rs.getInt(1);
}if(rs != null)
rs.close();
rs = null;
if(pStmt != null)
pStmt.close();
pStmt=null;
if(cnf > 0)
{
errString = itmDBAccessEJB.getErrorString("","VTREJ2 ","","",conn);
return errString;
}
String chbtranID = generateTranId("w_charge_back",loginSite,conn );System.out.println(" charge_back_tran_id ::"+chbtranID); String chbtranID = generateTranId("w_charge_back",loginSite,conn );System.out.println(" charge_back_tran_id ::"+chbtranID);
sql = " SELECT TRAN_DATE,CUST_CODE__CREDIT,TRAN_TYPE,REMARKS ,PRISE_LIST ,CURR_CODE ,EXCH_RATE,AMOUNT ,NET_AMT,NET_AMT__BC,"+ sql = " SELECT TRAN_DATE,CUST_CODE__CREDIT,TRAN_TYPE,REMARKS ,PRISE_LIST ,CURR_CODE ,EXCH_RATE,AMOUNT ,NET_AMT,NET_AMT__BC,"+
" EMP_CODE__APRV ,CHG_DATE ,CHG_USER,CHG_TERM ,TRAN_ID__CRN,EFF_DATE ,TAX_AMT,PORDER_NO ,PORDER_DATE ,VENDOR_NO ,"+ " EMP_CODE__APRV ,CHG_DATE ,CHG_USER,CHG_TERM ,TRAN_ID__CRN,EFF_DATE ,TAX_AMT,PORDER_NO ,PORDER_DATE ,VENDOR_NO ,"+
" INT_VENDOR_NO ,CUST_NAME_BAT ,CUST_PNAME_BAT ,TEST_PROD ,CUST_CODE__SHIP ,CUST_NAME__SHIP ,CUST_CODE__END,CUST_NAME,CONTRACT_NO ,"+ " INT_VENDOR_NO ,CUST_NAME_BAT ,CUST_PNAME_BAT ,TEST_PROD ,CUST_CODE__SHIP ,CUST_NAME__SHIP ,CUST_CODE__END,CUST_NAME,CONTRACT_NO ,"+
" PRICE_LIST,CUST_CODE_DLV,SITE_CODE__LOG,CLAUM_AMT ,ITEM_SER,PARENT__TRAN_ID ,REV__TRAN ,SPEC_REASON ,DIRECT_INV ,"+ " PRICE_LIST,CUST_CODE_DLV,SITE_CODE__LOG,CLAUM_AMT ,ITEM_SER,PARENT__TRAN_ID ,REV__TRAN ,SPEC_REASON ,DIRECT_INV ,"+
" SALE_PERIOD ,SITE_CODE__CR ,DISCOUNT_INV ,EMP_CODE "+ " SALE_PERIOD ,SITE_CODE__CR ,DISCOUNT_INV ,EMP_CODE "+
" FROM CHARGE_BACK_FORM WHERE TRAN_ID = ? and VERIFY_FLAG= 'Y' AND CONFIRMED NOT IN ('Y') "; " FROM CHARGE_BACK_FORM WHERE TRAN_ID = ? and VERIFY_FLAG IN( 'Y','P') AND CONFIRMED NOT IN ('Y')" +
" AND length(error_code) = 0 or error_code is null ";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, tranId.trim()); pStmt.setString(1, tranId.trim());
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
...@@ -137,7 +158,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack ...@@ -137,7 +158,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
{ {
sql = " INSERT INTO CHARGE_BACK( TRAN_DATE,CUST_CODE__CREDIT,TRAN_TYPE,REMARKS ,PRISE_LIST ,CURR_CODE ,EXCH_RATE,AMOUNT ,NET_AMT,NET_AMT__BC,"+ sql = " INSERT INTO CHARGE_BACK( TRAN_DATE,CUST_CODE__CREDIT,TRAN_TYPE,REMARKS ,PRISE_LIST ,CURR_CODE ,EXCH_RATE,AMOUNT ,NET_AMT,NET_AMT__BC,"+
" EMP_CODE__APRV ,CHG_DATE ,CHG_USER,CHG_TERM ,TRAN_ID__CRN,EFF_DATE ,TAX_AMT,PORDER_NO ,PORDER_DATE ,VENDOR_NO ,"+ " EMP_CODE__APRV ,CHG_DATE ,CHG_USER,CHG_TERM ,TRAN_ID__CRN,EFF_DATE ,TAX_AMT,PORDER_NO ,PORDER_DATE ,VENDOR_NO ,"+
" INT_VENDOR_NO ,CUST_NAME_BAT ,CUST_PNAME_BAT ,TEST_PROD ,CUST_CODE__SHIP ,CUST_NAME__SHIP ,CUST_CODE__END,CUST_NAME,CONTRACT_NO ,"+ " INT_VENDOR_NO ,CUST_NAME_BAT ,CUST_PNAME_BAT ,TEST_PROD ,CUST_CODE__SHIP ,CUST_NAME__SHIP ,CUST_CODE__END,CUST_NAME,CONTRACT_NO ,"+
" PRICE_LIST,CUST_CODE_DLV,SITE_CODE__LOG,CLAUM_AMT ,ITEM_SER,PARENT__TRAN_ID ,REV__TRAN ,SPEC_REASON ,DIRECT_INV ,"+ " PRICE_LIST,CUST_CODE_DLV,SITE_CODE__LOG,CLAUM_AMT ,ITEM_SER,PARENT__TRAN_ID ,REV__TRAN ,SPEC_REASON ,DIRECT_INV ,"+
" SALE_PERIOD ,SITE_CODE__CR ,DISCOUNT_INV ,EMP_CODE,TRAN_ID ) "+ " SALE_PERIOD ,SITE_CODE__CR ,DISCOUNT_INV ,EMP_CODE,TRAN_ID ) "+
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
...@@ -201,14 +222,14 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack ...@@ -201,14 +222,14 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
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 FROM CHARGE_BACK_FORM_DET WHERE TRAN_ID IN(SELECT TRAN_ID FROM CHARGE_BACK_FORM WHERE TRAN_ID = ? AND VERIFY_FLAG = 'Y' AND CONFIRMED NOT IN ('Y')) " + " CONF_CLAIMED ,SALE_QTY ,SALE_RET_QTY 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 CONFIRMED NOT IN ('Y')) " +
" AND length(error_code) = 0 or error_code is null"; " AND (length(error_code) = 0 or error_code is null) ";
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, tranId.trim()); pStmt.setString(1, tranId.trim());
rs = pStmt.executeQuery(); rs = pStmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
lineNo ++; lineNo ++;System.out.println(" LINInO ::"+lineNo);
sql = " INSERT INTO CHARGE_BACK_DET(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 = " INSERT INTO CHARGE_BACK_DET(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 ,"+
...@@ -335,7 +356,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack ...@@ -335,7 +356,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
try try
{ {
//if(errString.indexOf("VTREJCHB")>-1 || errString.indexOf("PROCSUCC")>-1) //if(errString.indexOf("VTREJCHB")>-1 || errString.indexOf("PROCSUCC")>-1)
if(errString.indexOf("PROCSUCC")>-1) if(errString.indexOf("VTACCSUCC")>-1)
{ {
conn.commit(); conn.commit();
} }
......
webitm-dis/ibase/webitm/ejb/dis/adv/ChargeBackFormVerify.java
View file @ 8b79a20e
...@@ -59,6 +59,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -59,6 +59,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
double saleqty=0.0,saleretqty=0.0,unconfclaimed=0.0,confclaimed=0.0,rateContr=0.0; double saleqty=0.0,saleretqty=0.0,unconfclaimed=0.0,confclaimed=0.0,rateContr=0.0;
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;
String siteCode="",custCode="",tranDatestr="",tranType="",verifyFlag=""; String siteCode="",custCode="",tranDatestr="",tranType="",verifyFlag="";
String custCodeCredit = "",loginSite; String custCodeCredit = "",loginSite;
Connection conn = null; Connection conn = null;
...@@ -77,7 +78,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -77,7 +78,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
StringBuffer errCodeDet = null; StringBuffer errCodeDet = null;
StringBuffer errMsgHed = new StringBuffer(""); StringBuffer errMsgHed = new StringBuffer("");
StringBuffer errMsgDet = new StringBuffer(""); StringBuffer errMsgDet = new StringBuffer("");
boolean errorflag = false,flagVerified = false;
String errCodeString = ""; String errCodeString = "";
ArrayList list = new ArrayList(); ArrayList list = new ArrayList();
boolean rejectedFlag = false; boolean rejectedFlag = false;
...@@ -413,6 +414,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -413,6 +414,7 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
rs1 = pStmt1.executeQuery(); rs1 = pStmt1.executeQuery();
while(rs1.next()) while(rs1.next())
{ {
rowcount ++;
errCodeDet = new StringBuffer(""); errCodeDet = new StringBuffer("");
itemCode = rs1.getString("item_code"); itemCode = rs1.getString("item_code");
lotNo = rs1.getString("lot_no"); lotNo = rs1.getString("lot_no");
...@@ -676,7 +678,11 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -676,7 +678,11 @@ 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 ++;
errorflag = true;
errCodeString = errCodeString.substring(0,errCodeString.length()-1); errCodeString = errCodeString.substring(0,errCodeString.length()-1);
}
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);
...@@ -697,6 +703,18 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -697,6 +703,18 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
pStmt.close(); pStmt.close();
pStmt = null; pStmt = null;
System.out.println(" detail updated ::"+detupd); System.out.println(" detail updated ::"+detupd);
// if(errCodeString.trim().length() > 0)
// {
// sql= " update charge_back_form_det set VERIFY_FLAG = 'R' where tran_id = ? and line_no = ? ";
// pStmt = conn.prepareStatement(sql);
// pStmt.setString(1, tranId.trim());
// pStmt.setInt(2, Integer.parseInt(rs1.getString("line_no")));
// pStmt.executeUpdate();
// pStmt.close();
// pStmt = null;
// conn.commit();
// System.out.println("detail updated 2::"+detupd);
// }
//} //}
} }
rs1.close(); rs1.close();
...@@ -712,26 +730,32 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack ...@@ -712,26 +730,32 @@ public class ChargeBackFormVerify extends ActionHandlerEJB implements ChargeBack
if(errMsgHedString != null && errMsgHedString.trim().length() > 0) if(errMsgHedString != null && errMsgHedString.trim().length() > 0)
errMsgHedString = errMsgHedString.substring(0,errMsgHedString.length()-1); errMsgHedString = errMsgHedString.substring(0,errMsgHedString.length()-1);
// if(errCodeHedString.trim().length()>0 || errCodeString.trim().length() > 0) if(errCodeHedString.trim().length() > 0)// && (rowcount == errorCount))
if(errCodeHedString.trim().length()>0 )
{ {
if(errCodeHedString.length() > 4000) if(errCodeHedString.length() > 4000)
errCodeHedString = errCodeHedString.substring(0,4000); errCodeHedString = errCodeHedString.substring(0,4000);
// rejectedFlag = true;
sql= " update charge_back_form set verify_flag = 'R', error_code = ? , error_msg = ? where tran_id = ? "; sql= " update charge_back_form set verify_flag = 'R', error_code = ? , error_msg = ? where tran_id = ? ";
//errString = "rejected";
// list.add(tranId);
// list.add(custCode);
// elements ++;
errString = itmDBAccessEJB.getErrorString("","VTREJCHB1 ","","",conn); errString = itmDBAccessEJB.getErrorString("","VTREJCHB1 ","","",conn);
} }
else else
{ {
sql= " update charge_back_form set verify_flag = 'Y' , error_code = ?, error_msg = ? where tran_id = ? "; if(errorflag == true)
// errString= "success";
errString = itmDBAccessEJB.getErrorString("","VTCHBSUC ","","",conn); {
System.out.println(" ERROR FOUND IN DETAIL");
sql= " update charge_back_form set verify_flag = 'P', error_code = ? , error_msg = ? where tran_id = ? ";
errString = itmDBAccessEJB.getErrorString("","VTPARVFY","","",conn);
}
else
{
sql= " update charge_back_form set verify_flag = 'Y' , error_code = ?, error_msg = ? where tran_id = ? ";
// errString= "success";
errString = itmDBAccessEJB.getErrorString("","VTCHBSUC ","","",conn);
}
} }
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