Changed by Manish on 08/03/16 for DDUK.

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

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

@@ -97,7 +97,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 		//Changes by Dadaso pawar on [24/02/15] (Confirmed dispatch) [Start]
 		String despSql = "",despId = "",loginSiteCode = "",itemSer = "",tranSer = "",currCode = "",finEntity = "",
 		segPayStatus = "",saleOrderL = "",rcpMode = "",custCode = "",refNo = "",siteCodeDesp = "",
-		bankCode = "",cardType = "",modName = "";;
+		bankCode = "",cardType = "",modName = "",invoicePrint = "",isDespConfEnable = "";
 		double sorderTotAmt = 0;
 
 		ResultSet despRs = null;
@@ -630,13 +630,60 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 							//Changed by samadhan on 01/06/2015 for status tracking update in magento system.end
 
 							conn.commit();
-							System.out.println("------Commited all transaction before despatch confirmed.......");
-							errString = confirmDespatch("despatch", despId, xtraParams, "", conn);
-							System.out.println("errString After Despatch Confirmed------>>["+errString+"]");
-
-							if(errString != null && errString.indexOf("VTSUCC1") > 0)
+							
+							//Changed By Manish To check the desp conf flag 08/03/16.start
+							isDespConfEnable = distCommonObj.getDisparams("999999", "IS_DESP_CONF_REQD", conn);
+							
+							if("Y".equalsIgnoreCase(isDespConfEnable))
+							{
+							
+								System.out.println("------Commited all transaction before despatch confirmed.......");
+								errString = confirmDespatch("despatch", despId, xtraParams, "", conn);
+								System.out.println("errString After Despatch Confirmed------>>["+errString+"]");
+	
+								if(errString != null && errString.indexOf("VTSUCC1") > 0)
+								{
+									System.out.println("----------"+despId+" Despatch confirmed successfully.................");
+									
+									updateSql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y', WAVE_STATUS = 'V' WHERE REF_ID = ? ";
+									pstmt = conn.prepareStatement(updateSql);
+									pstmt.setString(1, despId);
+									updCnt = pstmt.executeUpdate();
+									
+									if( updCnt > 0 )
+									{					
+										System.out.println( updCnt + " rows updated successfully " );
+									}	
+									pstmt.close();pstmt = null;
+									
+									//Changed by Manish on [12/05/15] start
+									String printer = "";
+									printer = genericUtility.getColumnValue( "printer_name", dom );
+									System.out.println("Printer Name="+printer);
+									errString = "";
+									// Changed by Sneha on 08/03/2016 [Start]
+	
+									//generateInvoiceReport(ptcn, despId, printer, conn, xtraParams);
+	
+									invoicePrint = distCommonObj.getDisparams("999999", "IS_PRINT_INVOICE_ON", conn);
+									if("Y".equalsIgnoreCase(invoicePrint))
+									{
+										generateInvoiceReport(ptcn, despId, printer, conn, xtraParams);
+									}            
+	
+									// Changed by Sneha on 08/03/2016 [End]
+	
+									//Changed by Manish on [12/05/15] END
+								}
+								else
+								{						
+									return errString;
+									//throw new Exception(errString);							
+								}
+							}
+							else
 							{
-								System.out.println("----------"+despId+" Despatch confirmed successfully.................");
+								System.out.println("------Only Task confirmed.......");
 								
 								updateSql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y', WAVE_STATUS = 'V' WHERE REF_ID = ? ";
 								pstmt = conn.prepareStatement(updateSql);
@@ -648,20 +695,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
 									System.out.println( updCnt + " rows updated successfully " );
 								}	
 								pstmt.close();pstmt = null;
-								
-								//Changed by Manish on [12/05/15] start
-								String printer = "";
-								printer = genericUtility.getColumnValue( "printer_name", dom );
-								System.out.println("Printer Name="+printer);
 								errString = "";
-								generateInvoiceReport(ptcn, despId, printer, conn, xtraParams);
-								//Changed by Manish on [12/05/15] END
-							}
-							else
-							{						
-								return errString;
-								//throw new Exception(errString);							
 							}
+							//Changed By Manish To check the desp conf flag 08/03/16.end
 						}
 						else
 						{