Skip to content

B
business-java
Commit 2ff4f70f authored by kshinde's avatar kshinde
Browse files
Options

Bug fix for free quantity not setting in invoice 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@106643 ce508802-f39f-4f6c-b175-0d175dae99d5
parent de842430
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 34 deletions
webitm-dis/ibase/webitm/ejb/dis/PostOrderActivity.java
View file @ 2ff4f70f
......@@ -1294,7 +1294,12 @@ public class PostOrderActivity {
pstmt1.close();
pstmt1=null;
schemeCode = checkScheme(itemCdParent,orderType, custCode,siteCode,stateDlv,countCodeDlv,tranDate,conn);
String temp=checkNull(schemeCode);
System.out.println("schemeCode:::::::::::::::::"+schemeCode);
if(schemeCode==null || temp.trim().length()==0)
{
continue;
}
if(schemeCode !=null && (schemeCode.trim()).length()>0)
{
sql="select app_from, valid_upto "
......
webitm-dis/ibase/webitm/ejb/dis/PostOrderProcess.java
View file @ 2ff4f70f
......@@ -28,6 +28,7 @@ import java.sql.SQLException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
......@@ -36,6 +37,7 @@ import java.util.List;
import javax.ejb.Stateless;
import javax.naming.InitialContext;
import org.apache.poi.util.SystemOutLogger;
import org.w3c.dom.Document;
//import ibase.utility.CommunicationComp;
import org.w3c.dom.NodeList;
......@@ -1563,6 +1565,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
int countItem=0;
double pendingDeallocQty=0.0,stockTot=0.0;
int updSordAllDetCnt=0;
String createLog=null;
......@@ -1676,6 +1679,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
rs = null;
pstmt.close();
pstmt = null;
System.out.println("saleOrderCnt"+saleOrderCnt);
/*-----Start Iterator for SorderItem against sale order----------------*/
......@@ -1685,9 +1689,11 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{*/
//System.out.println("sorderList :"+sorderList.size());
sordItemList= new ArrayList<SordItemBean>();
int sorderlistcnt=0;
for(SorderBean sorderBean : sorderList)
{
sorderlistcnt++;
/* SorderBean sorderBean = new SorderBean();
sorderBean = (SorderBean) sordIterator.next();*/
......@@ -1700,14 +1706,14 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
salesOrderListAll.add(saleOrder);
}
varValue = itmDBAccessEJB.getEnvDis("999999", "CREATE_POST_LOG_FILE", conn);
createLog = itmDBAccessEJB.getEnvDis("999999", "CREATE_POST_LOG_FILE", conn);
//System.out.println("varValue :"+varValue);
//ls_varvalue = gf_getenv_dis('999999','CREATE_POST_LOG_FILE')
if( "NULLFOUND".equalsIgnoreCase(varValue) )
if( "NULLFOUND".equalsIgnoreCase(createLog) )
{
varValue ="N";
createLog ="N";
}
if("Y".equalsIgnoreCase(varValue) )
if("Y".equalsIgnoreCase(createLog) )
{
//logFile="c:\\appl\\itm26\\" + fromSaleOrder.trim().toLowerCase()+ "_post.log";
logFileInit=intializingLog("post_order",saleOrder);
......@@ -1746,8 +1752,11 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
rs = pstmt.executeQuery();
int sorditmlistcnt=0;
while(rs.next())
{
sorditmlistcnt++;
SordItemBean sordItemBean = new SordItemBean();
//SorderBean sorderBean2 = new SorderBean();
......@@ -1911,6 +1920,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
sordItemList.add(sordItemBean);
}
System.out.println("sorditmlistcnt"+sorditmlistcnt);
sorderBean.setSorditemList(sordItemList);
//sordItemList.clear();
rs.close();
......@@ -1918,6 +1928,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
pstmt.close();
pstmt = null;
}//End of iterator sordIterator
System.out.println("sorderlistcnt"+sorderlistcnt);
int stockTestCnt=0,forTestCnt=0;
//System.out.println("sordItemList size :"+sordItemList.size());
......@@ -2042,8 +2053,11 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
pstmt5.setString(1,itemCode);
pstmt5.setString(2,siteCode);
rs5 = pstmt5.executeQuery();
int stockcnt=0;
while(rs5.next())
{
stockcnt++;
isRejected=false;
allocQty=0;
......@@ -2203,6 +2217,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
graceDays = rs.getInt("grace_days");
}
System.out.println("GraceDays:::"+graceDays);
rs.close();
rs = null;
pstmt.close();
......@@ -2212,8 +2227,10 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
graceDays = -1 * graceDays;
}
System.out.println("if >0 GraceDays:::"+graceDays);
allocDate = utilmethod.RelativeDate(allocDate, graceDays);
System.out.println("allocDate:::"+allocDate);
//System.out.println("allocDate >>>>>"+allocDate);
sql = " select count(*) as count from scheme_applicability where" +
......@@ -2228,15 +2245,18 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
schemeCnt = rs.getInt(1);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
System.out.println("schemeCnt:::"+schemeCnt);
if(schemeCnt >1)
{
//System.out.println("Scheme details not found for line no :"+lineNo);
System.out.println("scheme count break:::::");
isRejected=true;
stockBean.setRejected(isRejected);
logMsg= saleOrder + "\t" + itemCode + "\t"+locCode + "\t" +lotNo+"\t"+ lineNo + "\tScheme details not found ";
......@@ -2247,6 +2267,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
if(schemeCnt == 0)
{
System.out.println("scheme count continue::::");
skipline = skipline + "'"+lineNo;
//setDate = datetime(today(),now())
//System.out.println("Scheme Not Applicable Due To Scheme Validity Period");
......@@ -2295,6 +2316,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
rs = null;
pstmt.close();
pstmt = null;
System.out.println("countItem:::"+countItem);
if(countItem>1)
{
itemOld="";
......@@ -2307,10 +2329,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
while(rs.next())
{
lsItem = checkNull(rs.getString("item_code"));
System.out.println("lsItem"+lsItem+"itemOld"+itemOld);
if (lsItem.trim().length()>0)
{
if(!itemOld.trim().equalsIgnoreCase(lsItem))
{
System.out.println("inside old break");
isScheme = false;
break;
}
......@@ -2340,22 +2364,38 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
applyCustList = checkNull(rs.getString("applyCustList"));
noapplyCustList = checkNull(rs.getString("noapplyCustList"));
System.out.println("applyCustList["+applyCustList+"] noapplyCustList["+noapplyCustList+"]");
if(applyCustList.trim().length() > 0)
{
System.out.println("inside applyCustList");
applyCust = dist.getToken(applyCustList, ",");
if(applyCust.trim().indexOf(custCode.trim()) == 1)
System.out.println("custCode::"+custCode);
String lsApplyCustListArr[] = applyCustList.split(",");
ArrayList<String> lsapplyCustList=new ArrayList<String>(Arrays.asList(lsApplyCustListArr));
if(lsapplyCustList.contains(custCode.trim()))
{
mcount1 = 1;
System.out.println("Inside mcount ["+mcount1+"]");
}
/*if(applyCust.trim().indexOf(custCode.trim()) == 1)
{
mcount1 = 1;
System.out.println("Inside mcount ["+mcount1+"]");
}*/
}
if(noapplyCustList.trim().length() > 0)
{
System.out.println("Inside noapplyCustList");
noApplyCust = dist.getToken(applyCustList, ",");
if(noApplyCust.trim().indexOf(custCode.trim()) == 1)
{
mcount2 = 1;
System.out.println("Inside mcount2["+mcount2+"]");
}
}
......@@ -2370,6 +2410,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(applyCustList.trim().length() > 0 && mcount1 == 0)
{
System.out.println("Inside continue applyCustList::::");
//System.out.println("Scheme Not Applicable Due To Scheme Validity Period ");
skipline = skipline + "'"+lineNo;
isRejected=true;
......@@ -2381,10 +2422,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//logMsg = saleOrder + "/t" + itemCodeOrd + "/t" + itemCode + "/t" + "/t/t" + "/t" + lineNo + "/tScheme Not Applicable Due To Scheme Validity Period";
continue;
}
if(noapplyCustList.trim().length() > 0 && mcount2 == 1)
{
System.out.println("Inside noapplyCustList continue::::");
//System.out.println("Scheme Not Applicable Because Of NoApply Customer List ");
skipline = skipline + "'"+lineNo;
isRejected=true;
......@@ -2480,31 +2523,31 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//logMsg = saleOrder + "/t" + itemCode + "/t" + lotNo + "/t" + lineNo + "/t Expiry Date cannot be empty";
continue;
}
//System.out.println("minShelfLife>>>"+minShelfLife);
//System.out.println("orderType>>>"+orderType);
System.out.println("minShelfLife>>>"+minShelfLife);
System.out.println("orderType>>>"+orderType);
if(minShelfLife > 0)
{
if("NE".equalsIgnoreCase(orderType.trim()))
{
chkDate1 = dist.CalcExpiry(allocDate, minShelfLife + 1);
chkDate2 = dist.CalcExpiry(allocDate, maxShelfLife );
//System.out.println("chkDate1["+chkDate1+"]"+"chkDate2["+chkDate2+"]");
System.out.println("chkDate1["+chkDate1+"]"+"chkDate2["+chkDate2+"]");
}
else
{
chkDate = dist.CalcExpiry(allocDate, minShelfLife + 1);
//System.out.println("chkDate :"+chkDate);
System.out.println("chkDate :"+chkDate);
}
if(chkDate1 == null && chkDate2 == null)
{
//if mchk_date >= mexp_date
//System.out.println("chkDate["+chkDate+"]"+"expDate["+expDate+"]");
System.out.println("chkDate["+chkDate+"]"+"expDate["+expDate+"]");
if(chkDate != null && expDate != null)
{
if(chkDate.after(expDate))
{
//System.out.println("Near Expiry Item or Expired Item!!!!");
System.out.println("Near Expiry Item or Expired Item!!!!");
skiplot = skiplot + "'"+lineNo;
isRejected=true;
stockBean.setRejected(isRejected);
......@@ -2522,7 +2565,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//(NOT(mexp_date >= mchk_date1 AND mexp_date <= mchk_date2) )
if(!(expDate.after(chkDate1) && expDate.after(chkDate2)))
{
//System.out.println("Near Expiry Item or Expired Item");
System.out.println("Near Expiry Item or Expired Item");
skiplot = skiplot + "'"+lineNo;
isRejected=true;
stockBean.setRejected(isRejected);
......@@ -2745,7 +2788,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(lockqty < netQuantity)
{
//System.out.println("Short Quantity for scheme item");
System.out.println("Short Quantity for scheme item");
skipline = skipline + "'"+lineNo;
isRejected=true;
stockBean.setRejected(isRejected);
......@@ -2766,7 +2809,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
else
{
//System.out.println("No Stock Available");
System.out.println("No Stock Available");
skipline = skipline + "'"+lineNo;
isRejected=true;
stockBean.setRejected(isRejected);
......@@ -2787,8 +2830,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
/*-------------------changes done on 08-02-2015--------------------------------------*/
netQuantity = sordItmQty;
/*System.out.println("sordItmQty :"+sordItmQty);
System.out.println("netQuantity:"+netQuantity);*/
System.out.println("sordItmQty :"+sordItmQty);
System.out.println("netQuantity:"+netQuantity);
......@@ -2838,12 +2881,12 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(schemeCnt > 0)
{
/*System.out.println("lineNo>>>>"+lineNo);
System.out.println("lineNo>>>>"+lineNo);
System.out.println("lineNoOld>>>>"+lineNoOld);
System.out.println("saleOrder>>>>"+saleOrder);
System.out.println("saleOrderOld>>>>"+saleOrderOld);
System.out.println("itemCodeOld>>>>"+itemCodeOld);
System.out.println("itemCode>>>>"+itemCode);*/
System.out.println("itemCode>>>>"+itemCode);
if(lineNo != lineNoOld || saleOrder != saleOrderOld || itemCodeOld != itemCode )
{
//ratio = i_nvo_post_order.gbf_scheme(msaleorder,integer(mline_no),as_lot_sl,ls_loc_group)
......@@ -2979,7 +3022,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
{
inputQty = orgQty ;
}
//System.out.println("orgQty ["+orgQty+"]"+"inputQty ["+inputQty+"]");
System.out.println("orgQty ["+orgQty+"]"+"inputQty ["+inputQty+"]");
......@@ -3000,14 +3043,14 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
pstmt.close();
pstmt = null;
//System.out.println("lcQty["+lcQty+"]"+"inputQty["+inputQty+"]"+"modQuantity["+modQuantity+"]");
System.out.println("lcQty["+lcQty+"]"+"inputQty["+inputQty+"]"+"modQuantity["+modQuantity+"]");
lcQty = inputQty - modQuantity;
inputQty = lcQty;
//System.out.println("inputQty["+inputQty+"]"+"orgQty["+orgQty+"]");
System.out.println("inputQty["+inputQty+"]"+"orgQty["+orgQty+"]");
if((orgQty - inputQty) > 0)
{
//System.out.println("Quantity converted as per box. Pending Quantity ");
System.out.println("Quantity converted as per box. Pending Quantity ");
isRejected=true;
stockBean.setRejected(isRejected);
......@@ -3031,8 +3074,21 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//}
sql="select nature from sorddet where line_no=? and sale_order= ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,lineNo);
pstmt.setString(2,saleOrder);
rs = pstmt.executeQuery();
if(rs.next())
{
nature = rs.getString("nature");
}
System.out.println("nature::"+nature);
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if(inputQty > 0)//2514
{
if("F".equalsIgnoreCase(nature))
......@@ -3054,7 +3110,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(itemCodeParent != null && itemCodeParent.trim().length() > 0 )
{
schemeCode = checkScheme(itemCodeParent, orderType,custCode,siteCode,stateCodeDlv,countCodeDlv,allocDate,conn);
System.out.println("checkScheme:::"+schemeCode);
if(schemeCode != null && schemeCode.trim().length() > 0)
{
......@@ -3139,9 +3195,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
rs = null;
pstmt.close();
pstmt = null;
/*System.out.println("chargeQty>>>"+chargeQty);
System.out.println("chargeQty>>>"+chargeQty);
System.out.println("appMinQty>>>"+appMinQty);
System.out.println("appMaxQty>>>"+appMaxQty);*/
System.out.println("appMaxQty>>>"+appMaxQty);
if(chargeQty >= appMinQty && chargeQty <= appMaxQty)
{
......@@ -3158,7 +3214,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
System.out.println("freeQty>>>"+freeQty);*/
if((inputQty + totFreeQty + allocFreeQty) > freeQty )
{
//System.out.println("Chargeable quantity of group of items not eligible for the free quantity");
System.out.println("Chargeable quantity of group of items not eligible for the free quantity");
skipline = skipline + "'"+lineNo;
isRejected=true;
stockBean.setRejected(isRejected);
......@@ -3175,7 +3231,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(batqty == 0.0 && qtyper == 0.0 && appMinQty == 0.0 && appMaxQty == 0.0)//record not found above sql query
{
//System.out.println("Group of items is not eligible for the free quantity");
System.out.println("Group of items is not eligible for the free quantity");
skipline = skipline + "'"+lineNo;
isRejected=true;
stockBean.setRejected(isRejected);
......@@ -3194,7 +3250,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
else //No Scheme exists
{
//System.out.println("Scheme Not Applicable Due To Scheme Validity Period ");
System.out.println("Scheme Not Applicable Due To Scheme Validity Period ");
skipline = skipline + "'"+lineNo;
isRejected=true;
stockBean.setRejected(isRejected);
......@@ -3211,7 +3267,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}//end of if(itemCodeParent != null && itemCodeParent.trim().length() > 0 )
else
{
//System.out.println("Scheme Item is not belong to the group of items");
System.out.println("Scheme Item is not belong to the group of items");
skipline = skipline + "'"+lineNo;
isRejected=true;
stockBean.setRejected(isRejected);
......@@ -3271,6 +3327,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}//end of while
//System.out.println("@@@@@@@@@@@@@@@@@@@@@@@test stockList[[["+stockList.toString()+"]]]");
System.out.println("stockcnt"+stockcnt);
rs5.close();
rs5 = null;
pstmt5.close();
......@@ -3719,7 +3776,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(logMsg.trim().length() > 0)
{
if("Y".equalsIgnoreCase(varValue))
if("Y".equalsIgnoreCase(createLog))
{
//strToWrite = strToWrite + logMsg+"\r\n\r\n";
fos1.write(strToWrite.getBytes());
......@@ -4351,12 +4408,29 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
schemeCode = curscheme ;
if(applyCustList != null && applyCustList.trim().length() > 0)
{
ls_apply_cust = dist.getToken(ls_apply_cust_list,",");
/*ls_apply_cust = dist.getToken(ls_apply_cust_list,",");
if(ls_apply_cust.trim().equalsIgnoreCase(as_cust_code))
{
schemeCode = curscheme;
curschemeCode = curscheme ;
}*/
schemeCode=null;
System.out.println("lsSchemeCode:::::::1"+schemeCode);
//lsCustCode = checkNull(genericUtility.getColumnValue("cust_code", dom1));
System.out.println("CustCode"+as_cust_code+":::");
String lsApplyCustListArr[] = applyCustList.split(",");
ArrayList<String> applyCustList1= new ArrayList<String>(Arrays.asList(lsApplyCustListArr));
if(applyCustList1.contains(as_cust_code.trim()))
{
System.out.println("Inside applycustList");
schemeCode = curscheme;
curschemeCode = curscheme ;
System.out.println("SchemeCode::"+schemeCode+" CustSchemeCode::"+curscheme);
// break;
}
}
......@@ -4380,14 +4454,18 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(schemeCode != null)
{
ll_schcnt ++;
}
else if(ll_schcnt == 1 )
{
schemeCode = prevscheme;
}
System.out.println("ll_schcnt::"+ll_schcnt);
}
......@@ -4402,7 +4480,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
}
else if(curschemeCode.trim().length() > 0)
{
System.out.println("Inside curschemeCode");
schemeCode = curschemeCode;
System.out.println("schemeCode"+schemeCode);
}
}
......@@ -4412,6 +4492,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
e.printStackTrace();
throw new ITMException(e);
}
System.out.println("");
return schemeCode;
}
......
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