Skip to content

B
business-java
Commit 0d43672d authored by ppatro's avatar ppatro
Browse files
Options

issue in max self life 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93565 ce508802-f39f-4f6c-b175-0d175dae99d5
parent dfc38bd4
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ 0d43672d
...@@ -666,13 +666,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -666,13 +666,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(maxSelfLife > 0) if(maxSelfLife > 0)
{ {
minMaxSql = " AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN ? AND ? ) "; minMaxSql = " AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) BETWEEN ? AND ? ) ";
minMaxSqlLot = " AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN ? AND ? ) "; minMaxSqlLot = " AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) BETWEEN ? AND ? ) ";
} }
else else
{ {
minMaxSql = "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) "; minMaxSql = "AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) > ? ) ";
minMaxSqlLot = "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) "; minMaxSqlLot = "AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) > ? ) ";
} }
System.out.println("pendingQty =["+pendingQty+"]"); System.out.println("pendingQty =["+pendingQty+"]");
...@@ -4759,11 +4759,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -4759,11 +4759,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if(maxShelfLife > 0) if(maxShelfLife > 0)
{ {
getDataSql = getDataSql + " AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN ? AND ? ) "; getDataSql = getDataSql + " AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) BETWEEN ? AND ? ) ";
} }
else else
{ {
getDataSql = getDataSql + "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) "; getDataSql = getDataSql + "AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) > ? ) ";
} }
...@@ -4819,11 +4819,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -4819,11 +4819,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//+" ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE "; //+" ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
if(maxShelfLife > 0) if(maxShelfLife > 0)
{ {
getDataSql = getDataSql +" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN ? AND ? ) "; getDataSql = getDataSql +" AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) BETWEEN ? AND ? ) ";
} }
else else
{ {
getDataSql = getDataSql + "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) "; getDataSql = getDataSql + "AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) > ? ) ";
} }
pstmtStock = conn.prepareStatement(getDataSql + orderByStkStr); pstmtStock = conn.prepareStatement(getDataSql + orderByStkStr);
pstmtStock.setString(1,itemCode); pstmtStock.setString(1,itemCode);
...@@ -4955,11 +4955,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -4955,11 +4955,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//+" ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE "; //+" ORDER BY STOCK.EXP_DATE,INVSTAT.ALLOC_PREF, STOCK.LOC_CODE ";
if(maxShelfLife > 0) if(maxShelfLife > 0)
{ {
getDataSql = getDataSql +" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) BETWEEN ? AND ? ) "; getDataSql = getDataSql +" AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) BETWEEN ? AND ? ) ";
} }
else else
{ {
getDataSql = getDataSql + "AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) "; getDataSql = getDataSql + "AND (CEIL(MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE)) > ? ) ";
} }
pstmtStock = conn.prepareStatement(getDataSql + orderByStkStr); pstmtStock = conn.prepareStatement(getDataSql + orderByStkStr);
......
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