loc_type__parnt considered as per PB component change

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

webitm-dis/ibase/webitm/ejb/dis/SOrderForm.java

@@ -433,7 +433,11 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
 							custPord = genericUtility.getColumnValue("cust_pord",dom);
 							pord_date = genericUtility.getColumnValue("pord_date",dom);
 							//System.out.println("pord_date>>>>>>>>>>>>>>>> " + pord_date);
-							tranId = genericUtility.getColumnValue("tran_id",dom);
+							tranId = genericUtility.getColumnValue("tran_id",dom);
+							if (tranId == null)
+							{
+								tranId = "";
+							}
 							pordDate = java.sql.Timestamp.valueOf(genericUtility.getValidDateString(pord_date,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()) + " 00:00:00.00");
 							//System.out.println("pordDate:- " + pordDate);
 							sql = "select count(*) from sordform" 
@@ -2162,8 +2166,8 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
 						   siteDescr = rs.getString(1) == null ? "" : rs.getString(1);
 						}
 						//System.out.println("siteDescr .." + siteDescr);
-							rs.close();
-							pstmt.close();
+						rs.close();
+						pstmt.close();
 						pstmt = null;
 						rs = null;
 						valueXmlString.append("<descr>").append("<![CDATA["+siteDescr.trim()+"]]>").append("</descr>");
@@ -3034,7 +3038,8 @@ public class SOrderForm extends ValidatorEJB implements SOrderFormLocal, SOrderF
 								{
 									 mitemSer = lsItemSer;
 								}
-								sql="select descr, unit, loc_type  from  item where item_code=? ";
+								sql="select descr, unit, (case when loc_type__parent is null then loc_type else loc_type__parent end) loc_type  from  item where item_code=? ";
+								
 								pstmt= conn.prepareStatement(sql);
 								pstmt.setString(1,itemCode);
 								rs = pstmt.executeQuery();