Updated changes in StockTransferAct

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

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

@@ -58,7 +58,6 @@ public class StockTransferAct extends ActionHandlerEJB implements
 		System.out.println("xmlString from StockTransferActEJB :" + dom+ " \n xmlString1 :" + dom1);
 		String refIdFor="",refSerFor = "", lineNo="",acctCodeDr="",cctrCodeDr="",locCodeTo="";
 		int lineCntr=0;
-		String consumeOrder = "";
 		ResultSet rs = null;
 		Connection conn = null;
 		PreparedStatement pstmt = null;
@@ -96,12 +95,14 @@ public class StockTransferAct extends ActionHandlerEJB implements
 			locCodeTo = genericUtility.checkNull(genericUtility.getColumnValue("loc_code__to",dom));
 			System.out.println("Location code::::::::"+ locCodeTo);
 			
+			refIdFor = genericUtility.getColumnValue("ref_id__for", dom1);
+			System.out.println("Reference id::::::::"+ refIdFor);   
+
+			if(refIdFor != null || refIdFor.trim().length() >  0)
+			{
 			//Consumption order
 			if (("C-ORD").trim().equalsIgnoreCase(refSerFor))
 			{
-				consumeOrder = genericUtility.getColumnValue("ref_id__for", dom1);
-				System.out.println("Consumer Order Reference id::::::::"+ consumeOrder);
-
 				sql = "select hdr.available_yn," 
 						+ "hdr.site_code__req,"
 						+ "det.line_no," 
@@ -116,7 +117,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 
 				System.out.println("SQL ::" + sql);
 				pstmt = conn.prepareStatement( sql );
-				pstmt.setString(1,consumeOrder);
+				pstmt.setString(1,refIdFor);
 				rs = pstmt.executeQuery();
 
 				while (rs.next()) {
@@ -156,8 +157,6 @@ public class StockTransferAct extends ActionHandlerEJB implements
 			} //end of if for consume order
 			else if (("S-REQ").trim().equalsIgnoreCase(refSerFor))
 			{
-				refIdFor = genericUtility.getColumnValue("ref_id__for", dom1);
-				System.out.println("serReq Reference id::::::::"+ refIdFor);
 
 				sql="select hdr.site_code, " 
 						+"det.line_no, det.item_code, " 
@@ -203,6 +202,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 				pstmt = null;
 				valueXmlString.append("</Root>\r\n");	
 			}//end of else if for ser request
+			}//end of refIdFor
 	}//end of try block
 		catch (SQLException sqx) 
 		{
@@ -242,7 +242,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 	 private String StockDetails(String itemCode,String locCodeTo,String siteCodeReq,String availableYn,double remainingQty,Connection conn) throws ITMException
 	 {
 		 HashMap<String, Double> hm = new HashMap<String, Double>();
-		 String lotNum="",lotSerial="", accountInv="",costCenInv="",remarks="";
+		 String lotNum="",lotSerial="", accountInv="",costCenInv="",remarks="",locCodeFr="";
 		 double noArt = 0;
 		 double hmQty = 0d;
 		 double inputQty = 0d;
@@ -291,7 +291,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 
 			 while (rs1.next()) {
 
-				// locCode = rs1.getString( "LOC_CODE" );
+				 locCodeFr = rs1.getString( "LOC_CODE" );
 				 lotNum = rs1.getString( "LOT_NO" );
 				 lotSerial = rs1.getString("LOT_SL");
 				// remainingQty = rs1.getDouble( "BAL_QUANTITY" );
@@ -339,10 +339,15 @@ public class StockTransferAct extends ActionHandlerEJB implements
 					 hm.put(mapKey, new Double(0));
 				 }
 				 System.out.println("Hashmap :" + hm);
-
 				 valueXmlString.append("<loc_code__to isSrvCallOnChg=\"0\">").append("<![CDATA[").append( locCodeTo ).append("]]>").append("</loc_code__to>\r\n");	
+				 valueXmlString.append("<loc_code__fr isSrvCallOnChg=\"0\">").append("<![CDATA[").append( locCodeFr ).append("]]>").append("</loc_code__fr>\r\n");	
+				 
 				 valueXmlString.append("<lot_no__to isSrvCallOnChg=\"0\">").append("<![CDATA[").append(lotNum).append("]]>").append("</lot_no__to>\r\n");
+				 valueXmlString.append("<lot_no__fr isSrvCallOnChg=\"0\">").append("<![CDATA[").append(lotNum).append("]]>").append("</lot_no__fr>\r\n");
+				 
 				 valueXmlString.append("<lot_sl__to isSrvCallOnChg=\"0\">").append("<![CDATA[").append(lotSerial).append("]]>").append("</lot_sl__to>\r\n");
+				 valueXmlString.append("<lot_sl__fr isSrvCallOnChg=\"0\">").append("<![CDATA[").append(lotSerial).append("]]>").append("</lot_sl__fr>\r\n");
+				 
 				 valueXmlString.append("<no_art isSrvCallOnChg=\"0\">").append("<![CDATA[").append(noArt).append("]]>").append("</no_art>\r\n");
 				 valueXmlString.append("<quantity isSrvCallOnChg=\"0\">").append("<![CDATA[").append(inputQty).append("]]>").append("</quantity>\r\n");		
 				 valueXmlString.append("<acct_code__cr isSrvCallOnChg=\"0\">").append("<![CDATA[").append(accountInv).append("]]>").append("</acct_code__cr>\r\n");