In stocktransferAct--> the loc code to should be emp_code__assign and not as emp_code

StockTransferEjb--->Added itemchange for item_Ser

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

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

@@ -3,7 +3,6 @@ import java.rmi.RemoteException;
 import java.sql.*;
 import java.text.*;
 import java.util.*;
-import java.util.Date;
 import org.w3c.dom.*;
 import ibase.webitm.ejb.*;
 import ibase.webitm.ejb.dis.DistCommon;
@@ -624,6 +623,7 @@ public class StockTransferEJB extends ValidatorEJB implements StockTransferEJBRe
 								if (rs.next())
 								{
 									active = rs.getString("active");
+									System.out.println("active@@["+active+"]");
 								}
 								rs.close();
 								rs = null;
@@ -670,6 +670,7 @@ public class StockTransferEJB extends ValidatorEJB implements StockTransferEJBRe
 								if (rs.next())
 								{
 									active = rs.getString("active");
+									System.out.println("active@@["+active+"]");
 								}
 								rs.close();
 								rs = null;
@@ -1112,6 +1113,25 @@ public class StockTransferEJB extends ValidatorEJB implements StockTransferEJBRe
 					valueXmlString.append( "<site_code><![CDATA[" ).append(  checkNull ( siteCode)).append( "]]></site_code>\r\n" );
 					valueXmlString.append( "<site_descr><![CDATA[" ).append( checkNull( siteDescr )).append( "]]></site_descr>\r\n" );
 				}
+				//Changes by mayur on 05-06-2018---[start]
+				else if( currentColumn.trim().equalsIgnoreCase( "item_ser" ) )							
+				{
+					itemSer = genericUtility.getColumnValue("item_ser", currDom);
+					sql = "SELECT DESCR FROM itemser WHERE item_ser = ? ";
+					pstmt = conn.prepareStatement( sql );
+					pstmt.setString( 1, itemSer );						
+					rs = pstmt.executeQuery();	
+					if( rs.next() )
+					{
+						itemDescr = rs.getString("DESCR");
+					}
+					rs.close();rs = null;
+					pstmt.close();pstmt = null;
+
+					valueXmlString.append( "<item_ser><![CDATA[" ).append(  checkNull ( itemSer)).append( "]]></item_ser>\r\n" );
+					valueXmlString.append( "<descr><![CDATA[" ).append( checkNull( itemDescr )).append( "]]></descr>\r\n" );
+				}
+				//Changes by mayur on 05-06-2018---[end]
 				else if( currentColumn.trim().equalsIgnoreCase( "emp_code__aprv" ) )	// field is non editable						
 				{
 					empCodeAprv = genericUtility.getColumnValue("emp_code__aprv", currDom);

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

@@ -163,8 +163,8 @@ public class StockTransferAct extends ActionHandlerEJB implements
 
 				sql="select hdr.site_code, " 
 						 //Changes by mayur on 09-May-2018----start
-						//Add emp code from service order to be set as default loc code to
-						+"hdr.emp_code,"  
+						//Add engineer code from service order to be set as default loc code to
+						+"hdr.emp_code__assign,"  
 					    //Changes by mayur on 09-May-2018----end
 						+"det.line_no, det.item_code, " 
 						+"det.quantity, hdr.req_type, " 
@@ -180,7 +180,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 				while (rs.next()) {
 					lineCntr++;
 					siteCodeReq =  rs.getString("site_code");
-					locCodeTo = rs.getString("emp_code");  //get the emp code  
+					locCodeTo = rs.getString("emp_code__assign");  //get the engineer code 
 					lineNo =   rs.getString("line_no");
 					itemCode = rs.getString("item_code");
 					remainingQty = rs.getDouble("quantity");
@@ -189,7 +189,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 
 					System.out.println(":::SER_REQUEST TABLE DETAIL:::");		
 					System.out.println("siteCodeReq::["+siteCodeReq+"]");
-					System.out.println("locCodeTo as emp code::["+locCodeTo+"]");
+					System.out.println("locCodeTo as engineer code::["+locCodeTo+"]");
 					
 					System.out.println(":::SER_REQ_ITEM TABLE DETAIL:::");
 					System.out.println("lineNo ::["+lineNo+"]");
@@ -335,7 +335,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 				 }
 
 				 else if (hmQty >= remainingQty) {
-					 System.out.println("Inside hmQty >= remainingQty");
+					 System.out.println("@@Inside hmQty >= remainingQty["+hmQty+">="+remainingQty+"]");
 					 inputQty = remainingQty;
 					 System.out.println("inputQty :["+inputQty+"]");
 					 remainingQty = 0;
@@ -346,11 +346,12 @@ public class StockTransferAct extends ActionHandlerEJB implements
 				 }
 
 				 else if (hmQty < remainingQty) {
-					 System.out.println("Inside hmQty < remainingQty");
+					 System.out.println("@@Inside hmQty < remainingQty["+hmQty+"<"+remainingQty+"]");
 					 inputQty = hmQty;
 					 System.out.println("inputQty :["+inputQty+"]");
 
 					 remainingQty = remainingQty - inputQty;
+					 System.out.println("remainingQty :["+remainingQty+"-"+inputQty+"]");
 					 System.out.println("remainingQty :["+remainingQty+"]");
 					 hm.put(mapKey, new Double(0));
 				 }