Commit 84e119e9 authored by apal's avatar apal

Client name:Loyd

 Request id :D17ELHP001
 bug fix 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@175167 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 78620b37
......@@ -2206,6 +2206,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//added lockqty by arun
stockTot=0.0;
lockqty=0.0;
//added lockqty by arun 04-12-17
rateFailed = "F";
while(rs5.next())
{
stockcnt++;
......@@ -2738,12 +2740,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
rateFailed = "F";
if(rate <= 0)
{
if(priceList != null && priceList.trim().length() > 0)
{
priceListType = dist.getPriceListType(priceList, conn);
if("B".equalsIgnoreCase(priceListType))
{
sql = " Select count(1) as priceListCnt from pricelist_mst " +
" where price_list = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -2778,11 +2780,14 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}//end of if("B".equalsIgnoreCase(priceListType))
}//end of if(priceList != null && priceList.trim().length() > 0)
if(priceListDisc == null || priceListDisc.trim().length() == 0)
{
if(priceList != null && priceList.trim().length() > 0)
{
if(allocDate != null)
{
allocDateStr=sdf.format(allocDate);
......@@ -2794,6 +2799,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
else
{
//System.out.println(" inside rate else @@@@@<>>< >>>>>>>>>>>>>><<<<<<<"+priceListType+"]");
priceListType="";
plistDisc = getDiscount(priceListDisc,orderDate,custCode,siteCode,itemCode,unit,discMerge,plDate,sordItmQty,conn);
priceListType = dist.getPriceListType(priceListDisc, conn);
......@@ -2817,9 +2823,11 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
}
if(rate < 0)
{
//System.out.println(" inside rate else @@@@@<>>< >>>>>>>>>>>>>><<<<<<<"+rate+"]");
// System.out.println("rate not available");
skipline = skipline + "'"+lineNo;
isRejected=true;
......@@ -3484,12 +3492,13 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}//end of while
// changes by arun start 30-11-17
rateFailed = "F";
/*System.out.println(" Ratefild insert into loop["+rateFailed+"]");
System.out.println("Before stockTot<>>><<<<<<<>"+stockTot+"]");
System.out.println("Before netQuantity<>>><<<<<<<>"+netQuantity+"]");*/
if("F".equalsIgnoreCase(rateFailed))
{
rateFailed = "F";
System.out.println(" Ratefild insert into loop["+rateFailed+"]");
if(("B".equalsIgnoreCase(itemFlag) || "N".equalsIgnoreCase(partQty)) && isScheme == false)
{
......@@ -3534,7 +3543,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
}
}//end of if rateFailed--F
// changes by arun ended 30-11-17
......@@ -3904,7 +3913,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(merrcode != null && merrcode.trim().length() > 0)
{
merrcode = itmDBAccessEJB.getErrorString("VTSTKNOAVL",merrcode,"","",conn);
return merrcode;
return merrcode;
}
else
{
......
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