Skip to content

B
business-java
Commit 7ee00e42 authored by kmandhre's avatar kmandhre
Browse files
Options

change for 174-N and 180-N issue tracker points 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94020 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 109813f8
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 18 deletions
webitm-dis/ibase/webitm/ejb/dis/StockAllocationPrc.java
View file @ 7ee00e42
......@@ -153,6 +153,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
boolean isActives = false;
SimpleDateFormat sdf=null;
DistCommon dComm = new DistCommon();
String subSQL="";
retTabSepStrBuff = new StringBuffer("<?xml version = \"1.0\"?>");
retTabSepStrBuff.append("<DocumentRoot>");
retTabSepStrBuff.append("<description>").append("Datawindow Root").append("</description>");
......@@ -322,7 +323,18 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
//added by Kunal on 18/NOV/13
disOpt = checkNull( genericUtility.getColumnValue("dis_opt",headerDom));
System.out.println("Display option="+disOpt);
if( "A".equalsIgnoreCase(disOpt))
{
subSQL = " AND (((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - (SORDITEM.QTY_DESP*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_ALLOC >= 0 ) "
+" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )";
}
else
{
subSQL = " AND (((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - (SORDITEM.QTY_DESP*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_ALLOC > 0 ) "
+" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )";
}
getDataSql = "SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
+"SORDER.SALE_ORDER,SORDER.DUE_DATE,SORDITEM.ITEM_CODE,"
+"ITEM.DESCR,SORDITEM.QUANTITY,"
......@@ -359,11 +371,19 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
+" SORDER.DUE_DATE <= ? AND "
+" SORDITEM.ITEM_CODE >= ? AND "
+" SORDITEM.ITEM_CODE <= ? "
+"AND CASE WHEN SORDDET.STATUS IS NULL THEN 'P' ELSE SORDDET.STATUS end <> 'C' "
+"AND CASE WHEN SORDER.STATUS IS NULL THEN 'P' ELSE SORDER.STATUS end IN ('P','H') " //change done by Kunal on 22/10/12 as per S Manoharan instruction ,consider Hold status
+"AND (SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - (SORDITEM.QTY_DESP*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_ALLOC > 0 "
+"AND SORDITEM.LINE_TYPE = 'I' "
+"ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD";
+" AND CASE WHEN SORDDET.STATUS IS NULL THEN 'P' ELSE SORDDET.STATUS end <> 'C' "
+" AND CASE WHEN SORDER.STATUS IS NULL THEN 'P' ELSE SORDER.STATUS end IN ('P','H') " ; //change done by Kunal on 22/10/12 as per S Manoharan instruction ,consider Hold status
if( "A".equalsIgnoreCase(disOpt)) // added condition by cpatil on 17/12/13
{
getDataSql = getDataSql + "AND (SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - (SORDITEM.QTY_DESP*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_ALLOC >= 0 ";
}
else
{
getDataSql = getDataSql + "AND (SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - (SORDITEM.QTY_DESP*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_ALLOC > 0 ";
}
getDataSql = getDataSql + " AND SORDITEM.LINE_TYPE = 'I' "
+ " ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD ";
pstmt = conn.prepareStatement(getDataSql);
......@@ -462,9 +482,10 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
//+"AND (SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 OR SORDER.ALLOC_FLAG='M' )"
//Changed by sumit on 13/08/12 as per manual stock allocation start.
//+"AND SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 "
+" AND (((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - (SORDITEM.QTY_DESP*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_ALLOC > 0 ) "
+" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )"
+"AND SORDITEM.LINE_TYPE = 'I'";
// +" AND (((SORDITEM.QUANTITY*SORDITEM.CONV__QTY_STDQTY) - (SORDITEM.QTY_DESP*SORDITEM.CONV__QTY_STDQTY) - SORDITEM.QTY_ALLOC > 0 ) "
// +" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )" // both line commented by cpatil on 17/12/13
+"AND SORDITEM.LINE_TYPE = 'I' ";
sql=sql+subSQL;
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,rs.getString(4));
pstmt1.setString(2, rs.getString(3));
......@@ -877,6 +898,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
e.printStackTrace();
retStr = e.getMessage();
}
System.out.println("retStr:::"+retStr);
return retStr;
}
......@@ -925,9 +947,10 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
PreparedStatement pstmt = null;
Statement st = null;
int elements = 0,elements1 = 0,cnt=0;
int elements = 0,elements1 = 0,cnt=0,elements2 = 0;
ArrayList list = new ArrayList();
ArrayList list1 = new ArrayList();
ArrayList list2 = new ArrayList();
boolean flag = false,isFlag = true,allocqtyflag = false,pendingOrderFlag=false;
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
String sql = "",shipStatus="";
......@@ -947,6 +970,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
{
pendingOrderFlag = false;
flag = false;
isFlag = true;
parentNode = parentNodeList.item(selectedRow);
childNodeList = parentNode.getChildNodes();
......@@ -1028,7 +1052,7 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
{
System.out.println("==activeAllow validate 4 N ==");
flag = true;
errString = "VTACTALW2";
errString = "VTACTALW4";
errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
}
}
......@@ -1134,11 +1158,26 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
{
System.out.println("if calling........");
errString = sorderAllocate(saleOrder, lineNo, itemCode, allocQty, expLev ,holdFlag,activeAllow);
System.out.println("@@@@@@ sorderAllocate return string["+errString+"]");
if (errString != null && errString.trim().length() > 0)
{
if( errString.indexOf("VSTQTYER") != -1)
{
System.out.println("@@@@@@@@@[VSTQTYER]");
isFlag = false;
list2.add(saleOrder);
list2.add(lineNo);
list2.add(itemCode);
list2.add(allocQty);
elements2 ++;
}
else
{
System.out.println("@@@errString :"+errString);
return errString;
}else
}
}
else
{
allocqtyflag = true;
}
......@@ -1158,18 +1197,30 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
}// out for loop
//added by ritesh on 07/10/13 for request DI3ESUN009 start
//if (errString != null && errString.trim().length() > 0)
if(isFlag == false)
//errString = "PROCSUCC";
//errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
System.out.println("CHEK isFlag::"+isFlag);
if(isFlag == false && errString != null && errString.trim().length() > 0)
{
/*Commented by Manoj dtd 17/12/2013
if(allocqtyflag = true)
{
System.out.println("@@@@@ inside if["+errString+"]");
// errString = "VTACTALW2";
errString = "PROCSUCC";
errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
}
}*/
errString = "PROCSUCC";
errString = itmDBAccessEJB.getErrorString("",errString,"","",conn);
System.out.println("before errString=="+errString);
String begPart = errString.substring( 0, errString.indexOf("<trace>") + 7 );
String endPart = errString.substring( errString.indexOf("</trace>"));
String mainStr = begPart + "Following error has occured\n" ;
String mainStr = "";
if(elements > 0 || elements1 > 0 || elements2 > 0)
{
mainStr = begPart + "Following error has occured\n" ;
}
if(elements > 0 )
{
mainStr = mainStr + "Invalid quantity,Entered quantity is not in multiple of Case/shipper Quantity.\n";
......@@ -1183,11 +1234,11 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
mainStr = mainStr +
"sale order :"+list.get(i++)+ ",line no :"+ list.get(i++) + ",item code :"+list.get(i++)+",quantity :"+list.get(i++)+"\n" ;
}
if(elements1 > 0 )
{
mainStr = mainStr + "\n pending / incomplete Wave found against sale order.\n";
}
for(int i = 0; i < elements1 * 4 ; i++ )
{
if( i > 0)
......@@ -1198,11 +1249,28 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
"sale order :"+list1.get(i++)+ ",line no :"+ list1.get(i++) + ",item code :"+list1.get(i++)+",quantity :"+list1.get(i++)+"\n" ;
}
if( elements2 > 0 )
{
mainStr = mainStr + "\n Insufficient stock available.\n";
}
for(int i = 0; i < elements2 * 4 ; i++ )
{
if( i > 0)
{
i -= 1;
}
mainStr = mainStr +
"sale order :"+list2.get(i++)+ ",line no :"+ list2.get(i++) + ",item code :"+list2.get(i++)+",quantity :"+list2.get(i++)+"\n" ;
}
mainStr = mainStr + endPart;
errString = mainStr;
begPart =null;
endPart =null;
mainStr =null;
System.out.println("after errString=="+errString);
return errString;
}
......@@ -1868,6 +1936,9 @@ public class StockAllocationPrc extends ProcessEJB implements StockAllocationPrc
}
else
{
//errCode = "VSTQTYER";
errString = itmDBAccessEJB.getErrorString("", "VSTQTYER", "", "", conn);
//errString = "VSTQTYER";
conn.rollback();
}
}
......
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