Commit 0a9cb8e8 authored by sbade's avatar sbade

Added Pack Ref Field


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93037 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d30c579b
...@@ -141,7 +141,7 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote ...@@ -141,7 +141,7 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote
sql = sql + " stock.qty_per_art ,stock.batch_size , " sql = sql + " stock.qty_per_art ,stock.batch_size , "
+" sum(case when stock.hold_qty is null then 0 else stock.hold_qty end) hold_qty, " +" sum(case when stock.hold_qty is null then 0 else stock.hold_qty end) hold_qty, "
+" stock.mfg_date, stock.no_art, stock.rate " +" stock.mfg_date, stock.no_art, stock.rate,stock.pack_ref "
+" FROM invstat ,item ,location ,site ,stock " +" FROM invstat ,item ,location ,site ,stock "
+" WHERE ( location.inv_stat = invstat.inv_stat ) " +" WHERE ( location.inv_stat = invstat.inv_stat ) "
+" and ( stock.loc_code = location.loc_code ) " +" and ( stock.loc_code = location.loc_code ) "
...@@ -154,7 +154,7 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote ...@@ -154,7 +154,7 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote
+" stock.lot_no ,stock.lot_sl ,location.inv_stat ,invstat.available ,stock.retest_date , " +" stock.lot_no ,stock.lot_sl ,location.inv_stat ,invstat.available ,stock.retest_date , "
+" stock.exp_date ,stock.unit ,stock.potency_perc ,stock.batch_no ,stock.dimension , " +" stock.exp_date ,stock.unit ,stock.potency_perc ,stock.batch_no ,stock.dimension , "
+" stock.supp_code__mfg ,stock.pack_code ,stock.qty_per_art , " +" stock.supp_code__mfg ,stock.pack_code ,stock.qty_per_art , "
+" stock.batch_size, stock.mfg_date, stock.no_art, stock.rate " +" stock.batch_size, stock.mfg_date, stock.no_art, stock.rate,stock.pack_ref "
+" ORDER BY stock.site_code ASC, stock.item_code ASC, " +" ORDER BY stock.site_code ASC, stock.item_code ASC, "
+" stock.loc_code ASC, stock.lot_no ASC, stock.lot_sl ASC, location.inv_stat ASC "; +" stock.loc_code ASC, stock.lot_no ASC, stock.lot_sl ASC, location.inv_stat ASC ";
...@@ -187,7 +187,9 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote ...@@ -187,7 +187,9 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote
thisBean.holdQuant = rs.getDouble(24); thisBean.holdQuant = rs.getDouble(24);
thisBean.mfgDate = rs.getString(25) == null ? "" : genericUtility.getValidDateString(rs.getString(25),genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat()); thisBean.mfgDate = rs.getString(25) == null ? "" : genericUtility.getValidDateString(rs.getString(25),genericUtility.getDBDateFormat(),genericUtility.getApplDateFormat());
thisBean.noArt = rs.getString(26); //Changed By Dipak Chattar On 15 Nov 2011 thisBean.noArt = rs.getString(26); //Changed By Dipak Chattar On 15 Nov 2011
thisBean.rate = rs.getString(27); ////Changed By Dipak Chattar On 15 Nov 2011 thisBean.rate = rs.getString(27);
thisBean.packRef = rs.getString(28);//added By Swati Bade On 09 May 2013
thisBean.currDateTs = getCurrdateTimestmp(); thisBean.currDateTs = getCurrdateTimestmp();
avl = thisBean.quantity - thisBean.allocQuant; avl = thisBean.quantity - thisBean.allocQuant;
thisBean.netAvailable = Double.toString(avl);//balance thisBean.netAvailable = Double.toString(avl);//balance
...@@ -288,7 +290,7 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote ...@@ -288,7 +290,7 @@ public class StockHelp implements StockHelpLocal,StockHelpRemote
String currLocCode = "", currLotNo = "", currLotSl = "", invStat = "", retestDate = ""; String currLocCode = "", currLotNo = "", currLotSl = "", invStat = "", retestDate = "";
String expDate = "",unit = "", potencyPerc = "", batchNo = "", netAvailable = ""; String expDate = "",unit = "", potencyPerc = "", batchNo = "", netAvailable = "";
String dimention = "", suppCodeMfg = "", ppoQty = "", pindQty = "", packCode = ""; String dimention = "", suppCodeMfg = "", ppoQty = "", pindQty = "", packCode = "";
String qtyPerArt = "", batchSize = "", mfgDate = "", rate = "", noArt = ""; String qtyPerArt = "", batchSize = "", mfgDate = "", rate = "", noArt = "" , packRef = "";
String itemCode = "", available = ""; String itemCode = "", available = "";
double quantity = 0, availQuant = 0, holdQuant = 0, allocQuant = 0; double quantity = 0, availQuant = 0, holdQuant = 0, allocQuant = 0;
java.sql.Timestamp currDateTs = null; java.sql.Timestamp currDateTs = null;
......
...@@ -17,7 +17,7 @@ public class StockHelpBean ...@@ -17,7 +17,7 @@ public class StockHelpBean
String itemCode = ""; String itemCode = "";
public String locCode = "",lotNo = "",locSl = "",unit = "",dimention = "", mfgDate = ""; public String locCode = "",lotNo = "",locSl = "",unit = "",dimention = "", mfgDate = "";
public String quantity = "",allocQty = "",netAvailable = "",available = "", noArt = "", itemCodeStk = ""; public String quantity = "",allocQty = "",netAvailable = "",available = "", noArt = "", itemCodeStk = "";
public String retestDate = "",expDate = "",potency = "",suppCodeMfg = "",batchNo = "", rate = ""; public String retestDate = "",expDate = "",potency = "",suppCodeMfg = "",batchNo = "", rate = "", packRef = "";
public String packCode = "", invStat = "", holdQuant = "", qtyPerArt = "", batchSize = ""; public String packCode = "", invStat = "", holdQuant = "", qtyPerArt = "", batchSize = "";
public String ppoQty = "", pindQty = ""; public String ppoQty = "", pindQty = "";
public HashMap beanLotQuantMap = new HashMap(); public HashMap beanLotQuantMap = new HashMap();
...@@ -64,6 +64,7 @@ public class StockHelpBean ...@@ -64,6 +64,7 @@ public class StockHelpBean
stkHlpBean.mfgDate = stkParms.mfgDate; stkHlpBean.mfgDate = stkParms.mfgDate;
stkHlpBean.noArt = stkParms.noArt; stkHlpBean.noArt = stkParms.noArt;
stkHlpBean.rate = stkParms.rate; stkHlpBean.rate = stkParms.rate;
stkHlpBean.available = stkParms.available; stkHlpBean.available = stkParms.available;
stkHlpBean.unit = stkParms.unit; stkHlpBean.unit = stkParms.unit;
stkHlpBean.quantity = Double.toString(stkParms.quantity); stkHlpBean.quantity = Double.toString(stkParms.quantity);
...@@ -82,6 +83,7 @@ public class StockHelpBean ...@@ -82,6 +83,7 @@ public class StockHelpBean
stkHlpBean.currDateTs = stkParms.currDateTs; stkHlpBean.currDateTs = stkParms.currDateTs;
stkHlpBean.qtyPerArt = stkParms.qtyPerArt; stkHlpBean.qtyPerArt = stkParms.qtyPerArt;
stkHlpBean.batchSize = stkParms.batchSize; stkHlpBean.batchSize = stkParms.batchSize;
stkHlpBean.packRef = stkParms.packRef; //added by swati bade on 09-May-2013
stkHlpBean.ppoQty = stkParms.ppoQty; stkHlpBean.ppoQty = stkParms.ppoQty;
stkHlpBean.pindQty = stkParms.pindQty; stkHlpBean.pindQty = stkParms.pindQty;
thisBeanArray.add(stkHlpBean); thisBeanArray.add(stkHlpBean);
......
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