To merge src for WMS updated wave gen changes and phy item scan

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

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

@@ -1364,11 +1364,15 @@ public class MPhyItemScanIC extends ValidatorEJB implements MPhyItemScanICLocal,
 								valueXmlString.append("<tran_id/>"); 
 								valueXmlString.append("<status>").append("Y").append("</status>\r\n");	
 							}
-							valueXmlString.append("<line_no>").append(lineNo).append("</line_no>\r\n");									valueXmlString.append("<item_code>").append(checkNullAndTrim(itemCode)).append("</item_code>\r\n");
-							valueXmlString.append("<descr>").append(itemDescr).append("</descr>\r\n");
+							valueXmlString.append("<line_no>").append(lineNo).append("</line_no>\r\n");									
+							valueXmlString.append("<item_code>").append(checkNullAndTrim(itemCode)).append("</item_code>\r\n");
+							//Changed by sankara on 10/19/2012 to append descr in CDATA format
+							//valueXmlString.append("<descr>").append(itemDescr).append("</descr>\r\n");
+							valueXmlString.append( "<descr><![CDATA[" ).append( checkNull( itemDescr )).append( "]]></descr>\r\n" );
 							valueXmlString.append("<site_code>").append(siteCode).append("</site_code>\r\n");
 							valueXmlString.append("<loc_code><![CDATA[").append(checkNullAndTrim(locCode)).append("]]></loc_code>\r\n");
-							valueXmlString.append("<location_descr>").append(locDescr).append("</location_descr>\r\n");
+							//valueXmlString.append("<location_descr>").append(locDescr).append("</location_descr>\r\n");
+							valueXmlString.append("<location_descr><![CDATA[").append(checkNullAndTrim(locDescr)).append("]]></location_descr>\r\n");
 							valueXmlString.append("<lot_no>").append(checkNullAndTrim(lotNo)).append("</lot_no>\r\n");
 							valueXmlString.append("<lot_sl><![CDATA[").append(checkNullAndTrim(lotSl)).append("]]></lot_sl>\r\n");
 							valueXmlString.append("<quantity>").append(quantity).append("</quantity>\r\n");														

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

@@ -1466,10 +1466,13 @@ public class PhyScanVerifyIC extends ValidatorEJB implements PhyScanVerifyICLoca
 									valueXmlString.append("<tran_id>").append(tranId).append("</tran_id>\r\n");
 									valueXmlString.append("<line_no>").append(lineNo).append("</line_no>\r\n");	
 									valueXmlString.append("<item_code>").append(checkNullAndTrim(itemCode)).append("</item_code>\r\n");
-									valueXmlString.append("<descr>").append(itemDescr).append("</descr>\r\n");
+									//Changed by sankara on 19/10/2012 to append descr in CDATA format
+									//valueXmlString.append("<descr>").append(itemDescr).append("</descr>\r\n");
+									valueXmlString.append( "<descr><![CDATA[" ).append( checkNull(itemDescr)).append( "]]></descr>\r\n" );
 									valueXmlString.append("<site_code>").append(siteCode).append("</site_code>\r\n");
 									valueXmlString.append("<loc_code><![CDATA[").append(checkNullAndTrim(locCode)).append("]]></loc_code>\r\n");
-									valueXmlString.append("<location_descr>").append(locDescr).append("</location_descr>\r\n");
+									//valueXmlString.append("<location_descr>").append(locDescr).append("</location_descr>\r\n");
+									valueXmlString.append("<location_descr><![CDATA[").append(locDescr)).append("]]></location_descr>\r\n")
 									valueXmlString.append("<lot_no>").append(checkNullAndTrim(lotNo)).append("</lot_no>\r\n");
 									valueXmlString.append("<lot_sl><![CDATA[").append(checkNullAndTrim(lotSl)).append("]]></lot_sl>\r\n");
 									valueXmlString.append("<quantity>").append(quantity).append("</quantity>\r\n");