changes for exp lev and site code mfg

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

webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java

@@ -4477,7 +4477,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 									setNodeValue( dom, "item_code__ord", (itemCodeOrd == null) ? "":itemCodeOrd );
 									//valueXmlString.append("<quantity__ord isSrvCallOnChg='0'>").append("<![CDATA[").append(orderedQty).append("]]>").append("</quantity__ord>\r\n");
 									valueXmlString.append("<quantity__ord isSrvCallOnChg='0'>").append("<![CDATA[").append(OrdQty).append("]]>").append("</quantity__ord>\r\n");
-									setNodeValue( dom, "exp_lev", OrdQty );
+									//setNodeValue( dom, "exp_lev", OrdQty );    // modify by cpatil on 31/01/13
+									setNodeValue( dom, "quantity__ord", OrdQty );
 									valueXmlString.append("<site_code isSrvCallOnChg='0'>").append("<![CDATA[").append(siteCodeDet).append("]]>").append("</site_code>\r\n");
 									setNodeValue( dom, "site_code", (siteCodeDet == null) ? "":siteCodeDet );
 									//valueXmlString.append("<quantity_real isSrvCallOnChg='0'>").append("<![CDATA[").append(qtyFact.get(1).toString()).append("]]>").append("</quantity_real>\r\n");
@@ -6137,8 +6138,10 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					setNodeValue( dom, "quantity__ord", ordQty);
 					valueXmlString.append("<site_code isSrvCallOnChg='0'>").append("<![CDATA[").append(siteCodeDet).append("]]>").append("</site_code>\r\n");
 					setNodeValue( dom, "site_code", (siteCodeDet == null) ? "" : siteCodeDet );
-					valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append("<![CDATA[").append(mdescr1).append("]]>").append("</exp_lev>\r\n");
-					setNodeValue( dom, "exp_lev", mdescr1);
+					// commented by cpatil on 31/DEC/13 as per suggestion start
+					//valueXmlString.append("<exp_lev isSrvCallOnChg='0'>").append("<![CDATA[").append(mdescr1).append("]]>").append("</exp_lev>\r\n");     
+					//setNodeValue( dom, "exp_lev", mdescr1);
+					// commented by cpatil on 31/DEC/13 as per suggestion end
 					valueXmlString.append("<item_code isSrvCallOnChg='0'>").append("<![CDATA[").append(itemCode).append("]]>").append("</item_code>\r\n");
 					setNodeValue( dom, "item_code", (itemCode == null) ? "" : itemCode );
 					valueXmlString.append("<quantity isSrvCallOnChg='0'>").append("<![CDATA[").append(mNum).append("]]>").append("</quantity>\r\n"); 
@@ -6281,10 +6284,11 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-						
-						sql = "select sum(rate) from pricelist where price_list = select price_list from sorder "
-						+"(where sale_order = ? and item_code in (select item_code from sorditem where "
+
+						sql = "select sum(rate) from pricelist where price_list = ( select price_list from sorder "
+						+"where sale_order = ? and item_code in (select item_code from sorditem where "
 						+"sale_order = ? and line_no= ? and line_type= 'I'))";
+						
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,mVal);
 						pstmt.setString(2,mVal);
@@ -6689,9 +6693,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						rs = null;
 						pstmt.close();
 						pstmt = null;
-						
-						sql = "select sum(rate) from pricelist where price_list = select price_list from sorder "
-						+"(where sale_order = ? and item_code in (select item_code from sorditem where "
+
+						sql = "select sum(rate) from pricelist where price_list = ( select price_list from sorder "
+						+"where sale_order = ? and item_code in (select item_code from sorditem where "
 						+"sale_order = ? and line_no= ? and line_type= 'I'))";
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,mVal);
@@ -7194,8 +7198,13 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 						
 						expDate = rs.getTimestamp(10);
 						mfgDate = rs.getTimestamp(11);
-						siteMfg  = rs.getString(12);
+						// commented by cpatil on 31/DEC/13 as per suggestion start
+						//siteMfg  = rs.getString(12);        
+						siteMfg  = ( rs.getString(12) == null ?"":rs.getString(12));   
+						System.out.println("@@@@ siteMfg:["+siteMfg+"]");
+						// commented by cpatil on 31/DEC/13 as per suggestion end
 						palletWt = rs.getDouble(13);
+						
 						retestDate = rs.getTimestamp(14);
 						//qty1 = rs.getDouble(15);
 						if(smNum != null && smNum.trim().length() > 0)