Commit 09437d0b authored by manohar's avatar manohar

stock,allocate and all items sorting order changes as per ITM


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92415 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dcd48fdd
...@@ -1663,7 +1663,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1663,7 +1663,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
sql = sql + " AND c.loc_group = '" + locGroup + "' "; sql = sql + " AND c.loc_group = '" + locGroup + "' ";
} }
// added by cpatil start on 9/11/12 // added by cpatil start on 9/11/12
sql = sql + "order by (CASE WHEN SUM(A.QUANTITY - A.ALLOC_QTY) IS NULL THEN 0 ELSE SUM(A.QUANTITY - A.ALLOC_QTY) END) "; //sql = sql + "order by (CASE WHEN SUM(A.QUANTITY - A.ALLOC_QTY) IS NULL THEN 0 ELSE SUM(A.QUANTITY - A.ALLOC_QTY) END) ";
// " order by sum( (case when quantity is null then 0 else quantity end) " + // " order by sum( (case when quantity is null then 0 else quantity end) " +
// " - (case when alloc_qty is null then 0 else alloc_qty end) " + // " - (case when alloc_qty is null then 0 else alloc_qty end) " +
// " - (case when hold_qty is null then 0 else hold_qty end) )"; // " - (case when hold_qty is null then 0 else hold_qty end) )";
...@@ -1773,7 +1773,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1773,7 +1773,7 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
else else
{ {
sql = sql + " nvl(a.exp_date,a.crea_date),a.crea_date,a.lot_no, " sql = sql + " order by nvl(a.exp_date,a.crea_date),a.crea_date,a.lot_no, "
+ " decode(length(decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) ," + + " decode(length(decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) ," +
" 'S',(substr(rtrim(a.lot_sl),1,length(rtrim(a.lot_sl)) - 1)) ,rtrim(a.lot_sl)) ), " " 'S',(substr(rtrim(a.lot_sl),1,length(rtrim(a.lot_sl)) - 1)) ,rtrim(a.lot_sl)) ), "
+ " 1, '00' || decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) , " + + " 1, '00' || decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) , " +
...@@ -1997,13 +1997,13 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL ...@@ -1997,13 +1997,13 @@ public class WOrderIssueAct extends ActionHandlerEJB implements WOrderIssueActL
} }
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME)) if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME))
{ {
sql = sql + " nvl(a.exp_date,a.crea_date),a.crea_date,a.lot_no "; sql = sql + " order by nvl(a.exp_date,a.crea_date),a.crea_date,a.lot_no ";
//System.out.println("after sql db converted --["+sql+"]->."); //System.out.println("after sql db converted --["+sql+"]->.");
} }
else else
{ {
sql = sql + " nvl(a.exp_date,a.crea_date),a.crea_date,a.lot_no, " sql = sql + " order by nvl(a.exp_date,a.crea_date),a.crea_date,a.lot_no, "
+ " decode(length(decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) ," + + " decode(length(decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) ," +
" 'S',(substr(rtrim(a.lot_sl),1,length(rtrim(a.lot_sl)) - 1)) ,rtrim(a.lot_sl)) ), " " 'S',(substr(rtrim(a.lot_sl),1,length(rtrim(a.lot_sl)) - 1)) ,rtrim(a.lot_sl)) ), "
+ " 1, '00' || decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) , " + + " 1, '00' || decode( substr(rtrim(a.lot_sl), length(rtrim(a.lot_sl))) , " +
......
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