changed by sankara on 09/01/14 update generatelablesprc given by pragyan

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

webitm-wms/ibase/webitm/ejb/wms/GenerateLabelsPrc.java

@@ -402,6 +402,14 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 									{						
 										packages2[count] = null;
 										count++;
+										
+										if("Y".equalsIgnoreCase(chgStatus))
+										{
+											StringReturn testReturn = soap.voidPackage(oldCarrierSymbol,oldMsnNo);
+							    			response =  testReturn.getResponse();
+							    			System.out.println("response  Master Carton void----["+response+"] for master carton["+masterCarton+"]");		
+										}
+										
 										continue;
 									}
 									else
@@ -524,9 +532,22 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 						
 						if( arryOuterCartonNo.size() == 0)
 						{
-							errString = itmDBAccessEJB.getErrorString("","NOTHING2PR","");
-			    			return errString;
+							
+							pstmtCrtnChg.setString(1, "N");
+							pstmtCrtnChg.setString(2, ptcn);
+							pstmtCrtnChg.executeUpdate();
+							pstmtChg.setString(1, "Y");
+							pstmtChg.setString(2, ptcn);				
+							int test = pstmtChg.executeUpdate();
+						
+							errString = itmDBAccessEJB.getErrorString("Void Records Successfully","NOTHING2PR","");
+							System.out.println("Only Voiding the Error ["+errString+"]");
+							errString = "";
+			    			//return errString;
 						}
+						else
+						{
+						
 								
 								Collections.sort(arryOuterCartonNo);
 								shipment2.setPackages2(packages2); 
@@ -721,7 +742,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 				    				totalFrtAmt = objShipResult.getTotal();
 				    				System.out.println("Update in desp update freight Amt totalFrtAmt ["+totalFrtAmt+"] For frtTerm["+frtTerm+"]saleOrder["+saleOrder+"]");
 				    				
-		    				if("O".equalsIgnoreCase(frtTerm))
+				    				if("B".equalsIgnoreCase(frtTerm))
 				    				{
 				    					sSQL = "UPDATE DESPATCH SET FREIGHT_AMT_ADD = ? WHERE PTCN = ?";
 				    					pstmtDesp = conn.prepareStatement(sSQL);
@@ -755,14 +776,10 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
 				    					}
 				    				}
 							
-			    	}//else
+					    	}//else if(!objReturn2.isSuccess())
 			    		
+						}
 				
-				/*}
-				else
-				{
-					
-				}*/
 			}
 			
 			if(ptcnRS != null)