Commit cfeb9924 authored by msharma's avatar msharma

Issue Tracker point no:251 Stock Transfer with lock received from rohan,

Stocks transfer from GRL to GRL with locks applied does not update the
actual rate in stock table , it goes 0


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93520 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 639ca4c7
...@@ -106,6 +106,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -106,6 +106,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
double batchSize = 0d; double batchSize = 0d;
double stkGrossRate = 0d; double stkGrossRate = 0d;
double stkRate = 0d; double stkRate = 0d;
//Changed by Rohan on 19-08-13 for getting atual rate
double actualRate = 0d;
// 16/10/11 manoharan // 16/10/11 manoharan
double stkQuantity = 0,holdQuantity = 0; double stkQuantity = 0,holdQuantity = 0;
//Changed by Rohan on 06-08-13 for define variable //Changed by Rohan on 06-08-13 for define variable
...@@ -205,7 +207,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -205,7 +207,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
+ "exp_date, pack_code, mfg_date, site_code__mfg, " + "exp_date, pack_code, mfg_date, site_code__mfg, "
+ "pack_instr, supp_code__mfg, retest_date, " + "pack_instr, supp_code__mfg, retest_date, "
+ "gross_rate, rate, conv__qty_stduom, unit__alt, batch_no, batch_size, " + "gross_rate, rate, conv__qty_stduom, unit__alt, batch_no, batch_size, "
+ "unit, grade, remarks, dimension, quantity ,hold_qty " //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 "
+ "from stock " + "from stock "
+ "where item_code = ? " + "where item_code = ? "
+ "and site_code = ? " + "and site_code = ? "
...@@ -269,6 +273,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -269,6 +273,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
restestDate = rsStock.getTimestamp("retest_date"); restestDate = rsStock.getTimestamp("retest_date");
stkGrossRate = rsStock.getDouble("gross_rate"); stkGrossRate = rsStock.getDouble("gross_rate");
stkRate = rsStock.getDouble("rate"); stkRate = rsStock.getDouble("rate");
System.out.println("stkGrossRate"+stkGrossRate+"stkRate"+stkRate);
convQtyStduom = rsStock.getDouble("conv__qty_stduom"); convQtyStduom = rsStock.getDouble("conv__qty_stduom");
unitAlt = rsStock.getString("unit__alt"); unitAlt = rsStock.getString("unit__alt");
batchNo = rsStock.getString("batch_no"); batchNo = rsStock.getString("batch_no");
...@@ -281,6 +286,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -281,6 +286,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
stkQuantity = rsStock.getDouble("quantity"); stkQuantity = rsStock.getDouble("quantity");
holdQuantity = rsStock.getDouble("hold_qty"); holdQuantity = rsStock.getDouble("hold_qty");
// end 16/10/11 manoharan hold_qty added // end 16/10/11 manoharan hold_qty added
//Changed by Rohan on 19-08-13 for getting atual rate
actualRate = rsStock.getDouble("actual_rate");
} }
rsStock.close(); rsStock = null; rsStock.close(); rsStock = null;
pstmtStock.clearParameters(); pstmtStock.clearParameters();
...@@ -312,6 +319,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -312,6 +319,7 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
updateRowMap.put("cctr_code_inv",cctrCodeCr); updateRowMap.put("cctr_code_inv",cctrCodeCr);
updateRowMap.put("rate",Double.toString(stkRate)); updateRowMap.put("rate",Double.toString(stkRate));
updateRowMap.put("gross_rate",Double.toString(stkGrossRate)); updateRowMap.put("gross_rate",Double.toString(stkGrossRate));
System.out.println("stkGrossRate:::"+Double.toString(stkRate)+"stkRate::::"+Double.toString(stkGrossRate));
updateRowMap.put("tran_id", tranId ); updateRowMap.put("tran_id", tranId );
updateRowMap.put("tran_date", tranDate ); updateRowMap.put("tran_date", tranDate );
updateRowMap.put("tran_type","ID"); updateRowMap.put("tran_type","ID");
...@@ -338,6 +346,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -338,6 +346,8 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
//End changes by gulzar on 12/24/2011 //End changes by gulzar on 12/24/2011
retString = stkUpdate.updateStock( updateRowMap, xtraParams, conn ); retString = stkUpdate.updateStock( updateRowMap, xtraParams, conn );
System.out.println("Update stock complter1111");
if ( retString != null && retString.trim().length() > 0 ) if ( retString != null && retString.trim().length() > 0 )
{ {
isError = true; isError = true;
...@@ -365,6 +375,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer ...@@ -365,6 +375,9 @@ public class StockTransferConf extends ActionHandlerEJB implements StockTransfer
} }
//Chnaged by Rohan on 29-07-13 for setting no art as quantity in case of location code to is PGRL.end //Chnaged by Rohan on 29-07-13 for setting no art as quantity in case of location code to is PGRL.end
/* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as quantity at the time of receipt [END] */ /* Added by Ashish Sonawane on 07-sep-12 as per Manoharan Sir in case of partial GRL no_art to be set as quantity at the time of receipt [END] */
//Chnaged by Rohan on 19-08-13 for updating atual rate in transfered stock.
updateRowMap.put("actual_rate", actualRate);
retString = stkUpdate.updateStock( updateRowMap, xtraParams, conn ); retString = stkUpdate.updateStock( updateRowMap, xtraParams, conn );
if ( retString != null && retString.trim().length() > 0 ) if ( retString != null && retString.trim().length() > 0 )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment