chnage scheme logic

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

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

@@ -587,7 +587,7 @@ private String generateDebitNote(Connection conn,ArrayList<String> podProcessInv
 		System.out.println("Error String on DB Confirmation: "+errString);	
 		if((errString != null ) &&  errString.indexOf("CONFSUCCES") > -1)
 		{
-		int cnt =insertDataInPodTrace(invoiceId, podC.xmlStringAll, scheme, "N","Y");		
+		int cnt =insertDataInPodTrace(conn,invoiceId, podC.xmlStringAll, scheme, "N","Y");		
 			noOfInvoicePrc++;
 			 if(noOfInvoicePrc==totalInvoice){
 				 invdoneCnt=1;
@@ -604,18 +604,12 @@ private String generateDebitNote(Connection conn,ArrayList<String> podProcessInv
 			
 			
 		}else{
-			conn.rollback();
-			int cnt =insertDataInPodTrace( invoiceId, podC.xmlStringAll, scheme, "N","N");	
-			if(cnt > 0)
-				conn1.commit(); 			
+			conn.rollback();						 			
 			errString=newErrorMessage(errString, invoiceId);
 			return errString; 
 		}
 	}else{	
-		conn.rollback();
-		int cnt=insertDataInPodTrace(invoiceId, podC.xmlStringAll, scheme, "N","N");
-		if(cnt > 0)
-			conn1.commit(); 		
+		conn.rollback();						
 		errString=newErrorMessage(errString, invoiceId);
 		return errString;	
 	}
@@ -1009,6 +1003,9 @@ private boolean isSchemeApply(Connection conn,String itemCodeL,String invoiceId)
 		    	schemeApply=true;
 		    	checkBom=true;
 			}
+		    if(schemeOrderType.length() > 0){
+		    	schemeApply=true;
+		    }
 			if(noApplyCustList.length() > 0){ //if no apply customer list not null then checked
 				String [] custList=noApplyCustList.split(",");
 				for(int i=0 ;i < custList.length; i++)
@@ -1144,10 +1141,8 @@ private Map<String,Double> schemeApply(Connection conn,String invoiceID,String i
 	}
 	return schemeQtyMap;
 }
-private int insertDataInPodTrace(String invID,String xmlDataAll,String scheme,String partialL,String success)
-{	
-	Connection conn1=null;
-	ConnDriver connDriver1 = new ConnDriver();
+private int insertDataInPodTrace(Connection conn1,String invID,String xmlDataAll,String scheme,String partialL,String success)
+{
 	PreparedStatement pstmt=null;
 	ResultSet rs=null;
 	String sql="",itemCode="",quantity="",rate="",amount="",lineNoS="";
@@ -1156,9 +1151,8 @@ private int insertDataInPodTrace(String invID,String xmlDataAll,String scheme,St
 	invID=invID==null ? "" :invID.trim();
 	try{
 		//DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-		//DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
-		conn1 = connDriver1.getConnectDB("DriverITM");
-		if(conn1!=null) {
+		//DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();		
+		
 		System.out.println("xmlDataAll---->>[["+xmlDataAll+"]]");
 		Document doc = new ValidatorEJB ().parseString(xmlDataAll);
 		doc.getDocumentElement().normalize();
@@ -1226,9 +1220,7 @@ private int insertDataInPodTrace(String invID,String xmlDataAll,String scheme,St
 		
 		
 		
-	}	else{
-		System.out.println("Conn1 is null.............................................%^%^%^%^%^%^%");
-	}
+	
 		
 	}
 	catch(Exception e)
@@ -1767,7 +1759,7 @@ public String actualQtyPODProcessPartial(Connection conn) //partialInvoiceMap
 				System.out.println("Error String on DB Confirmation: "+errString);	
 				if((errString != null ) &&  errString.indexOf("CONFSUCCES") > -1)
 				{
-					int cnt=insertDataInPodTrace(invIdPartial, podC.xmlStringAll, scheme, "Y","Y");
+					int cnt=insertDataInPodTrace(conn,invIdPartial, podC.xmlStringAll, scheme, "Y","Y");
 					noOfInvoicePrc++;
 					System.out.println("cnt IN PARTIAL-->>["+cnt+"]");			
 						 
@@ -1784,18 +1776,12 @@ public String actualQtyPODProcessPartial(Connection conn) //partialInvoiceMap
 					
 					//return "Success";
 				}else{
-					conn.rollback();
-					int cnt=insertDataInPodTrace(invIdPartial, podC.xmlStringAll, scheme, "Y","N");	
-					if(cnt > 1)
-						conn1.commit();
+					conn.rollback();										
 					errString=newErrorMessage(errString, invIdPartial);
 					return errString;
 				}
 			}else{	
-				conn.rollback();
-				/*int cnt=insertDataInPodTrace(conn1, invIdPartial, podC.xmlStringAll, schemeMap, partialMap,"N");
-				if(cnt > 1)
-					conn1.commit();*/
+				conn.rollback();			
 				errString=newErrorMessage(errString, invIdPartial);
 				return errString;	
 			}