updated for multiple records

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

webitm-fin/ibase/webitm/ejb/fin/InvAcct.java

@@ -1918,10 +1918,8 @@ public class InvAcct
 		return errString;
 	}
 
-	public String stkAdjust(String tranId, Connection conn)throws ITMException
+	public String stkAdjust(String tranId,String lineNo, Connection conn)throws ITMException
 	{
-		
-
 		System.out.println("Enter in stkAdjust >>");
 		String siteCode="",itemCode ="",locCode="",lotNo="",lotSl="",itemSer="",acctCode="",cctrCode="";
 		String getAcctCctr="",errString="";
@@ -1946,9 +1944,10 @@ public class InvAcct
 			
 			
 		sql="select h.site_code,d.rate,d.rate__old,d.amount,d.amount__old,d.item_code,d.loc_code,d.lot_no,d.lot_sl,h.item_ser,d.acct_code__inv,d.acct_code__inrev,d.cctr_code__inv,d.cctr_code__inrev,h.tran_type ,h.tran_date,h.eff_date,d.amount__diff "
-				+ "from stock_val_adj h,stock_val_adj_det d where h.tran_id=d.tran_id and d.tran_id = ?";
+				+ "from stock_val_adj h,stock_val_adj_det d where h.tran_id=d.tran_id and d.tran_id = ? and d.line_no = ?";
 		 pstmt=conn.prepareStatement(sql);
 		 pstmt.setString(1, tranId);
+		 pstmt.setString(2, lineNo);
 		  rs=pstmt.executeQuery();
 		  while(rs.next())
 		  {
@@ -2110,7 +2109,7 @@ public class InvAcct
 			 	{
 			 		if(0 > diffAmt)
 			 		{
-			 			diffAmt = amt_old;
+			 			diffAmt = amt_old - amt;
 			 		}
 			 		
 			 		System.out.println("stk credit"+diffAmt);
@@ -2135,7 +2134,7 @@ public class InvAcct
 			 	{
 			 		if(0 > diffAmt)
 			 		{
-			 			diffAmt = amt_old;
+			 			diffAmt = amt_old - amt;
 			 		}
 			 		
 				 	System.out.println("stk debit1"+diffAmt+"{"+acctCdInv+"}{"+cctrCdInv+"");
@@ -2201,8 +2200,6 @@ public class InvAcct
 		
 		
 		
-	
-		
 	}
 	
 

webitm-fin/ibase/webitm/ejb/fin/StockValAdjTranConf.java

@@ -51,7 +51,7 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 		String isError = "";
 		String errCall="";
 		PreparedStatement pstmt=null;
-		String errString="",sql="",loginEmpCode="",siteCode="",itemCode="",locCode="",lotNo="",lotSl="";
+		String errString="",sql="",loginEmpCode="",siteCode="",itemCode="",locCode="",lotNo="",lotSl="",lineNo="";
 		double PriceListRate=0,amount=0;
 		ConnDriver ConnDriver = new ConnDriver();
 		Map <String,String>updateStockMap =new HashMap<String,String>();
@@ -99,19 +99,20 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 			
 		  //VTCONSUCC
 			tranId=tranId==null ? "" :tranId.trim();
-			sql="select h.site_code,d.rate,d.item_code,d.loc_code,d.lot_no,d.lot_sl "
+			sql="select h.site_code,d.rate,d.item_code,d.loc_code,d.lot_no,d.lot_sl,d.line_no "
 					+ "from stock_val_adj h,stock_val_adj_det d where h.tran_id=d.tran_id and d.tran_id = ?";
 			 pstmt=conn.prepareStatement(sql);
 			 pstmt.setString(1, tranId);
 			  rs=pstmt.executeQuery();
 			  while(rs.next()){
-				  
+				  System.out.println(">>>>>>> 143");
 				  siteCode=checkNull(rs.getString(1));				  
 				  PriceListRate=rs.getDouble(2);
 				  itemCode=checkNull(rs.getString(3));
 				  locCode=checkNull(rs.getString(4));
 				  lotNo=checkNull(rs.getString(5));
 				  lotSl=checkNull(rs.getString(6));
+				  lineNo=checkNull(rs.getString(7));
 				  
 				  updateStockMap.put("price_list_rate",Double.toString(PriceListRate));
 				  updateStockMap.put("item_code",itemCode);
@@ -120,7 +121,8 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 				  updateStockMap.put("lot_no",lotNo);
 				  updateStockMap.put("lot_sl",lotSl);
 				  
-				  errCall = inv.stkAdjust(tranId, conn);
+				  
+				  errCall = inv.stkAdjust(tranId,lineNo,conn);
 				  System.out.println(">>>>>>> errCall"+errCall);
 				  
 				  if(errCall.trim().length() > 0)
@@ -145,16 +147,16 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 					  if(count > 0){
 						  //confirmed messages show.............
 						  System.out.println("COMMITING RECORD");
-						  conn.commit();
+						  
 						  errString = itmdbAccess.getErrorString("", "STKVACONF", "", "", conn);
-							return errString;
+							//return errString;
 							
 					  }
 				  }else{
 					//disply error message.
 					  conn.rollback();
 					  errString = itmdbAccess.getErrorString("", "STKVNCONF", "", "", conn);
-						return errString;
+						//return errString;
 					  
 				  }
 				  
@@ -162,9 +164,9 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 			  }
 			  
 			 
+			  conn.commit();
 			  
-			  
-			 
+			  return errString;