Changed by Manish on 28/04/16

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

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

@@ -828,6 +828,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 					ArrayList<String> errStringList = new ArrayList<String>(); 
 					errStringList = postOrdCreditChk.CreditCheck(paramMap, conn);
 					System.out.println("@@@@@@@@@@@ errStringList size["+errStringList.size()+"]");
+					
+					/*
 					if( errStringList.size() > 0 )
 					{
 						conn.rollback();
@@ -843,6 +845,58 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 						errString = itmDBAccessEJB.getErrorString("", "VTWBLGCCHK", "","", conn);
 						System.out.println("@@@@@@@@@@ writeBusinessLogicCheck errString["+errString+"]");
 					}
+					 */
+					
+					 
+				      if( errStringList.size() > 0 )
+					{
+						conn.rollback();
+
+						errString = writeBusinessLogicCheck( errStringList,siteCodeShip,applyTime,conn );
+
+						System.out.println("@@@@@@@@@ errString["+errString+"]");
+						if( errString != null && errString.trim().length() > 0 )
+						{
+							System.out.println("@@@@@@@@@ errorlist and inserted record missmatch........");
+							conn.commit();
+						}
+						//errString = "VTWBLGCCHK";
+
+						String descr="";
+
+						sql = " select descr from BUSINESS_LOGIC_CHECK where tran_id = ? ";
+						pstmt = conn.prepareStatement(sql);
+						pstmt.setString(1, errString);
+						rs = pstmt.executeQuery();
+						if(rs.next())
+						{
+							descr =  rs.getString("descr");					
+						}
+						rs.close();
+						rs = null;
+						pstmt.close();
+						pstmt = null;
+						System.out.println("@@@@@@@@@@ writeBusinessLogicCheck descr["+descr+"]");
+
+						errString = itmDBAccessEJB.getErrorString("", "VTWBLGCCHK", "","", conn);
+
+						System.out.println("@@@@@@@@@@ writeBusinessLogicCheck errString["+errString+"]");
+
+						String begPart = errString.substring( 0, errString.indexOf("</description>") );
+
+						String endPart=errString.substring( errString.indexOf("</description>"), errString.length() );
+
+						System.out.println("@@@@@@@ begPart ["+begPart+"]");
+						System.out.println("@@@@@@@ descr   ["+descr+"]");
+						System.out.println("@@@@@@@ endPart ["+endPart+"]");
+						
+						errString = begPart + descr +  endPart;
+
+						System.out.println("@@@@@@@ final return errString["+errString+"]");
+
+
+					}
+					
 					
 					System.out.println("@@@@@@@@@2 postOrdCreditChk errString["+errString+"]");
 
@@ -957,7 +1011,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 
 
 
-	private int writeBusinessLogicCheck(ArrayList<String> errStringList, String siteCode,String applyTime, Connection conn) throws SQLException, ITMException 
+	private String writeBusinessLogicCheck(ArrayList<String> errStringList, String siteCode,String applyTime, Connection conn) throws SQLException, ITMException 
+	//private int writeBusinessLogicCheck(ArrayList<String> errStringList, String siteCode,String applyTime, Connection conn) throws SQLException, ITMException 
 	{
 
 		PreparedStatement pstmt = null;
@@ -1079,9 +1134,30 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 				pstmt = null;
 				cnt++;
 			}
+			else
+			{
+				sql  = "select tran_id from BUSINESS_LOGIC_CHECK  where " +
+						" tran_type = ? and sale_order = ? and cr_policy = ? and aprv_stat = ? ";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1,applyTime);
+				pstmt.setString(2,asSorder);
+				pstmt.setString(3,lsCrPolicy);
+				pstmt.setString(4,"O");
+				rs = pstmt.executeQuery();
+				if (rs.next())
+				{
+					tranId = rs.getString(1);
+				}
+				rs.close();
+				rs = null;
+				pstmt.close();
+				pstmt = null;
+				System.out.println("@@@@@@@@@@@@ exist tranId["+tranId+"]");
+			}
 		}
-		System.out.println("@@@@@@@@@ insert cnt["+cnt+"]");
-		return cnt;
+		System.out.println("@@@@@@@@@ insert cnt["+cnt+"]tranId["+tranId+"]");
+		//return cnt;
+		return tranId;
 	}
 
 	private String generateTranId( String windowName,  String siteCode, Connection conn ) throws ITMException 

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

@@ -998,6 +998,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					retString = createVouc.createPoRcpVoucher(tranId,
 							xtraParams, conn);
 					System.out.println("RetString2>>>>>>>" +retString );
+					//Change by Manish on 28/04/16 [start]
+					if (retString != null || "Success".equalsIgnoreCase(retString))
+					{
+						retString = " ";
+					}
+					//Change by Manish on 28/04/16 [End]
 				} 
 				else if (retString != null && retString.trim().length() > 0 
 						&& (!("DONOT-CREATE-VOUCHER".equalsIgnoreCase(voucher_error))) && voucher_error.trim().length()==0)