Added changes for add recipient for DDUK

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

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

@@ -3862,15 +3862,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				//Changed by Rohan to set resons detail null in sorder item.end
 				
 				//Changed by Samadhan on 24/02/2016 for update blank resason to sorder start
-				SqlSord = "UPDATE SORDER SET SPEC_REASON = ? WHERE SALE_ORDER = ?";
-				pstmtSord = conn.prepareStatement(SqlSord);
-				pstmtSord.setString(1, "");
-				pstmtSord.setString(2, saleOrder);
-				pstmtSord.executeUpdate();
-				if( pstmtSord != null )
+				if("DDUK".equalsIgnoreCase(projectName))
 				{
-					pstmtSord.close();
-					pstmtSord = null;
+					SqlSord = "UPDATE SORDER SET SPEC_REASON = ? WHERE SALE_ORDER = ?";
+					pstmtSord = conn.prepareStatement(SqlSord);
+					pstmtSord.setString(1, "");
+					pstmtSord.setString(2, saleOrder);
+					pstmtSord.executeUpdate();
+					if( pstmtSord != null )
+					{
+						pstmtSord.close();
+						pstmtSord = null;
+					}
 				}
 				//Changed by Samadhan on 24/02/2016 for update blank resason to sorder end
 				
@@ -5162,7 +5165,23 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
 					}
 				}
-
+				//Changed by Samadhan on 26/02/2016 for Hold Sale Order Start
+				if("DDUK".equalsIgnoreCase(projectName))
+				{
+					try 
+					{
+						if(errString != null && errString.indexOf("ADSISRVERR") > -1)
+						{
+							holdSaleOrder(saleOrder, errString);
+						}
+					} 
+					catch (Exception e) 
+					{
+						e.printStackTrace();
+					}
+				}
+				//Changed by Samadhan on 26/02/2016 for Hold Sale Order Start
+					
 				return errString;
 
 			}
@@ -8316,7 +8335,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		//Changed By Rekha WM3BSUN006 20/05/13 To get the SOAP connection.end
 		//chnaged by pragyan on 15/10/14 for cold chain
 		String strgCondn = "N";
-
+		//Changed by Samadhan on 25/02/2016 for address mearge
+		String shipAdd4 = "",shipAdd5 = "",shipAdd6 = "",tempShipAdd="";
 		try
 		{
 
@@ -10063,6 +10083,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							shipAdd3 = checkNull((String)transportInfoMap.get("ADDR3")).trim();
 
 							//Changed by Rohan on 22-08-13 for checking null address.end
+							
+							
 							shipCity = (String)transportInfoMap.get("CITY");
 							stateCodeDlv = (String)transportInfoMap.get("STATE_DLV");
 							shipCountry = (String)transportInfoMap.get("COUNT_CODE");	
@@ -10074,6 +10096,21 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 							//pin = (String)transportInfoMap.get("PIN");
 							pin = (String)transportInfoMap.get("DLV_PIN");
 							shipmentType =  (String)transportInfoMap.get("SHIPMENT_TYPE");
+							
+							//Changed by Samadhan on 25/02/2016 for address mearge start
+							shipAdd4 = checkNull((String)transportInfoMap.get("ADDR4")).trim();
+							shipAdd5 = checkNull((String)transportInfoMap.get("ADDR5")).trim();
+							shipAdd6 = checkNull((String)transportInfoMap.get("ADDR6")).trim();
+							if("DDUK".equalsIgnoreCase(projectName))
+							{ 
+								tempShipAdd = shipAdd3;
+								shipAdd3 = shipAdd1+" "+shipAdd2;
+								shipAdd2 = tempShipAdd+" "+shipAdd4;
+								shipAdd1 = shipAdd5;
+								stateCodeDlv = shipAdd6;
+							}
+							//Changed by Samadhan on 25/02/2016 for address mearge end
+							
 							//Setting Shipment ID 
 							shipment2.setID(waveId);
 							recipient.setID(custCodeDlv);//Customer Code
@@ -16294,12 +16331,6 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 					//Changed by samadhan on 04/12/2015 for handling special characters
 					//errString = getError(saleOrder + "[" + objReturn2.getMessage() +"]", "ADSISRVERR", conn);
 					errString = getErrorNew("["+ saleOrder + "] " + objReturn2.getMessage() +" ", "ADSISRVERR", conn);
-					//Changed by Samadhan on 23/02/2016 for hold sale order start
-					if("DDUK".equalsIgnoreCase(projectName))
-					{
-						holdSaleOrder(saleOrder,objReturn2.getMessage());
-					}
-					//Changed by Samadhan on 23/02/2016 for hold sale order end
 					return errString;
 				}
 				else
@@ -20900,6 +20931,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 		String custCode = "",stanCode = "",siteCodeShip = "",stateCodeDlv = "",shipConsGrp = ""
 			//Changed By Rekha to get additional fields for ADSI
 			,custName="",custShName = "",shipCity="",shipCountry = "",shipAdd1 = "",shipAdd2 = "",shipAdd3 = "",
+			//Changed by Samadhan on 25/02/2016 for address mearge
+			shipAdd4 = "",shipAdd5 = "",shipAdd6 = "",
 			shipPh="",shipFax ="",shipMailId = "",custPord = "",dlvPin = "", frtTerm = "", tranCode = "",transMod  = "";
 		//changed by sankara on 11/10/13 for getting drug_lic_no_1 and drug_licno1_upto start.
 		String licenceNo = "";
@@ -20949,6 +20982,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				+" S.DLV_ADD1 AS  ADDR1,"
 				+" S.DLV_ADD2 AS  ADDR2,"
 				+" S.DLV_ADD3 AS  ADDR3,"
+				//Changed by Samadhan on 25/02/2016 for address mearge start
+				+" S.NOTIFY_ADD1 AS  ADDR4," 
+				+" S.NOTIFY_ADD2 AS  ADDR5,"
+				+" S.NOTIFY_ADD3 AS  ADDR6,"
+				//Changed by Samadhan on 25/02/2016 for address mearge end
 				+" S.DLV_CITY AS  CITY,"
 				+" S.COUNT_CODE__DLV AS  COUNT_CODE,"
 				+" S.TEL1__DLV AS  PHONE,"
@@ -20989,6 +21027,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 				shipAdd1 = rs.getString("ADDR1");
 				shipAdd2 = rs.getString("ADDR2");
 				shipAdd3 = rs.getString("ADDR3");
+				//Changed by Samadhan on 25/02/2016 for address mearge start
+				shipAdd4 = rs.getString("ADDR4");
+				shipAdd5 = rs.getString("ADDR5");
+				shipAdd6 = rs.getString("ADDR6");
+				//Changed by Samadhan on 25/02/2016 for address mearge END
 				shipCountry = rs.getString("COUNT_CODE");
 				shipPh = rs.getString("PHONE");
 				shipMailId = rs.getString("EMAIL_ID");
@@ -21065,6 +21108,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			sordInfoMap.put("ADDR1", shipAdd1);
 			sordInfoMap.put("ADDR2", shipAdd2);
 			sordInfoMap.put("ADDR3", shipAdd3);
+			//Changed by Samadhan on 25/02/2016 for address mearge start
+			sordInfoMap.put("ADDR4", shipAdd4);
+			sordInfoMap.put("ADDR5", shipAdd5);
+			sordInfoMap.put("ADDR6", shipAdd6);
+			//Changed by Samadhan on 25/02/2016 for address mearge end
 			sordInfoMap.put("COUNT_CODE", shipCountry);
 			sordInfoMap.put("PHONE", shipPh);
 			sordInfoMap.put("EMAIL_ID", shipMailId);
@@ -26327,13 +26375,20 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 	//Changed by samadhan on 04/12/2015 for handling special characters End
 	
 	//Changed by samadhan on 23/02/2016 for hold sale order start
-	private  String holdSaleOrder(String saleOrder,String reason)  throws ITMException, Exception
+	private  String holdSaleOrder(String saleOrder,String reasonErr)  throws ITMException, Exception
 	{
 		String sorderHoldSql = "";
 		PreparedStatement pstmt = null;
 		Connection conn = null;
 		int updatedRows = 0;
 		String retString = "error";
+		String reason = "";
+		Document dom =  genericUtility.parseString(reasonErr);
+		String descr = genericUtility.getColumnValue("description", dom);
+		if(descr != null)
+		{
+			reason = descr.substring(descr.indexOf("]")+1, descr.length());
+		}
 		try
 		{
 			ConnDriver connDriver = new ConnDriver();