Skip to content

B
business-java
Commit fe5a355c authored by dpawar's avatar dpawar
Browse files
Options

uncomment sql for replenishment having same case pick location in... 

uncomment sql for replenishment having same case pick location in (getAvilableCasePickLocationList and getAvilableCasePickLocation method)


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98621 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e5f939e4
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 15 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ fe5a355c
......@@ -10702,12 +10702,14 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtRplDet.setString(14,expLevel);
if(invStat.equalsIgnoreCase(invDeepReserve))
{
System.out.println("pndLoc : ["+pndLoc+"]");
if(pndLoc != null && pndLoc.length() > 0)
{
pstmtRplDet.setString(15,pndLoc);
}
else
{
System.out.println("IN ERROR OF...........INVPNDLOC");
errString = getError(saleOrder,"INVPNDLOC",conn);
return errString;
}
......@@ -17853,7 +17855,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String invStat = "";
String invStatDisparmVar = "";
double quantity = 0;
int count = 0;
//int count = 0;
try
{
......@@ -17883,7 +17885,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET WHERE LOC_CODE__TO = ?";
//Changed by Rohan on 19-02-13 free location form cancle Repanishment
//orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') "; //changes done by Ashish Sonawane on 10-jul-12
System.out.println("PickType----->>["+pickType+"]");
sql = "SELECT A.SINGLE_LOT_SL,A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE FROM LOCATION A ,INVSTAT B ,SITE S "
+ "WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' AND A.LOC_TYPE = 'N' AND S.SITE_CODE = ? "
+ "AND (S.FACILITY_CODE = A.FACILITY_CODE or nvl(s.facility_code ,'N') = 'N') "
......@@ -17892,10 +17894,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE (ITEM_CODE <> ? OR LOT_NO <> ?) and a.SINGLE_LOT_SL ='N' and SITE_CODE = ? AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 0),0) = 0 "
+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE ITEM_CODE <> ? and SITE_CODE = ? and a.SINGLE_LOT_SL ='N' AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 1),0) = 0 ";
/*@@orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? "
////Uncomment for Replenishments having same case pick location.
orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? "
+" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' "
+" AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') ";@@*/
+" AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') ";
if ( "A".equalsIgnoreCase(pickType.trim()) )//Active pick
{
......@@ -17923,10 +17925,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by sumit on 06/08/12 getting pnd location of loc_code from location end.
}
sql = sql + " ORDER BY ABS(A.LOC_ZONE - ? ),A.LOC_CODE ";
System.out.println("invStatDisparmVar----->>["+invStatDisparmVar+"]");
invStat = discommon.getDisparams("999999",invStatDisparmVar,conn);
System.out.println("invStat----->>["+invStat+"]");
//@@pstmtStock = conn.prepareStatement(stockSql);
pstmt = conn.prepareStatement(sql);
//pstmtOrder = conn.prepareStatement(orderSql);
pstmtOrder = conn.prepareStatement(orderSql);
//pstmtItemLotOpt0 = conn.prepareStatement( sqlItemLotOpt0 );
//pstmtItemLotOpt1 = conn.prepareStatement( sqlItemLotOpt1);@@/
//Changed by sumit on 06/08/12 commented bellow setString and apply 3 parameter in case of pnd location start.
......@@ -17996,8 +18000,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
continue;
}
//Changed By Pragyan 11-AUG-14 To check and Facility Master implementation.end
pstmtOrder.setString(1, suggLocCode);
*/
pstmtOrder.setString(1, suggLocCode);//Uncomment for Replenishments having same case pick location.
rsOrder = pstmtOrder.executeQuery();
if(rsOrder.next())
......@@ -18009,7 +18013,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
continue;
}
}
/*
pstmtStock.setString( 1, suggLocCode );
rsStock = pstmtStock.executeQuery();
if ( rsStock.next() )
......@@ -18428,10 +18432,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
sqlItemLotOpt1 = "SELECT COUNT(*) AS COUNT FROM STOCK WHERE ITEM_CODE <> ? AND SITE_CODE = ? AND LOC_CODE = ? AND QUANTITY > 0";
//Changed by Rohan on 19-02-13 free location form cancle Repanishment
//orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') "; //changes done by Ashish Sonawane on 10-jul-12
//orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') "; //changes done by Ashish Sonawane on 10-jul-12@@*/
//Changed by Dadaso pawar on 01/10/15 [Uncomment for Replenishments having same case pick location.]
orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? "
+" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' "
+" AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') ";@@*/
+" AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') ";
sql = "SELECT A.SINGLE_LOT_SL,A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE FROM LOCATION A ,INVSTAT B ,SITE S "
+ "WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' AND A.LOC_TYPE = 'N' AND S.SITE_CODE = ? "
+ "AND (S.FACILITY_CODE = A.FACILITY_CODE or nvl(s.facility_code ,'N') = 'N') "
......@@ -18468,8 +18474,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
invStat = discommon.getDisparams("999999",invStatDisparmVar,conn);
//@@pstmtStock = conn.prepareStatement(stockSql);
pstmt = conn.prepareStatement(sql);
/*@@pstmtOrder = conn.prepareStatement(orderSql);
pstmtItemLotOpt0 = conn.prepareStatement( sqlItemLotOpt0 );
pstmtOrder = conn.prepareStatement(orderSql);
/*@@pstmtItemLotOpt0 = conn.prepareStatement( sqlItemLotOpt0 );
pstmtItemLotOpt1 = conn.prepareStatement( sqlItemLotOpt1);@@*/
......@@ -18536,6 +18542,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
rs1.close();
rs1 = null;
*/
pstmtOrder.setString(1, suggLocCode);
rsOrder = pstmtOrder.executeQuery();
......@@ -18570,6 +18577,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
suggestedLocList.add(suggLocCode) ;
}
/*
}
else
{
......@@ -21357,7 +21365,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
case 2:
{
System.out.println("@@@@ inside case 2*****************");
System.out.println("case 2 key : "+itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode);
System.out.println("@@@@ inside case 2*****************"+itemInfoMapForRepl);
if(itemInfoMapForRepl.containsKey(itemCode+":"+siteCode+":"+lotNo+":"+lotSl+":"+locCode))
{
......@@ -21369,6 +21378,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
HashMap itemSitemap = (HashMap)itemIterator.next();
System.out.println("itemSitemap-----------------------:"+itemSitemap);
//System.out.print( "element:["+element+"]");
double availQty = 0.0;
double actulaQty = 0.0;
......
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