Skip to content

B
business-java
Commit dbe3fbe5 authored by apal's avatar apal
Browse files
Options

Client name:Loyd 

 Request id :D17ELHP001
Issue: Post order Bug Quantity Allocation not as per available quantity bug fix 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174956 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9405a446
Show whitespace changes
Inline Side-by-side
Showing with 1779 additions and 1743 deletions
webitm-dis/ibase/webitm/ejb/dis/PostOrderProcess.java
View file @ dbe3fbe5
...@@ -207,7 +207,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -207,7 +207,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
// Added by Sneha on 08/02/2017, for validation [Start] // Added by Sneha on 08/02/2017, for validation [Start]
/* System.out.println("----------- fromSaleOrder ------------"+fromSaleOrder); /* System.out.println("----------- fromSaleOrder ------------"+fromSaleOrder);
System.out.println("----------- toSaleOrder ------------"+toSaleOrder); System.out.println("----------- toSaleOrder ------------"+toSaleOrder);
System.out.println("----------- fromCustCode ------------"+fromCustCode); System.out.println("----------- fromCustCode ------------"+fromCustCode);
System.out.println("----------- toCustCode ------------"+toCustCode); System.out.println("----------- toCustCode ------------"+toCustCode);
...@@ -392,7 +392,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -392,7 +392,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(clubOrder != null && clubOrder.equalsIgnoreCase("Y")) if(clubOrder != null && clubOrder.equalsIgnoreCase("Y"))
{ {
/* sql="select distinct cust_code from sorder " + /* sql="select distinct cust_code from sorder " +
"where sale_order >= ? and sale_order <= ? and cust_code >= ? and cust_code <= ? " + "where sale_order >= ? and sale_order <= ? and cust_code >= ? and cust_code <= ? " +
"and due_date >= ? and due_date <= ? and confirmed ='Y' and status ='P' " + "and due_date >= ? and due_date <= ? and confirmed ='Y' and status ='P' " +
"and site_code__ship = ? "; commented by abhijit Gaikwad */ "and site_code__ship = ? "; commented by abhijit Gaikwad */
...@@ -546,11 +546,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -546,11 +546,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
errString = itmDBAccessEJB.getErrorString("", "VTPOSTORD1", "","", conn); errString = itmDBAccessEJB.getErrorString("", "VTPOSTORD1", "","", conn);
} }
// Changes done by apal for stock allocation29/11/2017 ended // Changes done by apal for stock allocation29/11/2017 ended
// errString = itmDBAccessEJB.getErrorString("", "VTPOSTORD1", "","", conn); // errString = itmDBAccessEJB.getErrorString("", "VTPOSTORD1", "","", conn);
} }
} }
} }
if(isPostDone) if(isPostDone)
{ {
//System.out.println("salesOrderListAll>>>>"+salesOrderListAll); //System.out.println("salesOrderListAll>>>>"+salesOrderListAll);
...@@ -584,7 +585,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -584,7 +585,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
} }
errString = itmDBAccessEJB.getErrorString("","VTPOST03","","",conn); errString = itmDBAccessEJB.getErrorString("","VTPOST03","","",conn);
//System.out.println("errString@@@>>>"+errString);
String begPart = errString.substring( 0, errString.indexOf("<trace>") + 7 ); String begPart = errString.substring( 0, errString.indexOf("<trace>") + 7 );
String endPart = errString.substring( errString.indexOf("</trace>")); String endPart = errString.substring( errString.indexOf("</trace>"));
...@@ -1835,8 +1836,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -1835,8 +1836,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
System.out.println(" inside sorderbean sorderList >>>>>>>>>:"+sorderList.size()); System.out.println(" inside sorderbean sorderList >>>>>>>>>:"+sorderList.size());
sorderlistcnt++; sorderlistcnt++;
//lockqty=0.0;
//arun p
sordItemList= new ArrayList<SordItemBean>(); sordItemList= new ArrayList<SordItemBean>();
/* SorderBean sorderBean = new SorderBean(); /* SorderBean sorderBean = new SorderBean();
...@@ -2075,7 +2074,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -2075,7 +2074,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
// }//End of iterator sordIterator commented by arun // }//End of iterator sordIterator commented by arun
System.out.println("sorderlistcnt"+sorderlistcnt); System.out.println("sorderlistcnt"+sorderlistcnt);
int stockTestCnt=0,forTestCnt=0; int stockTestCnt=0,forTestCnt=0;
...@@ -2938,7 +2937,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -2938,7 +2937,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
/*if(!("F".equalsIgnoreCase(rateFailed))) /*if(!("F".equalsIgnoreCase(rateFailed)))
{ {
*/ */
if(("B".equalsIgnoreCase(itemFlag) || "N".equalsIgnoreCase(partQty)) && isScheme == false) if(("B".equalsIgnoreCase(itemFlag) || "N".equalsIgnoreCase(partQty)) && isScheme == false)
{ {
...@@ -3116,12 +3115,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -3116,12 +3115,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if((qtyStk - allocQty - holdQty) <= netQuantity) if((qtyStk - allocQty - holdQty) <= netQuantity)
{ {
inputQty = qtyStk - allocQty - holdQty; inputQty = qtyStk - allocQty - holdQty;
// sordItemBean.setSordItmQty(inputQty);//Added by chandrashekar on 03-oct-2016 ARUN PAL // sordItemBean.setSordItmQty(inputQty);//Added by chandrashekar on 03-oct-2016 ARUN PAL
} }
else else
{ {
inputQty = netQuantity; inputQty = netQuantity;
// sordItemBean.setSordItmQty(inputQty);//Added by chandrashekar on 03-oct-2016 ARUN PAL // sordItemBean.setSordItmQty(inputQty);//Added by chandrashekar on 03-oct-2016 ARUN PAL
} }
System.out.println("inputQty>><<<<<<<<"+inputQty); System.out.println("inputQty>><<<<<<<<"+inputQty);
if(inputQty > 0) if(inputQty > 0)
...@@ -3473,7 +3472,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -3473,7 +3472,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
System.out.println("PSallocQty["+allocQty+"]"+"holdQty["+holdQty+"]"+"qtyStk - allocQty - holdQty["+(qtyStk - allocQty - holdQty)+""); System.out.println("PSallocQty["+allocQty+"]"+"holdQty["+holdQty+"]"+"qtyStk - allocQty - holdQty["+(qtyStk - allocQty - holdQty)+"");
System.out.println("PSstockTot["+stockTot+"]"+"qtyStk["+qtyStk+"]"+"sordItmQty["+sordItmQty+""); System.out.println("PSstockTot["+stockTot+"]"+"qtyStk["+qtyStk+"]"+"sordItmQty["+sordItmQty+"");
// stockTot=0.0;// commemted by arun pal // stockTot=0.0;// commemted by arun pal
stockTot = stockTot + (qtyStk - allocQty - holdQty); stockTot = stockTot + (qtyStk - allocQty - holdQty);
System.out.println("stockTot >>>>"+stockTot); System.out.println("stockTot >>>>"+stockTot);
if(stockTot >= sordItmQty) if(stockTot >= sordItmQty)
...@@ -3484,6 +3483,63 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -3484,6 +3483,63 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}//end of while }//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))
{
System.out.println(" Ratefild insert into loop["+rateFailed+"]");
if(("B".equalsIgnoreCase(itemFlag) || "N".equalsIgnoreCase(partQty)) && isScheme == false)
{
/*System.out.println("Before stockTot<>>><<<<<<<>"+stockTot+"]");
System.out.println("Before netQuantity<>>><<<<<<<>"+netQuantity+"]");*/
if(stockTot < netQuantity)
{
System.out.println("Short Quantity for scheme item");
skipline = skipline + "'"+lineNo;
isRejected=true;
//stockBean.setRejected(isRejected);
//stockBean.setSkipline(skipline);
logMsg= saleOrder + "\t" + itemCode + "\t"+locCode + "\t" +lotNo+"\t"+ lineNo + "\tShort Quantity for scheme item";
strToWrite=strToWrite+logMsg+"\t\r\n";
postLog = "Short Quantity for scheme item, "+saleOrder+" "+itemCode+" "+lotNo+" "+lineNo;
errorLog("P06",postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
continue;
}
}
else if(stockTot == 0)
{
System.out.println(" Ratefild else insert into loop["+rateFailed+"]");
if(isScheme == true && "B".equalsIgnoreCase(itemFlag) && skipline.trim().indexOf("'"+lineNo.trim()) == 0 && itemCode.equalsIgnoreCase(itemCodeScheme)
&& lineNo.equalsIgnoreCase(lineScheme))
{
}
else
{
System.out.println("No Stock Available");
skipline = skipline + "'"+lineNo;
isRejected=true;
// stockBean.setRejected(isRejected);
// stockBean.setSkipline(skipline);
logMsg= saleOrder + "\t" + itemCode + "\t"+locCode + "\t" +lotNo+"\t"+ lineNo + "\tNo Stock Available";
strToWrite=strToWrite+logMsg+"\t\r\n";
postLog = "No Stock Available for "+saleOrder+" "+itemCode+" "+locCode+" "+lotNo+" "+lineNo;
errorLog("P09", postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
continue;
}
}
}//end of if rateFailed--F
// changes by arun ended 30-11-17
//}//end of while
System.out.println("@@@@@@@@@@@@@@@@@@@@@@@test stockList[[["+stockList.toString()+"]]]"); System.out.println("@@@@@@@@@@@@@@@@@@@@@@@test stockList[[["+stockList.toString()+"]]]");
System.out.println("stockcnt"+stockcnt); System.out.println("stockcnt"+stockcnt);
rs5.close(); rs5.close();
...@@ -4424,26 +4480,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -4424,26 +4480,6 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
merrcode=postLog(log,connCP); merrcode=postLog(log,connCP);
/*///////////////////////////////////////////-----------------------
if(merrcode.trim().length() !=0)
{
System.out.println("merrcode error log"+merrcode+"]");
errorString = itmDBAccessEJB.getErrorString("","CONSCOMBVR","","",conn);
return retString;
//merrcode = "";
//conn.commit();
}
else
{ merrcode = "";
conn.rollback();
errorString = itmDBAccessEJB.getErrorString("","CONSCOMBVR","","",conn);
return retString;
}
//================================================added arun p
*/
//}
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -4475,7 +4511,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -4475,7 +4511,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
try try
{ {
connCP = getConnection() ; connCP = getConnection();
System.out.println(" start calling postLog........"); System.out.println(" start calling postLog........");
ls_date = sdf.format(currentDate); ls_date = sdf.format(currentDate);
......
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