Skip to content

B
business-java
Commit 9015763e authored by rtiwari's avatar rtiwari
Browse files
Options

CHANGE IN ORDER BY EXP. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95012 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ebf76b71
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
webitm-dis/ibase/webitm/ejb/dis/StockAllocIc.java
View file @ 9015763e
......@@ -1203,8 +1203,9 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
else
{
isActives = false;
orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
isActives = false; //CHANGE BY RITESH ON 30/APR/14
// orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF_CASE, STOCK.LOC_CODE ";
}
/*if ( singleLot.trim().length() > 0 && singleLot.trim().equalsIgnoreCase("Y") )
......@@ -1798,8 +1799,9 @@ public class StockAllocIc extends ValidatorEJB implements StockAllocIcLocal, Sto
}
else
{
isActives = false;
orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
isActives = false; //CHANGE BY RITESH ON 30/APR/14
// orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END,INVSTAT.ALLOC_PREF_CASE, STOCK.LOC_CODE ";
}
......
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