compare with pb code and add missing code...

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

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

@@ -12,6 +12,7 @@ import ibase.webitm.ejb.ITMDBAccessEJB;
 import ibase.webitm.ejb.dis.DistCommon;
 import ibase.webitm.ejb.dis.InvAllocTraceBean;
 import ibase.webitm.ejb.dis.StockUpdate;
+import ibase.webitm.ejb.fin.FinCommon;
 import ibase.webitm.ejb.fin.InvAcct;
 import ibase.webitm.utility.GenericUtility;
 import ibase.webitm.utility.ITMException;
@@ -116,9 +117,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 		double stkQuantity = 0,holdQuantity = 0;
 		//Changed by Rohan on 06-08-13 for define variable
 		double holdQty = 0;
-		PreparedStatement pstmtUpd = null, pstmtHold = null, pstmtRel = null,pstmtQC = null;
-		ResultSet rsHold = null, rsRel = null, rsQC = null;
-		String tranIdHold = "", sqlRel  = "", sqlHold = "",nearExpLoc = "", sqlQC = "";
+		PreparedStatement pstmtUpd = null, pstmtHold = null, pstmtRel = null,pstmtQC = null,pstmtStTr=null,pstmt1=null;
+		ResultSet rsHold = null, rsRel = null, rsQC = null,rsStTr=null,rs1=null;
+		String tranIdHold = "", sqlRel  = "", sqlHold = "",nearExpLoc = "", sqlQC = "",sql1="";
 		String partialUsed = "";
 		int lineNoHold = 0, qcCount = 0;
 		// end 16/10/11 manoharan
@@ -152,6 +153,15 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 		DistCommon dComm = new DistCommon();
 		double balQty = 0;
 		boolean isConn=false;//added by somanath on 03.08.13
+		
+		String sqlStTr="";
+		String refSerFor="",refIdFor="",reasCode="",invStat="",lotSlOrg="";  //,partialUsed="";
+		double potencyPerc=0,grossWeight=0,tareWeight=0,netWeight=0; //,actualRate=0;
+		FinCommon finCommon = new FinCommon();
+		DistCommon discommon = new DistCommon();
+		String acctCode="",cctrCode="",invacct="",trfacct="",itemSer="",cctrCodeDr="";  //lotNoTo="",;
+		
+		
 		try
 		{
 			if ( conn == null )
@@ -205,11 +215,28 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 				partialGrlLoc = dComm.getDisparams("999999","PGRL_INVSTAT",conn);
 
 				sql = "SELECT LINE_NO, ITEM_CODE, QUANTITY, LOC_CODE__FR, LOC_CODE__TO, LOT_NO__FR, LOT_SL__FR, LOT_SL__TO, ACCT_CODE__CR, CCTR_CODE__CR, NO_ART ,LOT_NO__TO " +
-						"FROM STOCK_TRANSFER_DET WHERE TRAN_ID = ? ";
+					  ",acct_code__dr,cctr_code__dr  " +             // added by cpatil on 20/11/13 compare with pb code and adding missing field
+					  "FROM STOCK_TRANSFER_DET WHERE TRAN_ID = ? ";
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1, tranId);
 				rs = pstmt.executeQuery();
 
+				sqlStTr = " SELECT ref_ser__for, ref_id__for, reas_code  "     // added by cpatil on 20/11/13 compare with pb code and adding missing field 
+					     +" FROM STOCK_TRANSFER WHERE TRAN_ID = ? ";
+					pstmtStTr = conn.prepareStatement(sqlStTr);
+					pstmtStTr.setString(1, tranId);
+					rsStTr = pstmtStTr.executeQuery();
+					if(rsStTr.next())
+					{
+						refSerFor = rsStTr.getString("ref_ser__for");   
+						refIdFor = rsStTr.getString("ref_id__for");
+						reasCode = rsStTr.getString("reas_code");
+					}
+					rsStTr.close();rsStTr = null;
+					pstmtStTr.close();pstmtStTr = null;
+					
+					
+				
 				// 16/10/11 manoharan quantity, hold_qty added
 				sql = "select acct_code__inv, cctr_code__inv, "
 						+ "exp_date, pack_code, mfg_date, site_code__mfg, "
@@ -218,7 +245,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 						//Changed by Rohan on 19-08-13 for getting atual rate
 						//+ "unit, grade, remarks, dimension, quantity ,hold_qty "
 						+ "unit, grade, remarks, dimension, quantity ,hold_qty,actual_rate ,partial_used  "
-						+ "from stock "
+						+ ",potency_perc, inv_stat, gross_weight, tare_weight, net_weight, lot_sl__org 	  "   // added by cpatil on 20/11/13 compare with pb code and adding missing field
+                        + "from stock "
 						+ "where item_code = ? "
 						+ "and site_code = ? "
 						+ "and loc_code = ? "
@@ -242,6 +270,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 					acctCodeCr = rs.getString( "ACCT_CODE__CR" );
 					cctrCodeCr = rs.getString( "CCTR_CODE__CR" );
 
+					acctCodeDr = rs.getString( "ACCT_CODE__DR" );         //  cpatil
+					cctrCodeDr = rs.getString( "CCTR_CODE__DR" );         //  cpatil
+					
 					// 16/10/11 manoharan initialise quantity, hold_qty
 					stkQuantity = 0;
 					holdQuantity = 0;
@@ -398,6 +429,19 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 						actualRate = rsStock.getDouble("actual_rate");
 						partialUsed =  checkNull(rsStock.getString("partial_used"));
 						
+						// added by cpatil on 20/11/13 start
+						
+						potencyPerc = rsStock.getDouble("potency_perc");    
+						grossWeight = rsStock.getDouble("gross_weight");    
+						tareWeight = rsStock.getDouble("tare_weight");      
+						netWeight = rsStock.getDouble("net_weight");        
+						lotSlOrg = rsStock.getString("lot_sl__org");        
+						
+						// added by cpatil on 20/11/13 end
+						
+						
+						
+						
 						/* temporary comment code by kunal on 16/NOV/13
 
 						//added by kunal on 25/oct/13
@@ -529,6 +573,53 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 					updateRowMap.put("batch_size", ""+batchSize);
 					//End changes by gulzar on 12/24/2011
 
+					// added by cpatil on 20/11/13  start 
+					itemSer = discommon.getItemSer(itemCode, siteCode, tranDate, "","", conn);
+					cctrCode = finCommon.getAcctDetrTtype(itemCode, itemSer, "XFRX", " ", conn);
+					acctCode = cctrCode.substring(0,cctrCode.indexOf(","));
+					cctrCode = cctrCode.substring(cctrCode.indexOf(",")+1);
+					
+					if ( cctrCodeDr != null && cctrCodeDr.trim().length() > 0)
+					{
+						if ( acctCode == null ||acctCode.trim().length() == 0 )
+						{	
+							invacct = finCommon.getFinparams("999999", "INVENTORY_ACCT", conn);
+							trfacct = finCommon.getFinparams("999999", "INV_ACCT_TRF", conn);
+							if( "Y".equalsIgnoreCase(invacct) || "Y".equalsIgnoreCase(trfacct ))
+							{	
+								isError = true;
+								break;
+								//	errCode = "VTTRFACT";   // ~tSTOCK TRANSFER ACCOUNT NOT FOUND"
+								//	return errCode;	
+							}
+						}
+					}
+					updateRowMap.put("acct_code__dr",acctCode);   
+					if( cctrCode == null || cctrCode.trim().length() == 0 )
+					{
+						updateRowMap.put("cctr_code__dr",cctrCodeDr); 
+					}		
+					else
+					{
+						updateRowMap.put("cctr_code__dr",cctrCode);   
+					}
+					
+					updateRowMap.put("ref_ser__for",refSerFor);  
+					updateRowMap.put("ref_id__for",refIdFor);    
+					updateRowMap.put("reas_code",reasCode);    
+					updateRowMap.put("potency_perc",potencyPerc);  
+					updateRowMap.put("inv_stat",invStat);    
+					if( stkQuantity != 0)
+					{
+						updateRowMap.put("gross_weight", ( grossWeight / stkQuantity * quantity )); 
+						updateRowMap.put("tare_weight", ( tareWeight / stkQuantity * quantity ));   
+						updateRowMap.put("net_weight", ( netWeight / stkQuantity * quantity ));    
+					}
+					updateRowMap.put("lot_sl__org",lotSl);    
+					
+					// added by cpatil on 20/11/13  end
+					
+					
 					retString = stkUpdate.updateStock( updateRowMap, xtraParams, conn );
 
 					System.out.println("Update stock complter1111");
@@ -538,6 +629,24 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 						break;
 					}
 
+					
+					// 	added by cpatil on 20/11/13  start
+					
+					sql1 = " select inv_stat from location where loc_code = ?  ";
+					pstmt1 = conn.prepareStatement(sql1);
+					pstmt1.setString(1, tranId);
+					rs1 = pstmt1.executeQuery();
+					if(rs1.next())
+					{
+						invStat = rs1.getString("inv_stat");
+					}
+					rs1.close();rs1 = null;
+					pstmt1.close();pstmt1 = null;
+					
+					// added by cpatil on 20/11/13  end
+					
+					
+					
 					updateRowMap.put("loc_code", locCodeTo);
 					updateRowMap.put("lot_sl", lotSlTo);
 					updateRowMap.put("tran_type", "R");
@@ -565,6 +674,30 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
 					System.out.println("partialUsed=="+partialUsed);
 					updateRowMap.put("partial_used", partialUsed);
 
+					
+					// 	added by cpatil on 20/11/13  start
+					
+					updateRowMap.put("lot_no",lotNoTo);   //  cpatil 
+					updateRowMap.put("inv_stat",invStat);
+					updateRowMap.put("acct_code__cr",acctCode);  
+					if ( cctrCode == null || cctrCode.trim().length() == 0 )
+					{
+						updateRowMap.put("cctr_code__cr",cctrCodeCr);  		
+					}
+					else
+					{
+						updateRowMap.put("cctr_code__cr",cctrCode);   
+					}
+					updateRowMap.put("acct_code__dr",acctCodeDr);    
+					updateRowMap.put("cctr_code__dr",cctrCodeDr);    
+					updateRowMap.put("cctr_code_inv",acctCodeDr);    
+					updateRowMap.put("cctr_code_inv",cctrCodeDr);    
+					updateRowMap.put("ref_ser__for",refSerFor);    
+					updateRowMap.put("ref_id__for",refIdFor);    
+					
+					// added by cpatil on 20/11/13  end
+					
+					
 					retString = stkUpdate.updateStock( updateRowMap, xtraParams, conn );
 					if ( retString != null && retString.trim().length() > 0 )
 					{