UPDATED

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94269 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/adv/ChargeBackFormAccept.java

@@ -54,7 +54,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 
 	private String chargeBackAccept(String tranId,String xtraParams,String forcedFlag) throws RemoteException,ITMException
 	{
-		System.out.println("chargeBackUpd () called........"+tranId);
+		System.out.println("chargeBackAccept (1) called........"+tranId);
 		double qty=0.0;
 		double saleqty=0.0,saleretqty=0.0,unconfclaimed=0.0,confclaimed=0.0;
 		String itemCode="",lotNo="",porderNo="",porderDate= "",itemSer= "",rateContr="";
@@ -230,7 +230,7 @@ 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 ,"+
 						" 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 ,"+
-						" 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')) " +
+						" 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) ";
 				pStmt = conn.prepareStatement(sql);
 				pStmt.setString(1, tranId.trim());
@@ -241,8 +241,8 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 					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    ,"+
 							" ERROR_MSG,PRICELIST_RATE,CONTRACT_RATE ,ERROR_CODE    ,ITEM_CODE__NDC,UNCONF_CLAIMED,DISCOUNT_PER_UNIT ,"+
-							" CONF_CLAIMED ,SALE_QTY ,SALE_RET_QTY,TRAN_ID) "+
-							" values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+							" CONF_CLAIMED ,SALE_QTY ,SALE_RET_QTY,TRAN_ID,ITEM_CODE) "+
+							" values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
 				
 					pStmt1 = conn.prepareStatement(sql);
 					pStmt1.setDouble(1,lineNo);
@@ -282,6 +282,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 					pStmt1.setDouble(35,rs.getDouble(35));
 					pStmt1.setDouble(36,rs.getDouble(36));	
 					pStmt1.setString(37,chbtranID);
+					pStmt1.setString(38,rs.getString(37));
 					chbDet = chbDet + pStmt1.executeUpdate();
 					if(pStmt1 != null)
 						pStmt1.close();