Commit a0b160fd authored by ppatro's avatar ppatro

Changed By Pragyan Parcel Picking /LTL to Master & Parcel covert


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92753 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 6fec68ec
...@@ -841,7 +841,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -841,7 +841,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
isActives = false; isActives = false;
orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY STOCK.EXP_DATE, STOCK.LOC_CODE "; orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY STOCK.EXP_DATE, STOCK.LOC_CODE ";
}*/ }*/
if(directPickLoc.length() > 0) //if(directPickLoc.length() > 0)
if(directPickLoc != null && directPickLoc.length() > 0)
{ {
orderByStkStr = "AND LOCATION.LOC_CODE IN(?) ORDER BY STOCK.EXP_DATE,LOCATION.INV_STAT, STOCK.LOC_CODE "; orderByStkStr = "AND LOCATION.LOC_CODE IN(?) ORDER BY STOCK.EXP_DATE,LOCATION.INV_STAT, STOCK.LOC_CODE ";
} }
...@@ -929,7 +930,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -929,7 +930,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtStock.setString(8,deepStoreLoc); pstmtStock.setString(8,deepStoreLoc);
//Changed by Rohan on 29-12-11 as said by gulzar sir.end //Changed by Rohan on 29-12-11 as said by gulzar sir.end
*/ */
if(directPickLoc.length() > 0) if(directPickLoc != null && directPickLoc.length() > 0)
{ {
pstmtStock = conn.prepareStatement(sSQL + orderByStkStr); pstmtStock = conn.prepareStatement(sSQL + orderByStkStr);
pstmtStock.setString(1,"Y"); pstmtStock.setString(1,"Y");
......
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