Request ID-D14LSUN002

Changes for po advance voucher creation with tax


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

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

@@ -823,48 +823,58 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal,
 							"");
 				}
 			}
+			System.out.println("RetString>>>>>>>>>>>>>>>>>>>" +retString );
 			if (retString == null || retString.trim().length() == 0) {
+				System.out.println("RetString>>>>>>>" +retString );
 				InvAcct invAcct = new InvAcct();
 				retString = invAcct.acctPoRcpt(tranId, conn);
+				System.out.println("RetString1>>>>>>>" +retString );
 				if (retString != null
 						&& "CREATE-VOUCHER".equals(retString.trim())) {
 					CreatePoRcpVoucher createVouc = new CreatePoRcpVoucher();
 					retString = createVouc.createPoRcpVoucher(tranId,
 							xtraParams, conn);
+					System.out.println("RetString2>>>>>>>" +retString );
+					
 				} else if (retString != null && retString.trim().length() > 0) {
 					retString = itmDBAccessLocal.getErrorString("", retString,
 							"");
+					System.out.println("RetString3>>>>>>>" +retString );
 				}
-			}
-			else if(( errcode == null || errcode.trim().length() == 0 ) && (err == null || err.trim().length() == 0 ) )
-			{
-				System.out.println("Voucher Created1");
-				sql="select count(1)  AS count1 from pord_pay_term where  purc_order = ? and  rel_agnst = '02'";
-				pstmtSql = conn.prepareStatement(sql);
+		
 			
-				pstmtSql.setString(1,purcOrder);
-				rs = pstmtSql.executeQuery();
-				if ( rs.next() )
+				else if(( errcode == null || errcode.trim().length() == 0 ) && (err == null || err.trim().length() == 0 ) &&(retString == null || retString.trim().length() == 0) )
 				{
-					 Cnt1 = rs.getLong("count1");
-				}
+					System.out.println("Voucher Created1");
+					sql="select count(1)  AS count1 from pord_pay_term where  purc_order = ? and  rel_agnst = '02'";
+					pstmtSql = conn.prepareStatement(sql);
 				
-			
-			
-			   if(Cnt1 >0)
-				{
-					CreatePoVoucherAdvance createVouc11 = new CreatePoVoucherAdvance();
-					System.out.println("Voucher Created2");
-					errcode =  createVouc11.createPoVoucherAdv( tranId, xtraParams,conn,"PR", 0,today );
-					//(String tranId,String xtraParams,Connection conn,String as_flag,double ad_advperc,Date day)
+					pstmtSql.setString(1,purcOrder);
+					rs = pstmtSql.executeQuery();
+					if ( rs.next() )
+					{
+						 Cnt1 = rs.getLong("count1");
+					}
 					
-				}
-				rs.close();
-				rs = null;
-				pstmtSql.close();
-				pstmtSql = null;
 				
+				
+				   if(Cnt1 >0)
+					{
+						CreatePoVoucherAdvance createVouc11 = new CreatePoVoucherAdvance();
+						System.out.println("Voucher Created2");
+						errcode =  createVouc11.createPoVoucherAdv( tranId, xtraParams,conn,"PR", 0,today );
+						//(String tranId,String xtraParams,Connection conn,String as_flag,double ad_advperc,Date day)
+						
+					}
+					rs.close();
+					rs = null;
+					pstmtSql.close();
+					pstmtSql = null;
+					
+				}
 			}
+			
+			
 			/*
 			 * // not required for Taro to be done later sql =
 			 * "SELECT SALE_ORDER FROM PORDER A, PORCP B WHERE A.PURC_ORDER = B.PURC_ORDER AND B.TRAN_ID = ? "