Commit b871cc4e authored by prane's avatar prane

'Ship complete Order' Flag not considered in Order Posting.[D17JPIT001]

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@180156 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4fe7833a
...@@ -8,6 +8,7 @@ import ibase.webitm.ejb.E12CreateBatchLoadEjb; ...@@ -8,6 +8,7 @@ import ibase.webitm.ejb.E12CreateBatchLoadEjb;
import ibase.webitm.ejb.E12GenerateEDIEJB; import ibase.webitm.ejb.E12GenerateEDIEJB;
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ProcessEJB; import ibase.webitm.ejb.ProcessEJB;
import ibase.webitm.ejb.dis.SordItemBean;
import ibase.webitm.ejb.dis.StockBean; import ibase.webitm.ejb.dis.StockBean;
import ibase.webitm.ejb.fin.FinCommon; import ibase.webitm.ejb.fin.FinCommon;
import ibase.webitm.ejb.fin.InvAcct; import ibase.webitm.ejb.fin.InvAcct;
...@@ -34,6 +35,7 @@ import java.util.Arrays; ...@@ -34,6 +35,7 @@ import java.util.Arrays;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import javax.ejb.Stateless; import javax.ejb.Stateless;
...@@ -67,6 +69,10 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -67,6 +69,10 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//Connection conn = null; //Connection conn = null;
ArrayList<String> salesOrderListAll=new ArrayList<String>(); ArrayList<String> salesOrderListAll=new ArrayList<String>();
ArrayList<String> postSalOder=new ArrayList<String>(); ArrayList<String> postSalOder=new ArrayList<String>();
//added By Pavan R on 2K18/Feb/12 to store the posted so.[Start]
ArrayList<String> sorderpostedList = new ArrayList<String>();
//added By Pavan R on 2K18/Feb/12[End]
public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException public String process(String xmlString, String xmlString2, String windowName, String xtraParams) throws RemoteException,ITMException
{ {
...@@ -564,8 +570,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -564,8 +570,8 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(isPostDone) if(isPostDone)
{ {
//System.out.println("salesOrderListAll>>>>"+salesOrderListAll); System.out.println("salesOrderListAll>>>>"+salesOrderListAll);
//System.out.println("postSalOder>>>>"+postSalOder); System.out.println("postSalOder>>>>"+postSalOder);
for(int i=0;i<salesOrderListAll.size();i++) for(int i=0;i<salesOrderListAll.size();i++)
{ {
saleOrder=salesOrderListAll.get(i); saleOrder=salesOrderListAll.get(i);
...@@ -578,9 +584,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -578,9 +584,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
} }
} }
} }
//System.out.println("salesOrderListAll>>> After Remove>>>"+salesOrderListAll); System.out.println("salesOrderListAll>>> After Remove>>>"+salesOrderListAll);
retString=""; retString="";
String mainStr=""; String mainStr="";
for(int i=0;i<salesOrderListAll.size();i++) for(int i=0;i<salesOrderListAll.size();i++)
{ {
retString=retString+salesOrderListAll.get(i)+","; retString=retString+salesOrderListAll.get(i)+",";
...@@ -588,7 +594,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -588,7 +594,7 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if(retString !=null && retString.trim().length()>0) if(retString !=null && retString.trim().length()>0)
{ {
retString = retString.substring(0, retString.length() - 1); retString = retString.substring(0, retString.length() - 1);
mainStr = "For Following Sales orders Not posted :" ; mainStr = "\nFor Following Sales orders Not posted :" ;
}else }else
{ {
mainStr = "All Order Posted Successfully ." ; mainStr = "All Order Posted Successfully ." ;
...@@ -599,7 +605,29 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -599,7 +605,29 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
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>"));
mainStr=begPart+mainStr+retString; //added By Pavan R on 2K18/Feb/12 for 'Ship complete Order' Flag not considered in Order Posting.[Start]
//to display posted and not posted so
LinkedHashSet<String> sorderpostedSet = new LinkedHashSet<String>(sorderpostedList);
ArrayList<String> sorderpstdLst = new ArrayList<String>(sorderpostedSet);
String mainStr1="For Following Sales orders posted :" ;
String reString1 ="";
if(sorderpstdLst.size() != 0)
{
for(int i=0;i<sorderpstdLst.size();i++)
{
reString1=reString1+sorderpstdLst.get(i)+",";
}
mainStr=begPart+mainStr1+reString1+mainStr+retString;
}
else
{
mainStr=begPart+mainStr+retString;
}
//mainStr=begPart+mainStr+retString;
//added By Pavan R on 2K18/Feb/12 for [End]
if(mainStr.trim().length()==0) if(mainStr.trim().length()==0)
{ {
mainStr = begPart; mainStr = begPart;
...@@ -927,7 +955,23 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -927,7 +955,23 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
if (errCode == null || errCode.trim().length()==0) if (errCode == null || errCode.trim().length()==0)
{ {
postSalOder.add(SaleOrder); //added By Pavan R on 2K18/Feb/12 for 'Ship complete Order' Flag not considered in Order Posting.[Start]
//to display posted and not posted so
if ("Y".equalsIgnoreCase(clubOrder))
{
for (String postedSO : sorderpostedList)
{
postSalOder.add(postedSO);
}
}
else
{
postSalOder.add(SaleOrder);
}
//postSalOder.add(SaleOrder);
//added By Pavan R on 2K18/Feb/12[End]
} }
/*for(int i=0;i<showSordrList.size();i++) /*for(int i=0;i<showSordrList.size();i++)
{ {
...@@ -3668,6 +3712,86 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -3668,6 +3712,86 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
//}added arun //}added arun
//added By Pavan R on 2K18/Feb/12 for 'Ship complete Order' Flag not considered in Order Posting.[Start]
boolean partQtyFlag = false;
if("0".equalsIgnoreCase(partQty) || "1".equalsIgnoreCase(partQty))
{
System.out.println("sordItemList::["+sordItemList+"]");
for(SordItemBean sordItemBean : sordItemList)
{
double updQty1 = 0.0, updQtyTot = 0.0;
sordItmQty = sordItemBean.getSordItmQty();
stockList=sordItemBean.getStockList();
partQty = sordItemBean.getSorderBean().getPartQty();
saleOrder = sordItemBean.getSaleOrder();
itemCode = sordItemBean.getItemCode();
lineNo=sordItemBean.getLineNo();
System.out.println("####SaleOrder["+saleOrder+"]itemCode["+itemCode+"]lineNo["+lineNo+"]");
System.out.println("3688### stockList Size["+stockList.size()+"]");
for(StockBean stockBean :stockList)
{
updQty1 = stockBean.getAllocQtyUpd();
System.out.println("stockbean---updQty1::"+updQty1);
itemCodeOrd = stockBean.getSordItemBean().getItemCodeOrd();
quantityStduom = stockBean.getSordItemBean().getQuantityStduom();
System.out.println("stockbean---itemCodeOrd::"+itemCodeOrd);
itemCode = stockBean.getSordItemBean().getItemCode();
System.out.println("stockbean---itemCode::"+itemCode);
System.out.println("stockbean---quantityStduom::"+quantityStduom);
isRejected = stockBean.isRejected();
System.out.println("stockbean---isRejected-"+isRejected);
if(isRejected)
{
continue;
}
System.out.println("stockOpt::["+stockOpt+"]sordItmQty["+sordItmQty+"]");
updQtyTot = updQtyTot + updQty1;
System.out.println("stockbean---updQtyTot::"+updQtyTot);
}//end of for(StockBean stockBean :stockList) 2nd iterator..........
if(sordItmQty > 0)
{
System.out.println("$$$SaleOrder["+saleOrder+"]itemCode["+itemCode+"]lineNo["+lineNo+"]");
//System.out.println("updQty1 < quantityStduom ["+updQty1+"<"+quantityStduom);
System.out.println("-------["+updQtyTot+"<"+sordItmQty+"]------");
//if(updQtyTot < quantityStduom)
if(updQtyTot < sordItmQty)
{
String prtQty[] = {"Ship complete order", "Ship part order - Full Qty", "Ship Available" };
String prtQtyMsg = "";
if("0".equalsIgnoreCase(partQty)){
prtQtyMsg = prtQty[0];
}else{
prtQtyMsg = prtQty[1];
}
System.out.println("No Stock Available PartQty");
skipline = skipline + "'"+lineNo;
isRejected=true;
sordItemBean.setRejected(isRejected);
sordItemBean.setSkipline(skipline);
logMsg = saleOrder + "\t" + itemCode + "\t"+locCode + "\t" +lotNo+"\t"+ lineNo + "\tNo Stock Available";
strToWrite=strToWrite+logMsg+"\t\r\n";
postLog = "Short stock for "+prtQtyMsg+" type PartQty "+saleOrder+" "+itemCode+" "+locCode+" "+lotNo+" "+lineNo;
errorLog("P09", postLog,"sorditem",saleOrder, lineNo, expLev, " ", " ", saleOrder, "S-DSP","REAS_CODE","W_POST_ORDER",conn);
partQtyFlag = true; //If partQty is 0
if("0".equalsIgnoreCase(partQty))
{
break;
}
continue;
}
}//end of if(netQuantity > 0)
}//end of SordItemBean loop
}//end of if("0".equals(partQty) || "1".equals(partQty))
//added By Pavan R on 2K18/Feb/12[End]
int vaildateData=0; int vaildateData=0;
double totInputQty=0.0; double totInputQty=0.0;
PreparedStatement pstmt6 = null; PreparedStatement pstmt6 = null;
...@@ -4036,6 +4160,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca ...@@ -4036,6 +4160,9 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
invAllocTraceMap.put("chg_term",termId); invAllocTraceMap.put("chg_term",termId);
invAllocTraceMap.put("chg_win","W_SORDER"); invAllocTraceMap.put("chg_win","W_SORDER");
//added By Pavan R on 2K18/Feb/12 to store the posted so.[Start]
sorderpostedList.add(saleOrder);
//added By Pavan R on 2K18/Feb/12[End]
InvAllocTraceBean invBean = new InvAllocTraceBean(); InvAllocTraceBean invBean = new InvAllocTraceBean();
merrcode = invBean.updateInvallocTrace(invAllocTraceMap,conn); merrcode = invBean.updateInvallocTrace(invAllocTraceMap,conn);
if(merrcode != null && merrcode.trim().length() > 0) if(merrcode != null && merrcode.trim().length() > 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