trim in resultset removed

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

webitm-mfg/ibase/webitm/ejb/mfg/adv/QcOrderAct.java

@@ -166,7 +166,7 @@ public class QcOrderAct extends ActionHandlerEJB implements  QcOrderActLocal , Q
 	*/
 	private String actionStock(Document dom, Document dom1, String xtraParams)throws RemoteException, ITMException 
 	{
-		String siteCode = "", itemCode = "", lotNo = "" ,descr ="" ;
+		String siteCode = "", itemCode = "", lotNo = "" ,descr ="", trackShelfLife = "" ;
 		String sql = "";
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -225,15 +225,15 @@ public class QcOrderAct extends ActionHandlerEJB implements  QcOrderActLocal , Q
 			{
 				valueXmlString.append("<Detail>\r\n");
 				valueXmlString.append("<line_no>").append("<![CDATA[").append(counter).append("]]>").append("</line_no>\r\n");			
-				valueXmlString.append("<item_ser>").append("<![CDATA[").append(rs.getString(1).trim()).append("]]>").append("</item_ser>\r\n");			
-				valueXmlString.append("<item_code>").append("<![CDATA[").append(rs.getString(2).trim()).append("]]>").append("</item_code>\r\n");			
+				valueXmlString.append("<item_ser>").append("<![CDATA[").append(rs.getString(1)).append("]]>").append("</item_ser>\r\n");			
+				valueXmlString.append("<item_code>").append("<![CDATA[").append(rs.getString(2)).append("]]>").append("</item_code>\r\n");			
 				valueXmlString.append("<descr>").append("<![CDATA[").append(descr).append("]]>").append("</descr>\r\n");
 				valueXmlString.append("<unit>").append("<![CDATA[").append(rs.getString(3)).append("]]>").append("</unit>\r\n");			
-				valueXmlString.append("<loc_code>").append("<![CDATA[").append(rs.getString(4).trim()).append("]]>").append("</loc_code>\r\n");			
-				valueXmlString.append("<lot_no>").append("<![CDATA[").append(rs.getString(5).trim()).append("]]>").append("</lot_no>\r\n");			
-				valueXmlString.append("<lot_sl>").append("<![CDATA[").append(rs.getString(6).trim()).append("]]>").append("</lot_sl>\r\n");
-				valueXmlString.append("<site_code>").append("<![CDATA[").append(rs.getString(7).trim()).append("]]>").append("</site_code>\r\n");							
-				valueXmlString.append("<exp_date>").append("<![CDATA[").append(rs.getString(8).trim()).append("]]>").append("</exp_date>\r\n");
+				valueXmlString.append("<loc_code>").append("<![CDATA[").append(rs.getString(4)).append("]]>").append("</loc_code>\r\n");			
+				valueXmlString.append("<lot_no>").append("<![CDATA[").append(rs.getString(5)).append("]]>").append("</lot_no>\r\n");			
+				valueXmlString.append("<lot_sl>").append("<![CDATA[").append(rs.getString(6)).append("]]>").append("</lot_sl>\r\n");
+				valueXmlString.append("<site_code>").append("<![CDATA[").append(rs.getString(7)).append("]]>").append("</site_code>\r\n");							
+				valueXmlString.append("<exp_date>").append("<![CDATA[").append(rs.getString(8)).append("]]>").append("</exp_date>\r\n");
 				//valueXmlString.append("<retest_date>").append("<![CDATA[").append(rs.getString(9).trim()).append("]]>").append("</retest_date>\r\n");
 				//valueXmlString.append("<pack_code>").append("<![CDATA[").append(rs.getString(10).trim()).append("]]>").append("</pack_code>\r\n");
 				valueXmlString.append("<quantity>").append("<![CDATA[").append(rs.getDouble(11)).append("]]>").append("</quantity>\r\n");
@@ -292,7 +292,7 @@ public class QcOrderAct extends ActionHandlerEJB implements  QcOrderActLocal , Q
 		String selectedrow = "";
 		String quantity = "", qtyPassed = "", qtyRej = "", qtySample = "", qty = "";
 		String qcOrder ="", itemCode ="", lotNo ="", lotSl ="",locCode ="", unit ="" ,itemDescr = "";
-		String locType="",locLogic ="",site ="",locUdf ="",loc ="";
+		String locType="",locLogic ="",site ="",locUdf ="",loc ="",trackShelfLife = "N";
 		int count = 0 , line = 0;
 		Node currDetail1 = null;
 		DistCommon dist = new DistCommon();
@@ -328,6 +328,23 @@ public class QcOrderAct extends ActionHandlerEJB implements  QcOrderActLocal , Q
 			itemCode		  = genericUtility.getColumnValue("item_code", selDataDom);
 			itemDescr = 	 genericUtility.getColumnValue("descr", selDataDom);
 			qtySample = genericUtility.getColumnValue("qty_sample", dom1);
+
+			sql = " select track_shelf_life from item "
+				+" where item_code = ? " ;
+			pstmt = conn.prepareStatement(sql);
+			pstmt.setString(1, itemCode);
+			rs = pstmt.executeQuery();
+			if(rs.next())
+			{
+				trackShelfLife = rs.getString(1);
+			}
+			pstmt.close();
+			if (trackShelfLife == null)
+			{
+				trackShelfLife = "N";
+			}
+
+
 			if (qtySample == null)
 			{
 				qtySample = "0";