UPDATED FOR RATE OR OLDRATE SAME AND AMT DIFF ZERO

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

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

@@ -2097,12 +2097,15 @@ public class InvAcct
 				 	updateAcctMap.put("dr_amt", diffAmt);
 				 	updateAcctMap.put("cr_amt", 0);
 				 	System.out.println("CREDIT MA"+updateAcctMap);
+				 	if(diffAmt != 0)
+				 	{
 				 	errString = finCommon.glTraceUpdate(updateAcctMap,conn);
 					
 					if(errString != null && errString.trim().length() > 0 )
 					{
 						break;
 					}
+				 	}
 			 	//	stk acct debit
 			 	}
 			 	else
@@ -2128,12 +2131,16 @@ public class InvAcct
 				 	updateAcctMap.put("analysis3",analysis3__cr);
 				 	
 				 	System.out.println("DEBIT MA"+updateAcctMap);
+				 	
+				 	if(diffAmt != 0)
+				 	{
 				 	errString = finCommon.glTraceUpdate(updateAcctMap,conn);
 					
 					if(errString != null && errString.trim().length() > 0 )
 					{
 						break;
 					}
+				 	}
 			 		//inrev cred
 			 	}
 			 	
@@ -2157,6 +2164,8 @@ public class InvAcct
 				 	updateAcctMap.put("analysis2",analysis2__dr);
 				 	updateAcctMap.put("analysis3",analysis3__dr);
 				 	System.out.println("DEBIT MA1"+updateAcctMap);
+					if(diffAmt != 0)
+				 	{
 				 	errString = finCommon.glTraceUpdate(updateAcctMap,conn);
 					
 					if(errString != null && errString.trim().length() > 0 )
@@ -2164,6 +2173,7 @@ public class InvAcct
 						break;
 					}
 			 	//	stk acct debit
+				 	}
 			 	
 			 		
 			 	}
@@ -2179,6 +2189,8 @@ public class InvAcct
 				 	updateAcctMap.put("dr_amt", 0);
 				 	updateAcctMap.put("cr_amt", diffAmt);
 				 	System.out.println("CREDIT MA1"+updateAcctMap);
+					if(diffAmt != 0)
+				 	{
 				 	errString = finCommon.glTraceUpdate(updateAcctMap,conn);
 					
 					if(errString != null && errString.trim().length() > 0 )
@@ -2186,6 +2198,7 @@ public class InvAcct
 						break;
 					}
 			 		//inrev cred
+				 	}
 			 	
 			 	}
 			 	

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

@@ -52,7 +52,7 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 		String errCall="";
 		PreparedStatement pstmt=null;
 		String errString="",sql="",loginEmpCode="",siteCode="",itemCode="",locCode="",lotNo="",lotSl="",lineNo="";
-		double PriceListRate=0,amount=0;
+		double PriceListRate=0,amount=0,rateOld=0;
 		ConnDriver ConnDriver = new ConnDriver();
 		Map <String,String>updateStockMap =new HashMap<String,String>();
 		
@@ -99,7 +99,7 @@ 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,d.line_no "
+			sql="select h.site_code,d.rate,d.item_code,d.loc_code,d.lot_no,d.lot_sl,d.line_no,d.rate__old "
 					+ "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);
@@ -110,9 +110,10 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 				  PriceListRate=rs.getDouble(2);
 				  itemCode=checkNull(rs.getString(3));
 				  locCode=checkNull(rs.getString(4));
-				  lotNo=checkNull(rs.getString(5));
-				  lotSl=checkNull(rs.getString(6));
+				  lotNo=rs.getString(5);
+				  lotSl=rs.getString(6);
 				  lineNo=checkNull(rs.getString(7));
+				  rateOld=rs.getDouble(8);
 				  
 				  updateStockMap.put("price_list_rate",Double.toString(PriceListRate));
 				  updateStockMap.put("item_code",itemCode);
@@ -120,6 +121,7 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 				  updateStockMap.put("loc_code",locCode);
 				  updateStockMap.put("lot_no",lotNo);
 				  updateStockMap.put("lot_sl",lotSl);
+				  updateStockMap.put("rate__old",Double.toString(rateOld));
 				  
 				  
 				  errCall = inv.stkAdjust(tranId,lineNo,conn);
@@ -136,22 +138,18 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 				  count=updateStockValAdj(conn, loginEmpCode, tranId);
 				  System.out.println("updateStockRateAsPerPriceListRate count-->["+count+"]");
 				  if(count > 0){
-					  System.out.println("654321");
-					  
-					  System.out.println("123456");
-					 
-					  
+					
 					  count=updateStockRateAsPerPriceListRate(conn, updateStockMap);
 					 
 					  System.out.println("updateStockValAdj-->>["+count+"]");
-					  if(count > 0){
+					  
 						  //confirmed messages show.............
 						  System.out.println("COMMITING RECORD");
 						  
 						  errString = itmdbAccess.getErrorString("", "STKVACONF", "", "", conn);
 							//return errString;
 							
-					  }
+					  
 				  }else{
 					//disply error message.
 					  conn.rollback();
@@ -246,7 +244,13 @@ public class StockValAdjTranConf extends ActionHandlerEJB implements StockValAdj
 public int updateStockRateAsPerPriceListRate(Connection conn,Map<String,String> updateStockMap){
     PreparedStatement pstmt=null;
     String sql="";
+    double rate = 0,oldRate=0;
+    rate = Double.parseDouble(updateStockMap.get("price_list_rate"));
+    oldRate = Double.parseDouble(updateStockMap.get("rate__old"));
+    System.out.println("rate++oldRate>>>"+rate+">>>"+oldRate);
     int count=0;
+    if(rate != oldRate){
+    
     try{
             sql="update stock set rate = ? where item_code= ? and site_code = ? and loc_code = ? "
                             + "and lot_no = ? and lot_sl = ?";
@@ -266,8 +270,9 @@ public int updateStockRateAsPerPriceListRate(Connection conn,Map<String,String>
             System.out.println("Exception in updateStockRateAsPerPriceListRate----------");
                 e.printStackTrace();
         }
+    }
         return count;
-
+    
 }
 
 private int updateStockValAdj(Connection conn,String loginEmpCodeL,String tranId){