Skip to content

B
business-java
Commit af7490f4 authored by wansari's avatar wansari
Browse files
Options

HEAD-Changed by wasim for Manual stock allocation for Process screen, checked... 

HEAD-Changed by wasim for Manual stock allocation for Process screen, checked max shelf life from siteitem then only make the query for (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > 0.0 )


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@43632 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e003b938
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 14 deletions
webitm-dis/ibase/webitm/ejb/dis/StockAllocationPrc.java
View file @ af7490f4
...@@ -158,6 +158,8 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -158,6 +158,8 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
String orderByStkStr = "" , disOpt = "",batchId=""; String orderByStkStr = "" , disOpt = "",batchId="";
int waveType1 = 0,cnt=0; int waveType1 = 0,cnt=0;
double pendingQty = 0, minSelfLife = 0; double pendingQty = 0, minSelfLife = 0;
//Added by wasim on 20-APR-17 for DDUK changes
double maxShelfLife = 0;
Connection conn = null; Connection conn = null;
ResultSet rs = null; ResultSet rs = null;
ResultSet rs1 = null; ResultSet rs1 = null;
...@@ -585,7 +587,10 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -585,7 +587,10 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
} }
} }
minSelfLife = 0; minSelfLife = 0;
sql =" SELECT MIN_SHELF_LIFE FROM SORDITEM WHERE SALE_ORDER = ? AND LINE_NO = ? AND EXP_LEV = ? "; maxShelfLife = 0;
//Changed by wasim on 20-APR-17 for DDUK changes
//sql =" SELECT MIN_SHELF_LIFE FROM SORDITEM WHERE SALE_ORDER = ? AND LINE_NO = ? AND EXP_LEV = ? ";
sql =" SELECT MIN_SHELF_LIFE,MAX_SHELF_LIFE FROM SORDITEM WHERE SALE_ORDER = ? AND LINE_NO = ? AND EXP_LEV = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,rs.getString(4)); pstmt1.setString(1,rs.getString(4));
pstmt1.setString(2, rs.getString(3)); pstmt1.setString(2, rs.getString(3));
...@@ -594,6 +599,8 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -594,6 +599,8 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
if(rs1.next()) if(rs1.next())
{ {
minSelfLife= rs1.getDouble("MIN_SHELF_LIFE"); minSelfLife= rs1.getDouble("MIN_SHELF_LIFE");
//Added by wasim on 20-APR-17 for DDUK changes
maxShelfLife= rs1.getDouble("MAX_SHELF_LIFE");
} }
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
...@@ -616,8 +623,15 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -616,8 +623,15 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
sql1 = sql1.concat(" AND LOCATION.INV_STAT NOT IN(?,?) "); sql1 = sql1.concat(" AND LOCATION.INV_STAT NOT IN(?,?) ");
} }
//Added by manoj dtd 09/08/2013 to implement FEFO concept //Added by manoj dtd 09/08/2013 to implement FEFO concept
sql1= sql1+" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
//Changed by wasim on 20-APR-17 for DDUK changes [START]
//sql1= sql1+" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
System.out.println("@@MAX_SHELF_LIFE["+maxShelfLife+"]");
if(maxShelfLife > 0)
{
sql1= sql1+" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
}
//Changed by wasim on 20-APR-17 for DDUK changes [END]
// 01/11/12 manoharan preparedstatement used instead of statement // 01/11/12 manoharan preparedstatement used instead of statement
//rs1 = st.executeQuery(sql); //rs1 = st.executeQuery(sql);
...@@ -629,36 +643,96 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -629,36 +643,96 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
pstmt1 = conn.prepareStatement(sql1); pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1,rs.getString(6) ); pstmt1.setString(1,rs.getString(6) );
pstmt1.setString(2,rs.getString(12)); pstmt1.setString(2,rs.getString(12));
pstmt1.setDouble(3,minSelfLife); //Changed by wasim on 20-APR-17 for DDUK changes [START]
//pstmt1.setDouble(3,minSelfLife);
if(maxShelfLife > 0)
{
pstmt1.setDouble(3,minSelfLife);
}
//Changed by wasim on 20-APR-17 for DDUK changes [END]
if("N".equalsIgnoreCase(activeAllow)) if("N".equalsIgnoreCase(activeAllow))
{ {
pstmt1.setString(3,activePickLoc); pstmt1.setString(3,activePickLoc);
pstmt1.setString(4,partialResrvLoc); pstmt1.setString(4,partialResrvLoc);
pstmt1.setDouble(5,minSelfLife); //Changed by wasim on 20-APR-17 for DDUK changes [START]
//pstmt1.setDouble(5,minSelfLife);
if(maxShelfLife > 0)
{
pstmt1.setDouble(5,minSelfLife);
}
//Changed by wasim on 20-APR-17 for DDUK changes [END]
if(checkLocation) //added by kunal on 15/NOV/13 DI3ESUN009 if(checkLocation) //added by kunal on 15/NOV/13 DI3ESUN009
{ {
pstmt1.setString(6,resrvLoc); //Changed by wasim on 20-APR-17 for DDUK changes [START]
/*pstmt1.setString(6,resrvLoc);
pstmt1.setString(7,casePickLoc); pstmt1.setString(7,casePickLoc);
pstmt1.setString(8,activePickLoc); pstmt1.setString(8,activePickLoc);
pstmt1.setString(9,deepStoreLoc); pstmt1.setString(9,deepStoreLoc);
if(isActives) if(isActives)
{ {
pstmt1.setString(10,partialResrvLoc); pstmt1.setString(10,partialResrvLoc);
}*/
if(maxShelfLife > 0)
{
pstmt1.setString(6,resrvLoc);
pstmt1.setString(7,casePickLoc);
pstmt1.setString(8,activePickLoc);
pstmt1.setString(9,deepStoreLoc);
if(isActives)
{
pstmt1.setString(10,partialResrvLoc);
}
}
else
{
pstmt1.setString(5,resrvLoc);
pstmt1.setString(6,casePickLoc);
pstmt1.setString(7,activePickLoc);
pstmt1.setString(8,deepStoreLoc);
if(isActives)
{
pstmt1.setString(9,partialResrvLoc);
}
} }
//Changed by wasim on 20-APR-17 for DDUK changes [END]
} }
} }
else else
{ {
if(checkLocation) //added by kunal on 15/NOV/13 DI3ESUN009 if(checkLocation) //added by kunal on 15/NOV/13 DI3ESUN009
{ {
pstmt1.setString(4,resrvLoc); //Changed by wasim on 20-APR-17 for DDUK changes [START]
/*pstmt1.setString(4,resrvLoc);
pstmt1.setString(5,casePickLoc); pstmt1.setString(5,casePickLoc);
pstmt1.setString(6,activePickLoc); pstmt1.setString(6,activePickLoc);
pstmt1.setString(7,deepStoreLoc); pstmt1.setString(7,deepStoreLoc);
if(isActives) if(isActives)
{ {
pstmt1.setString(8,partialResrvLoc); pstmt1.setString(8,partialResrvLoc);
}*/
if(maxShelfLife > 0)
{
pstmt1.setString(4,resrvLoc);
pstmt1.setString(5,casePickLoc);
pstmt1.setString(6,activePickLoc);
pstmt1.setString(7,deepStoreLoc);
if(isActives)
{
pstmt1.setString(8,partialResrvLoc);
}
}
else
{
pstmt1.setString(3,resrvLoc);
pstmt1.setString(4,casePickLoc);
pstmt1.setString(5,activePickLoc);
pstmt1.setString(6,deepStoreLoc);
if(isActives)
{
pstmt1.setString(7,partialResrvLoc);
}
} }
//Changed by wasim on 20-APR-17 for DDUK changes [END]
} }
} }
...@@ -1833,6 +1907,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1833,6 +1907,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
Timestamp sysDate = null; Timestamp sysDate = null;
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
double minSelfLife=0; double minSelfLife=0;
double maxSelfLife=0;//Added by wasim on 20-APR-2017 for DDUK changes
// ADDED BY RITESH ON 15/07/14 START // ADDED BY RITESH ON 15/07/14 START
String singleLot = ""; String singleLot = "";
// TreeMap stockLot=new TreeMap<String,Double>(); // TreeMap stockLot=new TreeMap<String,Double>();
...@@ -1945,7 +2020,9 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1945,7 +2020,9 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
System.out.println("siteCodeShip------"+ siteCodeShip); System.out.println("siteCodeShip------"+ siteCodeShip);
sorditemSql = "SELECT ITEM_CODE,ITEM_CODE__ORD,UNIT, QTY_DESP, ITEM_REF," sorditemSql = "SELECT ITEM_CODE,ITEM_CODE__ORD,UNIT, QTY_DESP, ITEM_REF,"
+" QUANTITY - QTY_DESP PENDING_QUANTITY,MIN_SHELF_LIFE " //Changed by wasim on 20-APR-2017 for taking max self life for DDUK changes
//+" QUANTITY - QTY_DESP PENDING_QUANTITY,MIN_SHELF_LIFE "
+" QUANTITY - QTY_DESP PENDING_QUANTITY,MIN_SHELF_LIFE,MAX_SHELF_LIFE "
+" FROM SORDITEM WHERE SALE_ORDER = '" + saleOrder + "' " +" FROM SORDITEM WHERE SALE_ORDER = '" + saleOrder + "' "
+" AND LINE_NO = '" + lineNo + "' " +" AND LINE_NO = '" + lineNo + "' "
+" AND EXP_LEV = '" + expLev + "' "; +" AND EXP_LEV = '" + expLev + "' ";
...@@ -1968,6 +2045,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -1968,6 +2045,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
//PENDING_QUANTITY //PENDING_QUANTITY
pendingQuantity = rsSItem.getDouble(6); pendingQuantity = rsSItem.getDouble(6);
minSelfLife= rsSItem.getDouble("MIN_SHELF_LIFE"); minSelfLife= rsSItem.getDouble("MIN_SHELF_LIFE");
maxSelfLife= rsSItem.getDouble("MAX_SHELF_LIFE");
} }
rsSItem.close(); rsSItem.close();
st.close(); st.close();
...@@ -2134,9 +2212,17 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -2134,9 +2212,17 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
{ {
getDataSql = getDataSql.concat(" AND LOCATION.INV_STAT NOT IN(?,?) "); getDataSql = getDataSql.concat(" AND LOCATION.INV_STAT NOT IN(?,?) ");
} }
//Added by manoj dtd 09/08/2013 to implement FEFO concept //Added by manoj dtd 09/08/2013 to implement FEFO concept
getDataSql=getDataSql+" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) "; //Changed by wasim on 20-APR-2017 for DDUK changes [START]
// getDataSql=getDataSql+"AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) AND STOCK.LOC_CODE NOT IN ('D1911C')"; //getDataSql=getDataSql+" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
if(maxSelfLife > 0)
{
getDataSql=getDataSql+" AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) ";
}
//Changed by wasim on 20-APR-2017 for DDUK changes [END]
//getDataSql=getDataSql+"AND (MONTHS_BETWEEN(TO_DATE(STOCK.EXP_DATE),SYSDATE) > ? ) AND STOCK.LOC_CODE NOT IN ('D1911C')";
if(checkLocation) //added by kunal on 14/NOV/13 DI3ESUN009 if(checkLocation) //added by kunal on 14/NOV/13 DI3ESUN009
{ {
...@@ -2149,7 +2235,13 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -2149,7 +2235,13 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
pstmtStock = conn.prepareStatement(getDataSql); pstmtStock = conn.prepareStatement(getDataSql);
pstmtStock.setString(1,itemCode); pstmtStock.setString(1,itemCode);
pstmtStock.setString(2,siteCodeShip); pstmtStock.setString(2,siteCodeShip);
pstmtStock.setDouble(3,minSelfLife); //Changed by wasim on 20-APR-17 for DDUK changes [START]
//pstmtStock.setDouble(3,minSelfLife);
if(maxSelfLife > 0)
{
pstmtStock.setDouble(3,minSelfLife);
}
//Changed by wasim on 20-APR-17 for DDUK changes [END]
//added by ritesh 0n 7/8/13 for request DI3ESUN009 START //added by ritesh 0n 7/8/13 for request DI3ESUN009 START
if("N".equalsIgnoreCase(activeAllow)) if("N".equalsIgnoreCase(activeAllow))
{ {
...@@ -2157,31 +2249,85 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc ...@@ -2157,31 +2249,85 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
varValue2 = dComm.getDisparams("999999","PRSRV_INVSTAT", conn); varValue2 = dComm.getDisparams("999999","PRSRV_INVSTAT", conn);
pstmtStock.setString(3,varValue1); pstmtStock.setString(3,varValue1);
pstmtStock.setString(4,varValue2); pstmtStock.setString(4,varValue2);
pstmtStock.setDouble(5,minSelfLife); //Changed by wasim on 20-APR-17 for DDUK changes [START]
//pstmtStock.setDouble(5,minSelfLife);
if(maxSelfLife > 0)
{
pstmtStock.setDouble(5,minSelfLife);
}
//Changed by wasim on 20-APR-17 for DDUK changes [END]
if(checkLocation) //added by kunal on 14/NOV/13 DI3ESUN009 if(checkLocation) //added by kunal on 14/NOV/13 DI3ESUN009
{ {
pstmtStock.setString(6,resrvLoc); //Changed by wasim on 20-APR-17 for DDUK changes [START]
/*pstmtStock.setString(6,resrvLoc);
pstmtStock.setString(7,casePickLoc); pstmtStock.setString(7,casePickLoc);
pstmtStock.setString(8,activePickLoc); pstmtStock.setString(8,activePickLoc);
pstmtStock.setString(9,deepStoreLoc); pstmtStock.setString(9,deepStoreLoc);
if(isActives) if(isActives)
{ {
pstmtStock.setString(10,partialResrvLoc); pstmtStock.setString(10,partialResrvLoc);
}*/
if(maxSelfLife > 0)
{
pstmtStock.setString(6,resrvLoc);
pstmtStock.setString(7,casePickLoc);
pstmtStock.setString(8,activePickLoc);
pstmtStock.setString(9,deepStoreLoc);
if(isActives)
{
pstmtStock.setString(10,partialResrvLoc);
}
}
else
{
pstmtStock.setString(5,resrvLoc);
pstmtStock.setString(6,casePickLoc);
pstmtStock.setString(7,activePickLoc);
pstmtStock.setString(8,deepStoreLoc);
if(isActives)
{
pstmtStock.setString(9,partialResrvLoc);
}
} }
//Changed by wasim on 20-APR-17 for DDUK changes [END]
} }
} }
else else
{ {
if(checkLocation) //added by kunal on 14/NOV/13 DI3ESUN009 if(checkLocation) //added by kunal on 14/NOV/13 DI3ESUN009
{ {
pstmtStock.setString(4,resrvLoc); //Changed by wasim on 20-APR-17 for DDUK changes [START]
/*pstmtStock.setString(4,resrvLoc);
pstmtStock.setString(5,casePickLoc); pstmtStock.setString(5,casePickLoc);
pstmtStock.setString(6,activePickLoc); pstmtStock.setString(6,activePickLoc);
pstmtStock.setString(7,deepStoreLoc); pstmtStock.setString(7,deepStoreLoc);
if(isActives) if(isActives)
{ {
pstmtStock.setString(8,partialResrvLoc); pstmtStock.setString(8,partialResrvLoc);
}*/
if(maxSelfLife > 0)
{
pstmtStock.setString(4,resrvLoc);
pstmtStock.setString(5,casePickLoc);
pstmtStock.setString(6,activePickLoc);
pstmtStock.setString(7,deepStoreLoc);
if(isActives)
{
pstmtStock.setString(8,partialResrvLoc);
}
}
else
{
pstmtStock.setString(3,resrvLoc);
pstmtStock.setString(4,casePickLoc);
pstmtStock.setString(5,activePickLoc);
pstmtStock.setString(6,deepStoreLoc);
if(isActives)
{
pstmtStock.setString(7,partialResrvLoc);
}
} }
//Changed by wasim on 20-APR-17 for DDUK changes [END]
} }
} }
//added by ritesh 0n 7/8/13 for request DI3ESUN009 START //added by ritesh 0n 7/8/13 for request DI3ESUN009 START
......
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