modify

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

webitm-dis/ibase/webitm/ejb/dis/InvoiceDrcrAdj.java

@@ -159,7 +159,7 @@ public String invoiceDrcrAdj(String siteCode, String invoiceId, String custCode,
 		}
 		netAmount = netAmt;
 		mDrAmt = netAmt;
-
+		System.out.println("@@@@@@@@162 mDrAmt["+mDrAmt+"]");
 		//09-01-02 Arif
 		sqlStr ="select key_String from transetup "
 		 + "where upper(tran_window) = 'W_REC_ADJ' " ;
@@ -286,9 +286,10 @@ System.out.println("@@@@@@@@264 drnNotIn["+drnNotIn+"]");
 				refNo= rs.getString("ref_no");
 				mTotAmt= rs.getDouble("tot_amt");
 				mAdjAmt= rs.getDouble("adj_amt");
-				
+				System.out.println("@@@@@@@@289 mDrAmt["+mDrAmt+"]");
 				mDiffAmt = mTotAmt - mAdjAmt;
 				mDrAmt = mDrAmt + mDiffAmt;
+				System.out.println("@@@@@@@@292 mDrAmt["+mDrAmt+"]");
 				xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
 				xmlValues = xmlValues + "<Header></Header>";
 				xmlValues = xmlValues + "<Detail1>";
@@ -527,10 +528,10 @@ System.out.println("@@@@@@@@335 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdIn
 				mTotAmt = rs.getDouble("tot_amt");
 				mAdjAmt = rs.getDouble("adj_amt");
 				
-				
+				System.out.println("@@@@@@@@530 mDrAmt["+mDrAmt+"]");
 				mDiffAmt = mTotAmt - mAdjAmt;
 				mDrAmt = mDrAmt + mDiffAmt;
-				
+				System.out.println("@@@@@@@@533 mDrAmt["+mDrAmt+"]");
 				xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
 				xmlValues = xmlValues + "<Header></Header>";
 				xmlValues = xmlValues + "<Detail1>";
@@ -767,10 +768,10 @@ System.out.println("@@@@@@@@335 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdIn
 				mRefNo = rs.getString("ref_no");
 				mTotAmt = rs.getDouble("tot_amt");
 				mAdjAmt = rs.getDouble("adj_amt");
-				
+				System.out.println("@@@@@@@@771 mDrAmt["+mDrAmt+"]");
 				mDiffAmt = mTotAmt - mAdjAmt;
 				mDrAmt = mDrAmt + mDiffAmt;
-				
+				System.out.println("@@@@@@@@773 mDrAmt["+mDrAmt+"]");
 				// 09-01-02 Arif (to get the tran id from nvo_keygen
 				xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
 				xmlValues = xmlValues + "<Header></Header>";
@@ -953,6 +954,7 @@ System.out.println("@@@@@@@@335 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdIn
 				mRefNo = rs.getString("ref_no");
 				mTotAmt = rs.getDouble("tot_amt");
 				mAdjAmt = rs.getDouble("adj_amt");
+				System.out.println("@@@@ mDrAmt["+mDrAmt+"]mTranId["+mTranId+"]mTranSer["+mTranSer+"]mRefNo["+mRefNo+"]mTotAmt["+mTotAmt+"]mAdjAmt["+mAdjAmt+"]");
 				if (mDrAmt == 0)
 				{
 					break;
@@ -998,8 +1000,10 @@ System.out.println("@@@@@@@@335 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdIn
 				pstmtInsert.setString(7,adjTranSer);
 				pstmtInsert.setString(8,adjRefNo);
 				pstmtInsert.setString(9,mTranId);
-				pstmtInsert.addBatch();
-				pstmtInsert.clearParameters();
+				
+				pstmtInsert.executeUpdate();
+				pstmtInsert.close();
+				pstmtInsert = null;
 			
 				mChkRec++;
 			}
@@ -1007,10 +1011,10 @@ System.out.println("@@@@@@@@335 adjDrCr["+adjDrCr+"]adjNewProdInv["+adjNewProdIn
 			rs = null;
 			pstmt.close();
 			pstmt = null;
-			pstmtInsert.executeBatch();
-			pstmtInsert.close();
+			//pstmtInsert.executeBatch();
+			//pstmtInsert.close();
 		}
-		
+		System.out.println("@@@@@@ mChkRec["+mChkRec+"]");
 		//**************************      
 		if (mChkRec > 0 )
 		{

webitm-dis/ibase/webitm/ejb/dis/PostOrdCreditChk.java

@@ -4041,8 +4041,8 @@ public class PostOrdCreditChk
 
 				
 			}
-			System.out.println("@@@ lsStatus["+lsStatus+"]ac_check_amt["+ac_check_amt+"]");
-			retArrayList.add(lsStatus);
+			System.out.println("@@@ as_status["+as_status+"]ac_check_amt["+ac_check_amt+"]");
+			retArrayList.add(as_status);
 			retArrayList.add(""+ac_check_amt);
 			
 			return retArrayList;

webitm-dis/ibase/webitm/ejb/dis/PostOrderProcess.java

@@ -782,7 +782,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 				//}
 				if( errString != null && errString.trim().length() > 0 && errString.contains("Success"))
 				{
-					errString = "";
+					
 					String[] arrayForTranId1 = errString.split("<TranID>");
 
 					System.out.println("Tran ID :::::in conf:::::::"+arrayForTranId1);
@@ -811,7 +811,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 					rs = null;
 					pstmt.close();
 					pstmt = null;
-
+					errString = "";
 					HashMap paramMap = new HashMap();
 					paramMap.put("as_cust_code_bil",fromCustCode);
 					paramMap.put("as_item_ser",itemSer);
@@ -848,10 +848,11 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 
 					if( errString == null || errString.trim().length() == 0 )
 					{
-						ArrayList<String> retArrayList = new ArrayList<String>();
+						// Commented by Manoj dtd 20/04/2016 not required
+						  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.
 						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)
@@ -863,7 +864,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 							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.........");