Commit f86b5bf3 authored by rbhogale's avatar rbhogale

Chnaged by Rohan on 22-08-13 for showing address in reverse order


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93526 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d9863058
...@@ -8450,9 +8450,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -8450,9 +8450,17 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
recipient = new Address();//To set the Address recipient = new Address();//To set the Address
custName = (String)transportInfoMap.get("CUST_NAME"); custName = (String)transportInfoMap.get("CUST_NAME");
custShName = (String)transportInfoMap.get("SH_NAME"); custShName = (String)transportInfoMap.get("SH_NAME");
//Changed by Rohan on 22-08-13 for checking null address.start
/*
shipAdd1 = (String)transportInfoMap.get("ADDR1"); shipAdd1 = (String)transportInfoMap.get("ADDR1");
shipAdd2 = (String)transportInfoMap.get("ADDR2"); shipAdd2 = (String)transportInfoMap.get("ADDR2");
shipAdd3 = (String)transportInfoMap.get("ADDR3"); shipAdd3 = (String)transportInfoMap.get("ADDR3");
*/
shipAdd1 = checkNull((String)transportInfoMap.get("ADDR1")).trim();
shipAdd2 = checkNull((String)transportInfoMap.get("ADDR2")).trim();
shipAdd3 = checkNull((String)transportInfoMap.get("ADDR3")).trim();
//Changed by Rohan on 22-08-13 for checking null address.end
shipCity = (String)transportInfoMap.get("CITY"); shipCity = (String)transportInfoMap.get("CITY");
stateCodeDlv = (String)transportInfoMap.get("STATE_DLV"); stateCodeDlv = (String)transportInfoMap.get("STATE_DLV");
shipCountry = (String)transportInfoMap.get("COUNT_CODE"); shipCountry = (String)transportInfoMap.get("COUNT_CODE");
...@@ -8477,13 +8485,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -8477,13 +8485,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
recipient.setAddress2(shipAdd2);//Customer Adress2 recipient.setAddress2(shipAdd2);//Customer Adress2
recipient.setAddress3(shipAdd1);//Customer Adress3 recipient.setAddress3(shipAdd1);//Customer Adress3
*/ */
if(!"".equalsIgnoreCase(shipAdd3.trim()) && shipAdd3.trim().length() > 0) if(!"".equalsIgnoreCase(shipAdd3) && shipAdd3.length() > 0)
{ {
recipient.setAddress1(shipAdd3);//Customer Adress1 recipient.setAddress1(shipAdd3);//Customer Adress1
recipient.setAddress2(shipAdd2);//Customer Adress2 recipient.setAddress2(shipAdd2);//Customer Adress2
recipient.setAddress3(shipAdd1);//Customer Adress3 recipient.setAddress3(shipAdd1);//Customer Adress3
} }
else if(!"".equalsIgnoreCase(shipAdd2.trim()) && shipAdd2.trim().length() > 0) else if(!"".equalsIgnoreCase(shipAdd2) && shipAdd2.length() > 0)
{ {
recipient.setAddress1(shipAdd2);//Customer Adress1 recipient.setAddress1(shipAdd2);//Customer Adress1
recipient.setAddress2(shipAdd1);//Customer Adress2 recipient.setAddress2(shipAdd1);//Customer Adress2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment