Commit 26d58f75 authored by ppatro's avatar ppatro

wave gen get data,pick issue , repll issue pos save


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92524 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9542b172
......@@ -190,6 +190,15 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
//{
System.out.println("Calling Confirm method..................");
errString = pickConf.confirm( tranId, xtraParams, forcedFlag ,conn, toCommit );
if (errString.indexOf("CONFSUCESS") > -1)
{
errString = "";
}
if ( errString != null && errString.length() > 0 )
{
throw new Exception(errString);
}
//}
/*} */
}
......@@ -304,6 +313,14 @@ public class PickIssPos extends ValidatorEJB implements PickIssPosLocal, PickIss
System.out.println("Calling Confirm method..................");
errString = pickConf.confirm( tranId, xtraParams, forcedFlag ,conn, toCommit );
if (errString.indexOf("CONFSUCESS") > -1)
{
errString = "";
}
if ( errString != null && errString.length() > 0 )
{
throw new Exception(errString);
}
//}
}
......
......@@ -199,7 +199,8 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
}
if ( retString != null && retString.length() > 0 )
{
throw new Exception("Exception while calling confirm for tran Id:["+tranId+"]");
//throw new Exception("Exception while calling confirm for tran Id:["+tranId+"]");
throw new Exception(retString);
}
}
else
......@@ -219,9 +220,14 @@ public class ReplIssPos extends ValidatorEJB implements ReplIssPosRemote, ReplIs
ReplIssConf replIssConf = new ReplIssConf();
retString = replIssConf.confirm(tranId, xtraParams, forcedFlag, conn, isConn);
System.out.println("retString[" +retString +"]");
if (retString.indexOf("REPISSCONF") > -1)
{
retString = "";
}
if ( retString != null && retString.length() > 0 )
{
throw new Exception("Exception while calling confirm for tran Id:["+tranId+"]");
//throw new Exception("Exception while calling confirm for tran Id:["+tranId+"]");
throw new Exception(retString);
}
}
else
......
......@@ -760,7 +760,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
singleLot = globalSingleLot;
}
if((pendingQty % packSize) > 0)
//Changed By Pragyan 17/01/13 To get all data for stock.start
/*if((pendingQty % packSize) > 0)
{
isActives = true;
orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?,?) ORDER BY STOCK.EXP_DATE,LOCATION.INV_STAT, STOCK.LOC_CODE ";
......@@ -769,7 +771,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
isActives = false;
orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?) ORDER BY STOCK.EXP_DATE, STOCK.LOC_CODE ";
}
}*/
orderByStkStr = "AND LOCATION.INV_STAT IN(?,?,?,?,?) ORDER BY STOCK.EXP_DATE,LOCATION.INV_STAT, STOCK.LOC_CODE ";
//Changed By Pragyan 17/01/13 To get all data for stock.end
//Change by Rohan Bhogale on 19/07/12 To display transporte details.end
//Setting of parameters
......@@ -796,15 +800,21 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if ( partQty.trim().length() > 0 )
{
System.out.println("in side if");
if( "0".equalsIgnoreCase(partQty))
//Changed 16/01/13 as the Sales Order Value changes
//if( "0".equalsIgnoreCase(partQty))
if( "2".equalsIgnoreCase(partQty))
{
partQtyValue = "Ship Available";
}
else if ("1".equalsIgnoreCase(partQty))
//Changed 16/01/13 as the Sales Order Value changes
//else if ("1".equalsIgnoreCase(partQty))
else if ("0".equalsIgnoreCase(partQty))
{
partQtyValue = "Ship Complete";
}
else if("2".equalsIgnoreCase(partQty))
//Changed 16/01/13 as the Sales Order Value changes
else if("1".equalsIgnoreCase(partQty))
//else if("2".equalsIgnoreCase(partQty))
{
partQtyValue = "Ship Complete Lines";
}
......@@ -858,10 +868,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtStock.setString(9,casePickLoc);
pstmtStock.setString(10,activePickLoc);
pstmtStock.setString(11,deepStoreLoc);
if(isActives)
pstmtStock.setString(12,partialResrvLoc);
/*if(isActives)
{
pstmtStock.setString(12,partialResrvLoc);
}
}*/
}
else
{
......@@ -875,10 +886,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtStock.setString(6,casePickLoc);
pstmtStock.setString(7,activePickLoc);
pstmtStock.setString(8,deepStoreLoc);
if(isActives)
pstmtStock.setString(9,partialResrvLoc);
/*if(isActives)
{
pstmtStock.setString(9,partialResrvLoc);
}
}*/
//Changed by Rohan on 29-12-11 as said by gulzar sir.end
}
rs1 = pstmtStock.executeQuery();
......@@ -17388,11 +17400,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
try
{
if("1".equalsIgnoreCase(partQty))
//if("1".equalsIgnoreCase(partQty))
if("0".equalsIgnoreCase(partQty))
{
reasonDetail = "Partial Order/Partial qty Not Allowed Part Qty(1)";
}
else if("2".equalsIgnoreCase(partQty))
//else if("2".equalsIgnoreCase(partQty))
else if("1".equalsIgnoreCase(partQty))
{
reasonDetail = "Partial qty Not Allowed Part Qty(2)";
}
......@@ -17632,7 +17646,28 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
System.out.println("partQty::"+partQty);
if("1".equalsIgnoreCase(partQty))
/*
* if( "2".equalsIgnoreCase(partQty))
{
partQtyValue = "Ship Available";
}
//Changed 16/01/13 as the Sales Order Value changes
//else if ("1".equalsIgnoreCase(partQty))
else if ("0".equalsIgnoreCase(partQty))
{
partQtyValue = "Ship Complete";
}
//Changed 16/01/13 as the Sales Order Value changes
else if("1".equalsIgnoreCase(partQty))
//else if("2".equalsIgnoreCase(partQty))
{
partQtyValue = "Ship Complete Lines";
}
*/
//if("1".equalsIgnoreCase(partQty))
if("0".equalsIgnoreCase(partQty))
{
System.out.println("partQty==== ONE ====>");
System.out.println("maxLine==>"+maxLine+"ctr====>"+ctr);
......@@ -17662,7 +17697,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
else if("2".equalsIgnoreCase(partQty))
else if("1".equalsIgnoreCase(partQty))
//else if("2".equalsIgnoreCase(partQty))
{
System.out.println("Value of cctr===>"+ ctr);
//Changed by Rohan on 7/6/12 for bug fixing
......
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