Updated changes in stock transfer act in stock details

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

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

@@ -56,7 +56,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 	private String actionAllItems(Document dom, Document dom1,String xtraParams, String actionType) throws RemoteException,ITMException 
 	{
 		System.out.println("xmlString from StockTransferActEJB :" + dom+ " \n xmlString1 :" + dom1);
-		String refIdFor="",refSerFor = "", lineNo="",acctCodeDr="",cctrCodeDr="",locCodeTo="";
+		String refIdFor="",refSerFor = "", lineNo="",acctCodeDr="",cctrCodeDr="",locCodeTo="",trantype="";
 		//int lineCntr=0;
 		ResultSet rs = null;
 		Connection conn = null;
@@ -99,6 +99,11 @@ public class StockTransferAct extends ActionHandlerEJB implements
 			refIdFor = genericUtility.getColumnValue("ref_id__for", dom1);
 			System.out.println("Reference id::::::::["+refIdFor+"]"); 
 			
+			//Added by mayur on 17-July-2018--[start]
+			trantype = genericUtility.getColumnValue("tran_type", dom1);
+			System.out.println("Tran Type::::::::["+trantype+"]");
+			//Added by mayur on 17-July-2018--[end]
+
 			if(refIdFor != null && refIdFor.trim().length() >  0)
 			{
 				System.out.println("Inside reference id for");	
@@ -142,7 +147,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 					System.out.println("cctrCodeDr ::["+cctrCodeDr+"]");
 					//System.out.println("Location code ::" + locCode);
 
-					valueXmlString.append( StockDetails(itemCode,locCodeTo,acctCodeDr,cctrCodeDr,siteCodeReq, availableYn, remainingQty, conn ) );
+					valueXmlString.append( StockDetails(trantype,itemCode,locCodeTo,acctCodeDr,cctrCodeDr,siteCodeReq, availableYn, remainingQty, conn ) );
 					
 				}//end of while loop
 				rs.close();
@@ -192,7 +197,7 @@ public class StockTransferAct extends ActionHandlerEJB implements
 					System.out.println("acctCodeDr ::["+acctCodeDr+"]");
 					System.out.println("cctrCodeDr ::["+cctrCodeDr+"]");
 									
-					valueXmlString.append( StockDetails( itemCode,locCodeTo,acctCodeDr,cctrCodeDr,siteCodeReq, "Y", remainingQty, conn ) );
+					valueXmlString.append( StockDetails( trantype,itemCode,locCodeTo,acctCodeDr,cctrCodeDr,siteCodeReq, "Y", remainingQty, conn ) );
 					
 				}//end of while 
 				rs.close();
@@ -239,10 +244,10 @@ public class StockTransferAct extends ActionHandlerEJB implements
 
 	} // End of actionAllItems method
 	
-	 private String StockDetails(String itemCode,String locCodeTo,String acctCodeDr,String cctrCodeDr,String siteCodeReq,String availableYn,double remainingQty,Connection conn) throws ITMException
+	 private String StockDetails(String trantype,String itemCode,String locCodeTo,String acctCodeDr,String cctrCodeDr,String siteCodeReq,String availableYn,double remainingQty,Connection conn) throws ITMException
 	 {
 		 HashMap<String, Double> hm = new HashMap<String, Double>();
-		 String lotNum="",lotSerial="", accountInv="",costCenInv="",remarks="",locCodeFr="";
+		 String lotNum="",lotSerial="", accountInv="",costCenInv="",remarks="",locCodeFr="",udfStr1="";
 		 double noArt = 0;
 		 double hmQty = 0d;
 		 double inputQty = 0d;
@@ -254,8 +259,29 @@ public class StockTransferAct extends ActionHandlerEJB implements
 
 		 try
 		 {
+			//Added by mayur on 18-July-2018--[start]
+			 String sql1 = "SELECT GEN.UDF_STR1 FROM GENCODES GEN"
+						+" WHERE GEN.FLD_NAME = 'TRAN_TYPE'"
+				 		+" AND GEN.MOD_NAME = 'W_STOCK_TRANSFER' "
+						+" AND GEN.FLD_VALUE =  ? ";
+				 System.out.println("sql :" + sql1);
+				 pstmt1 = conn.prepareStatement( sql1 );	
+				 pstmt1.setString(1,trantype);											
+				 rs1 = pstmt1.executeQuery();
+				 
+				 if (rs1.next())
+				 {
+					udfStr1 = rs1.getString( "UDF_STR1" );
+					System.out.println("udfStr1["+udfStr1+"]");
+				 }
+				 
+				 rs1.close();
+				 rs1 = null;
+				 pstmt1.close();
+				 pstmt1 = null;					 
+		        //Added by mayur on 18-July-2018--[end]			
 
-			 String sql = "SELECT STOCK.ITEM_SER, "
+				 String sql2 = "SELECT STOCK.ITEM_SER, "
 						 + "STOCK.ITEM_CODE,"
 						 + "STOCK.UNIT, "
 						 + "STOCK.LOC_CODE,"
@@ -271,20 +297,28 @@ public class StockTransferAct extends ActionHandlerEJB implements
 						 + "STOCK.ACCT_CODE__INV, " 
 						 + "STOCK.CCTR_CODE__INV, " 					
 						 + "STOCK.RATE "
-					 + " FROM STOCK,INVSTAT"
-					 + " WHERE STOCK.INV_STAT = INVSTAT.INV_STAT"
+						 + "FROM STOCK,INVSTAT,LOCATION"
+						 + " WHERE LOCATION.INV_STAT = INVSTAT.INV_STAT" //Changes by mayur on 20-July-2018
+						 + " AND STOCK.LOC_CODE = LOCATION.LOC_CODE"     //Changes by mayur on 20-July-2018
 						 + " AND STOCK.ITEM_CODE = ? "   
 						 + " AND STOCK.SITE_CODE = ? "     
 						 + " AND STOCK.QUANTITY - STOCK.ALLOC_QTY > 0"
 						 + " AND INVSTAT.AVAILABLE = ? ";
+				         //Added by mayur on 18-July-2018--[start]
+				         if(udfStr1 != null && udfStr1.trim().length() > 0)
+				         {
+				           sql2= sql2 + " AND LOCATION.LOC_GROUP =  '"+udfStr1+"' "; 
+				           System.out.println("sql2 :" + sql2);			
+				         }
+				         //Added by mayur on 18-July-2018--[end]
 				         
-			 System.out.println("sql :" + sql);
-			 pstmt1 = conn.prepareStatement( sql );
+				 pstmt1 = conn.prepareStatement( sql2 );
 				 pstmt1.setString(1,itemCode);				
 				 pstmt1.setString(2,siteCodeReq);
 				 pstmt1.setString(3,availableYn);	
 				 rs1 = pstmt1.executeQuery();
 
+
 			 System.out.println(":::STOCK DETAILS:::");		
 			 System.out.println("itemCode ::["+itemCode+"]");			
 			 System.out.println("siteCodeReq ::["+siteCodeReq+"]");		
@@ -300,6 +334,8 @@ public class StockTransferAct extends ActionHandlerEJB implements
 				 accountInv = rs1.getString( "ACCT_CODE__INV" );
 				 costCenInv = rs1.getString( "CCTR_CODE__INV" );
 
+				 
+				 System.out.println("locCodeFr :["+locCodeFr+"]");
 				 System.out.println("lotNum :["+lotNum+"]");
 				 System.out.println("lotSerial :["+lotSerial+"]");				
 				 System.out.println("noArt :["+noArt+"]");