Skip to content

B
business-java
Commit 031e60a3 authored by kdabholkar's avatar kdabholkar
Browse files
Options

commit changes for group scheme of sorder wizard 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177366 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4aa4e87d
Show whitespace changes
Inline Side-by-side
Showing with 170 additions and 17 deletions
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJB.java
View file @ 031e60a3
......@@ -55,6 +55,7 @@ import ibase.webitm.ejb.MasterStatefulLocal;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.dis.SalesOrderIC;
import ibase.webitm.ejb.dis.adv.SorderAct;
import ibase.webitm.utility.GenerateFormLayout;
import ibase.webitm.utility.GenerateTranLayout;
import ibase.webitm.utility.ITMException;
......@@ -65,6 +66,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{
E12GenericUtility genericUtility = new E12GenericUtility();
DistCommon distCommon = new DistCommon();
SorderAct sorderAct = new SorderAct();
SalesOrderIC salesOrderIC = new SalesOrderIC();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
/**
......@@ -1161,13 +1163,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{
itemCode = itmNode.getFirstChild().getNodeValue();
sql = " SELECT ITEM_PARNT, ITEM_SER FROM ITEM WHERE ITEM_CODE = ? ";
// sql = " SELECT ITEM_PARNT, ITEM_SER FROM ITEM WHERE ITEM_CODE = ? ";
sql = " SELECT PRODUCT_CODE, ITEM_SER FROM ITEM WHERE ITEM_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
rs = pstmt.executeQuery();
if ( rs.next() )
{
itemParnt = checkNullAndTrim(rs.getString("item_parnt"));
itemParnt = checkNullAndTrim(rs.getString("PRODUCT_CODE"));
itemSer = checkNullAndTrim(rs.getString("item_ser"));
}
......@@ -2126,7 +2129,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<RECORDS>\r\n");
String qty = "0", discount = "0.0",rate = "0.0",itemParentRate= "",taxClass="",taxEnv="",taxChap="",itemSer="",stationFrom="",stationTo="",tax_amt="";
String qty = "0", discount = "0.0",rate = "0.0",itemParentRate= "",taxClass="",taxEnv="",
taxChap="",itemSer="",stationFrom="",stationTo="",tax_amt="",schemeCode="",schemeDesc="";
double newRate=0.0,taxAmount=0.0;
String itmCode = "",SalesPriceList = "",lsListType= "",ContractNo = "";
int dimlistlen = dimensionList.size();
......@@ -2208,11 +2212,10 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
sql = "select sum (quantity- (case when ALLOC_QTY is null then 0 else ALLOC_QTY end)" +
"- (case when HOLD_QTY is null then 0 else HOLD_QTY end)) as in_stock from STOCK s,item i"
+ " where s.item_code= ? and i.product_code= ? and s.site_code =?";
+ " where s.item_code= ? and i.item_code = s.item_code and s.site_code =?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itmCode);
pstmt.setString(2, itemParent);
pstmt.setString(3, siteCode);
pstmt.setString(2, siteCode);
rs = pstmt.executeQuery();
......@@ -2313,12 +2316,46 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
taxEnv = checkNullAndTrim(distCommon.getTaxEnv(stationFrom, stationTo, taxChap, taxClass, siteCode, conn));
}
System.out.println("taxChap::"+taxChap+"taxClass::"+taxClass+"taxEnv::"+taxEnv);
//changes by kaustubh on 27 nov 2017 End
//changes by kaustubh on 13 dec 2017 End
//changes by kaustubh on 20 dec 2017 start
schemeCode = "";
schemeDesc = "";
sql = " select a.scheme_code,a.descr from SCH_GROUP_DEF a,SCH_PUR_ITEMS b "
+ " where a.SCHEME_CODE = b.SCHEME_CODE and trim(b.ITEM_CODE) = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itmCode);
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("@@inside scheme query");
schemeCode = checkNullAndTrim(rs.getString("scheme_code"));
schemeDesc = checkNullAndTrim(rs.getString("descr"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
System.out.println("scheme code"+schemeCode+"schemeDesc"+schemeDesc);
//changes by kaustubh on 20 dec 2017 End
if(orderDate !=null && orderDate.length()>0)
{
orderDateString = Timestamp.valueOf(genericUtility.getValidDateString(orderDate,
genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
}
System.out.println("orderDateString"+orderDateString);
......@@ -2386,13 +2423,13 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{
//temStrBuffer.append("<![CDATA[").append(dataMap.get(key)).append("]]>\r\n");
System.out.println("inside qty");
temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt).append("]]>\r\n");
temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt+"~"+schemeCode+"~"+schemeDesc).append("]]>\r\n");
}
else
{
//temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty).append("]]>\r\n");
//temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount+"~"+rate).append("]]>\r\n");
temStrBuffer.append("<![CDATA[").append(itmCode+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt).append("]]>\r\n");
temStrBuffer.append("<![CDATA[").append(itmCode+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt+"~"+schemeCode+"~"+schemeDesc).append("]]>\r\n");
}
// key = key + ":"+ rate;
System.out.println("newRateCalulated"+newRate);
......@@ -2408,7 +2445,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
"&#010;"+colName2+" = "+dimensionList.get(i)+","+
"&#010;Size = "+sizeList.get(k)+""+","+
"&#010;Rate = "+newRate+""+","+
"&#010;In Stock = "+totalQty+":totalQtyData='"+totalQty+"'";
"&#010;In Stock = "+totalQty+
"&#010;Scheme Code = "+schemeCode+
"&#010;Scheme Descr = "+schemeDesc+":totalQtyData='"+totalQty+"'";
//Commented and Changed by Santosh on 04-11-2017 to get physical attributes values from item_type [End]
System.out.println("Your Key is="+key);
System.out.println("itmCode"+itmCode);
......@@ -2618,7 +2657,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
StringBuffer valueXmlString = new StringBuffer("");
double rate = 0,netAmount = 0,lcStdrate = 0,rateClg = 0;
double rate = 0,netAmount = 0,lcStdrate = 0,rateClg = 0,amount = 0;
String lineNo = "",itemDescr = "",unit = "",siteCode = "",itemSer = "",custCodeDlv = "",custCodeBil = "",orderType = "",priceList = "",priceListClg = "",
taxChap = "",taxClass = "",stationFrom = "",stationTo = "",unitRate = "",itmStru = "",packInstr = "",
lsPriceList = "",orderDate = "",dueDate = "",custCode = "",custItemRef = "",saleOrder = "";
......@@ -2627,7 +2666,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
System.out.println("dom1["+genericUtility.serializeDom(dom1)+"]dom2[\n"+genericUtility.serializeDom(dom2)+"]itemparant["+itemParent+"]");
System.out.println("Inside getSorderDetails-->ItemParent["+itemParent+"] DetailString["+aString+"] DOMId["+domID+"]");
String itemCode = "",quantity = "",ordDate = "",tabNo = "",discount = "",itemRate = "",taxAmt="",taxEnv = "";
String itemCode = "",quantity = "",ordDate = "",tabNo = "",discount = "",itemRate = "",taxAmt="",taxEnv = "",schemeCode="",SchemeDesc="";
String[] arr = aString.split("~");
itemCode = arr[0];
quantity = arr[1];
......@@ -2639,6 +2678,11 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
taxChap = arr[7];
taxEnv = arr[8];
taxAmt = arr[9];
//schemeCode = arr[10];
//SchemeDesc = arr[11];
System.out.println("schemeCode="+schemeCode+"SchemeDesc="+SchemeDesc);
valueXmlString.append("<Detail3 domID='"+domID+"' selected = 'Y'>\r\n");
......@@ -2859,7 +2903,37 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
System.out.println("Rate Clg New="+rateClg);
//lcStdrate=10;
//changes by kaustubh on 21 dec 2017 start
schemeCode = "";
SchemeDesc = "";
sql = " select a.scheme_code,a.descr from SCH_GROUP_DEF a,SCH_PUR_ITEMS b "
+ " where a.SCHEME_CODE = b.SCHEME_CODE and trim(b.ITEM_CODE) = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("@@inside scheme query");
schemeCode = checkNullAndTrim(rs.getString("scheme_code"));
SchemeDesc = checkNullAndTrim(rs.getString("descr"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
System.out.println("scheme code"+schemeCode+"schemeDesc"+SchemeDesc);
//changes by kaustubh on 21 dec 2017 End
if ( rateClg == 0 )
{
......@@ -2872,6 +2946,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
netAmount = Double.parseDouble(quantity) * lcStdrate;
amount = netAmount * (Double.parseDouble(discount)/100);
netAmount = netAmount - amount;
System.out.println("netAmount after including discount"+netAmount);
valueXmlString.append("<net_amt><![CDATA[").append(netAmount).append("]]></net_amt>\r\n");
valueXmlString.append("<tax_chap><![CDATA[").append(taxChap).append("]]></tax_chap>\r\n");
valueXmlString.append("<tax_class><![CDATA[").append(taxClass).append("]]></tax_class>\r\n");
......@@ -2882,6 +2962,10 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<discount><![CDATA[").append(discount).append("]]></discount>\r\n");
valueXmlString.append("<tax_amt><![CDATA[").append(taxAmt).append("]]></tax_amt>\r\n");
//Added By Kaustubh on 21 Dec 2017 start
valueXmlString.append("<schemeCode><![CDATA[").append(schemeCode).append("]]></schemeCode>\r\n");
valueXmlString.append("<schemeDescr><![CDATA[").append(SchemeDesc).append("]]></schemeDescr>\r\n");
//Added By Kaustubh on 21 Dec 2017 end
valueXmlString.append("</Detail3>\r\n");
}
catch(Exception ex)
......@@ -3638,6 +3722,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//Added by Kaustubh on 4 Dec 2017 end
System.out.println("Due Date recived="+dueDate);
//Added by Kaustubh on 21 Dec 2017 start
String schemeCode = checkNullAndTrim(genericUtility.getColumnValue("schemeCode", dom1));
String schemeDescr = checkNullAndTrim(genericUtility.getColumnValue("schemeDescr", dom1));
//Added by Kaustubh on 21 Dec 2017 end
String dueDate1 = genericUtility.getValidDateTimeString(
checkNullAndTrim(dueDate), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
......@@ -3860,8 +3950,13 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//Added by kaustubh on 4 Dec 2017 end
valueXmlString.append("<tax_env>").append("<![CDATA["+ taxEnv +"]]>").append("</tax_env>\r\n");
//valueXmlString.append("<tax_env>").append("<![CDATA["+ taxEnv +"]]>").append("</tax_env>\r\n");
//Added by kaustubh on 21 Dec 2017 start
//valueXmlString.append("<schemeCode>").append("<![CDATA["+ schemeCode +"]]>").append("</schemeCode>\r\n");
//valueXmlString.append("<schemeDescr>").append("<![CDATA["+ schemeDescr +"]]>").append("</schemeDescr>\r\n");
//Added by kaustubh on 21 Dec 2017 end
valueXmlString.append("</Detail2>\r\n");
}
catch(Exception e)
......@@ -3928,6 +4023,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String empCode = checkNullAndTrim(detail[4]);
String tabNum = checkNullAndTrim(detail[6]);
System.out.println("itemCode2"+itemCode);
//Added By Kaustubh on 14 Dec 2017 Start
......@@ -5377,7 +5473,6 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
}
else
{
retXMLStr = "error";
// retXMLStr = Messages.getString("RequestHandlerServlet_notLoggedOrSessionExpired")+"\n"+Messages.getString("RequestHandlerServlet_pleaseReconnectToWork."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
......@@ -5410,4 +5505,54 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
}
return retXMLStr;
}
//Added by kaustubh on 22 dec 2017 start
@Override
public String getSchemeDetail(String xmlData, String formNo, UserInfoBean userInfo,String objName) throws RemoteException,ITMException
{
System.out.println("Inside getTaxData SorderWizardEJB");
System.out.println("In Method : [getTaxData]"+xmlData);
System.out.println("FormNo::"+formNo+"objName::"+objName);
String retString ="";
// InitialContext ctx = null;
String retXMLStr = null;
MasterStatefulLocal masterStateful = null;
// UserInfoBean userInfo = null;
try
{
retXMLStr = sorderAct.getFreeSchemeaction("sorderScheme",xmlData,xmlData,"2","");
System.out.println("sorderSchemeXML"+retXMLStr);
}
catch (ITMException itme)
{
throw itme;
}
catch (Exception e)
{
throw new ITMException(e);
}
finally
{
try
{
if( masterStateful != null )
{
masterStateful.remove();
masterStateful = null;
}
}
catch(Exception e)
{
throw new ITMException(e);
}
}
return retXMLStr;
}
//Added by kaustubh on 22 dec 2017 End
}
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJBLocal.java
View file @ 031e60a3
......@@ -41,4 +41,8 @@ public interface SorderWizardEJBLocal extends ValidatorLocal
//Added By Kaustubh on 4 Dec 2017 Start
public String getTaxAmt(String xmlData, String formNo, String domID, UserInfoBean userInfo,String objName) throws RemoteException,ITMException;
//Added By Kaustubh on 4 Dec 2017 End
//Added By Kaustubh on 22 Dec 2017 Start
public String getSchemeDetail(String xmlData, String formNo, UserInfoBean userInfo,String objName) throws RemoteException,ITMException;
//Added By Kaustubh on 22 Dec 2017 end
}
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJBRemote.java
View file @ 031e60a3
......@@ -42,4 +42,8 @@ public interface SorderWizardEJBRemote extends ValidatorRemote
public String getTaxAmt(String xmlData, String formNo, String domID, UserInfoBean userInfo,String objName) throws RemoteException,ITMException;
//Added By Kaustubh on 13 Dec 2017 Start
//Added By Kaustubh on 22 Dec 2017 Start
public String getSchemeDetail(String xmlData, String formNo, UserInfoBean userInfo,String objName) throws RemoteException,ITMException;
//Added By Kaustubh on 22 Dec 2017 end
}
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