Skip to content

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

commited new changes of tax calculation of sorder wizard 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@176375 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d5821be1
Hide whitespace changes
Inline Side-by-side
Showing with 510 additions and 54 deletions
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJB.java
View file @ bdea2dca
......@@ -12,8 +12,11 @@ import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.GraphicsEnvironment;
import java.awt.image.BufferedImage;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.rmi.RemoteException;
......@@ -32,6 +35,7 @@ import java.util.Set;
import javax.ejb.Stateless;
import javax.imageio.ImageIO;
import javax.naming.InitialContext;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
......@@ -41,12 +45,18 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import ibase.system.config.AppConnectParm;
import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.utility.UserInfoBean;
import ibase.utility.ValidateXMLInput;
import ibase.webitm.ejb.ITMDBAccessEJB;
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.utility.GenerateFormLayout;
import ibase.webitm.utility.GenerateTranLayout;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator;
......@@ -648,7 +658,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String sorderdefValueFlag = "";
String remarks = "",udfStr2 = "",empCodeOrd = "",dlvAddr1 = "",dlvAddr2 = "",dlvAddr3 = "",dlvPin = "",
dlvCity = "",stateCodeDlv = "",countCodeDlv = "",tele1 = "",tele2 = "",partQty = "",udfStr1 = "";
try
{
/*ConnDriver connDriver = new ConnDriver();
......@@ -721,7 +731,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String custCode = "",custName = "",crTerm = "",currCode = "",stanCode = "",tranCode = "",transMode = "",currCodeFrt = "",
currCodeIns = "",custCodeBil = "",custNameBil = "",itemSer = "",itemSerDescr = "",custNameDlv = "",
custCodeDlv = "",orderType = "",orderTypeDescr = "",dlvTerm = "",dlvTermDescr = "",taxClass = "",taxChap = "";
custCodeDlv = "",orderType = "",orderTypeDescr = "",dlvTerm = "",dlvTermDescr = "", taxClass = "",taxChap = "";
Timestamp ordDate = null,dueDate = null;
sql = " SELECT * FROM SORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE = ? ";
......@@ -1129,10 +1139,11 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
HashMap<String, ArrayList> tempMap = new HashMap<String, ArrayList>();
ArrayList tempList = null;
String itemParnt = "",quantity = "",tabNo = "",discount = "",rate = "";
String itemParnt = "";
for(int ctr = 0 ;ctr < detail2NodeListlen;ctr++)
{
String quantity = "",tabNo = "",discount = "",rate = "", taxClass="",taxChap="",taxEnv="",taxAmt="";
Node childNode = detail2NodeList.item(ctr);
if(childNode != null && childNode.getNodeType() != childNode.ELEMENT_NODE)
......@@ -1165,25 +1176,45 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
}
else if(itmNode !=null && ("quantity").equalsIgnoreCase(itmNode.getNodeName()))
{
{ if(itmNode.getFirstChild() != null)
quantity = itmNode.getFirstChild().getNodeValue();
}
else if(itmNode !=null && ("dsp_date").equalsIgnoreCase(itmNode.getNodeName()))
{
{ if(itmNode.getFirstChild() != null)
ordDate = itmNode.getFirstChild().getNodeValue();
}
else if(itmNode !=null && ("line_no__contr").equalsIgnoreCase(itmNode.getNodeName()))
{
{ if(itmNode.getFirstChild() != null)
tabNo = itmNode.getFirstChild().getNodeValue();
}
else if(itmNode !=null && ("discount").equalsIgnoreCase(itmNode.getNodeName()))
{
{ if(itmNode.getFirstChild() != null)
discount = itmNode.getFirstChild().getNodeValue();
}
else if(itmNode !=null && ("rate").equalsIgnoreCase(itmNode.getNodeName()))
{
{ if(itmNode.getFirstChild() != null)
rate = itmNode.getFirstChild().getNodeValue();
}
else if(itmNode !=null && ("tax_class").equalsIgnoreCase(itmNode.getNodeName()))
{
if(itmNode.getFirstChild() != null)
taxClass = itmNode.getFirstChild().getNodeValue();
}
else if(itmNode !=null && ("tax_chap").equalsIgnoreCase(itmNode.getNodeName()))
{
if(itmNode.getFirstChild() != null)
taxChap = itmNode.getFirstChild().getNodeValue();
}
else if(itmNode !=null && ("tax_env").equalsIgnoreCase(itmNode.getNodeName()))
{
if(itmNode.getFirstChild() != null)
taxEnv = itmNode.getFirstChild().getNodeValue();
}
else if(itmNode !=null && ("tax_amt").equalsIgnoreCase(itmNode.getNodeName()))
{
if(itmNode.getFirstChild() != null)
taxAmt = itmNode.getFirstChild().getNodeValue();
}
}
System.out.println("itemParnt["+itemParnt+"]");
......@@ -1191,7 +1222,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{
//String dataStr = itemCode + "~" + quantity + "~" + ordDate;
//String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo;
String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo +"~"+ discount +"~"+ rate;
// String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo +"~"+ discount +"~"+ rate +"~"+taxClass+"~"+taxChap+"~"+taxEnv;
String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo +"~"+ discount +"~"+ rate+"~"+taxClass+"~"+taxChap+"~"+taxEnv+"~"+taxAmt;
System.out.println("Data String="+dataStr);
......@@ -1240,7 +1273,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//detail3Str = getSorderDetails(dom1, dom2,itemParnt,itemCode,quantity,ordDate,tabNo,domID,conn);
detail3Str = getSorderDetails(dom1, dom2,itemParnt,aString,domID,conn);
//System.out.println("detail3Str["+detail3Str+"]");
System.out.println("detail3Str["+detail3Str+"]");
valueXmlString.append(detail3Str+"\r\n");
}
......@@ -2089,8 +2122,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<RECORDS>\r\n");
String qty = "0", discount = "0.0",rate = "0.0",itemParentRate= "";
double newRate=0.0;
String qty = "0", discount = "0.0",rate = "0.0",itemParentRate= "",taxClass="",taxEnv="",taxChap="",itemSer="",stationFrom="",stationTo="",tax_amt="";
double newRate=0.0,taxAmount=0.0;
String itmCode = "",SalesPriceList = "",lsListType= "",ContractNo = "";
int dimlistlen = dimensionList.size();
int colorlen = colorList.size();
......@@ -2131,19 +2164,27 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
qty ="0";
discount = "0.0";
rate = "0.0";
taxClass = "";
taxEnv = "";
taxChap="";
tax_amt = "0";
boolean isNewRecord = true;
for (int x=1;x<paraDatas.length; x++)
{
String itmQty[] = paraDatas[x].split("::");
if(itmQty[0].equals(dataMap.get(key)))
{
qty = itmQty[1];
discount = itmQty[2];
rate = itmQty[3];
taxClass = itmQty[3];
taxEnv = itmQty[4];
taxChap = itmQty[5];
tax_amt = itmQty[6];
rate = itmQty[7];
isNewRecord = false;
break;
}
}
//Changed by wasim
//key = key + ":"+ getItemRate(dataMap.get(key).toString(), otherDetails, conn);
/*itmCode = dataMap.get(key).toString();
......@@ -2151,9 +2192,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
key = key + ":"+ rate;*/
System.out.println("itemCode is::"+itemCode);
itmCode = dataMap.get(key).toString();
System.out.println("itmCode::1"+itmCode);
......@@ -2188,13 +2227,83 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
}
System.out.println("totalQty_ItemCodeWise:"+totalQty);
//changes by kaustubh on 27 nov 2017 End
//changes by kaustubh on 12 Dec 2017 start
sql = " SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itmCode);
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("@@Insdie1");
itemSer = checkNullAndTrim(rs.getString("ITEM_SER"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
sql = " SELECT STAN_CODE FROM SITE WHERE SITE_CODE =? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
rs = pstmt.executeQuery();
if (rs.next())
{
stationFrom = checkNullAndTrim(rs.getString("STAN_CODE"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
sql = " SELECT STAN_CODE FROM CUSTOMER WHERE CUST_CODE =? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
rs = pstmt.executeQuery();
if (rs.next())
{
stationTo = checkNullAndTrim(rs.getString("STAN_CODE"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
System.out.println("stationTo"+stationTo);
int len = paraDatas.length;
System.out.println("len"+len);
System.out.println("len11"+paraDatas.length);
if( isNewRecord )
{
System.out.println("inside paraDatas::"+paraDatas.length);
taxChap = checkNullAndTrim(distCommon.getTaxChap(itemCode, itemSer, "C", custcodedlv, siteCode, conn));
taxClass = checkNullAndTrim(distCommon.getTaxClass("C", custcodedlv, itemCode, siteCode, conn));
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
if(orderDate !=null && orderDate.length()>0)
{
orderDateString = Timestamp.valueOf(genericUtility.getValidDateString(orderDate,
......@@ -2267,15 +2376,14 @@ 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).append("]]>\r\n");
temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt).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).append("]]>\r\n");
temStrBuffer.append("<![CDATA[").append(itmCode+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt).append("]]>\r\n");
}
// key = key + ":"+ rate;
System.out.println("newRateCalulated"+newRate);
key = key + ":"+ newRate;
......@@ -2285,11 +2393,11 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
"&#010;Dimension- "+dimensionList.get(i)+
"&#010;Size- "+sizeList.get(k)+""+
"&#010;Rate- "+rate+"";*/
String toolTipData = key + ":"+ "Item Code = "+itmCode+""+
"&#010;"+colName1+" = "+colorList.get(j)+
"&#010;"+colName2+" = "+dimensionList.get(i)+
"&#010;Size = "+sizeList.get(k)+""+
"&#010;Rate = "+newRate+""+
String toolTipData = key + ":"+ "Item Code = "+itmCode+""+","+
"&#010;"+colName1+" = "+colorList.get(j)+","+
"&#010;"+colName2+" = "+dimensionList.get(i)+","+
"&#010;Size = "+sizeList.get(k)+""+","+
"&#010;Rate = "+newRate+""+","+
"&#010;In Stock = "+totalQty+":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);
......@@ -2502,14 +2610,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
double rate = 0,netAmount = 0,lcStdrate = 0,rateClg = 0;
String lineNo = "",itemDescr = "",unit = "",siteCode = "",itemSer = "",custCodeDlv = "",custCodeBil = "",orderType = "",priceList = "",priceListClg = "",
taxChap = "",taxClass = "",taxEnv = "",stationFrom = "",stationTo = "",unitRate = "",itmStru = "",packInstr = "",
taxChap = "",taxClass = "",stationFrom = "",stationTo = "",unitRate = "",itmStru = "",packInstr = "",
lsPriceList = "",orderDate = "",dueDate = "",custCode = "",custItemRef = "",saleOrder = "";
try
{
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 = "";
String itemCode = "",quantity = "",ordDate = "",tabNo = "",discount = "",itemRate = "",taxAmt="",taxEnv = "";
String[] arr = aString.split("~");
itemCode = arr[0];
quantity = arr[1];
......@@ -2517,6 +2625,10 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
tabNo = arr[3];
discount = arr[4];
itemRate = arr[5];
taxClass = arr[6];
taxChap = arr[7];
taxEnv = arr[8];
taxAmt = arr[9];
valueXmlString.append("<Detail3 domID='"+domID+"' selected = 'Y'>\r\n");
......@@ -2535,7 +2647,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
System.out.println("custCodeBil"+custCodeBil);
System.out.println("orderType"+orderType);
System.out.println("custCode"+custCode);
System.out.println("taxClassnew"+taxClass+"taxChapNew"+taxChap+"taxEnvNew"+taxEnv);
//Commented temporary
//custCodeDlv = custCode;//for temporary need to check
......@@ -2591,9 +2703,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
}*/
priceList = checkNullAndTrim(genericUtility.getColumnValue("price_list", dom1));
priceListClg =checkNullAndTrim(genericUtility.getColumnValue("price_list__clg", dom1));
taxClass =checkNullAndTrim(genericUtility.getColumnValue("tax_class", dom1));
taxChap =checkNullAndTrim(genericUtility.getColumnValue("tax_chap", dom1));
stationTo =checkNullAndTrim(genericUtility.getColumnValue("stan_code", dom1));
// taxClass =checkNullAndTrim(genericUtility.getColumnValue("tax_class", dom2));
// taxChap =checkNullAndTrim(genericUtility.getColumnValue("tax_chap", dom2));
// stationTo =checkNullAndTrim(genericUtility.getColumnValue("stan_code", dom2));
System.out.println("Inside Case3 \n priceList["+priceList+"] priceListClg["+priceListClg+"] taxClass["+taxClass+"] taxChap["+taxChap+"] stationTo["+stationTo+"]");
......@@ -2633,7 +2745,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
pstmt.close();pstmt = null;
}
if(taxChap.length() == 0)
/*if(taxChap.length() == 0)
{
taxChap = checkNullAndTrim(distCommon.getTaxChap(itemCode, itemSer, "C", custCodeDlv, siteCode, conn));
}
......@@ -2643,6 +2755,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
}
taxEnv = checkNullAndTrim(distCommon.getTaxEnv(stationFrom, stationTo, taxChap, taxClass, siteCode, conn));
*/
lineNo = " " + domID;
lineNo = lineNo.substring( lineNo.length()-3 );
......@@ -2758,7 +2871,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<phy_attrib_4><![CDATA[").append(custItemRef).append("]]></phy_attrib_4>\r\n");
valueXmlString.append("<discount><![CDATA[").append(discount).append("]]></discount>\r\n");
valueXmlString.append("<tax_amt><![CDATA[").append(taxAmt).append("]]></tax_amt>\r\n");
valueXmlString.append("</Detail3>\r\n");
}
catch(Exception ex)
......@@ -2946,8 +3059,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
ResultSet rs = null;
Connection conn = null;
String itemParent = "",itemCode = "",finalItmQtyStr = "",quantity = "",dspDateStr = "",saleOrderTemp = "",tabNum = "";
String itemParent = "",itemCode = "",finalItmQtyStr = "",quantity = "",dspDateStr = "",saleOrderTemp = "",tabNum = "",taxclass="",taxEnv="",taxChap="";
double taxAmt=0.0;
HashMap<String, String> hm = new HashMap<String, String>();
Date dspDate = null;
double discount = 0;
......@@ -2976,7 +3089,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
/*sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY FROM SORDDET_TEMP P, ITEM I WHERE SALE_ORDER = ? "
+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT, P.ITEM_CODE ";*/
sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.TAB_NO,P.DSP_DATE,P.DISCOUNT FROM SORDDET_TEMP P, ITEM I WHERE SALE_ORDER = ? "
sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.TAB_NO,P.DSP_DATE,P.DISCOUNT,P.TAX_ENV,P.TAX_CLASS,P.TAX_CHAP,P.TAX_AMT FROM SORDDET_TEMP P, ITEM I WHERE SALE_ORDER = ? "
+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT, P.ITEM_CODE ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrderTemp);
......@@ -3002,8 +3115,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
sql = "SELECT I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY, P.CUST_SPEC__NO AS TAB_NO,P.DSP_DATE,P.DISCOUNT FROM SORDDET P, ITEM I WHERE SALE_ORDER = ? AND "
+ "I.ITEM_CODE = P.ITEM_CODE AND P.ITEM_CODE NOT IN (SELECT PT.ITEM_CODE FROM SORDDET_TEMP PT WHERE SALE_ORDER = ? ) "
+ "UNION "
+ "SELECT I.ITEM_PARNT, PT.ITEM_CODE, PT.QUANTITY, PT.TAB_NO, PT.DSP_DATE,PT.DISCOUNT FROM SORDDET_TEMP PT, ITEM I WHERE SALE_ORDER = ? "
+ "AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO ";
+ "SELECT I.ITEM_PARNT, PT.ITEM_CODE, PT.QUANTITY, PT.TAB_NO, PT.DSP_DATE,PT.DISCOUNT,PT.TAX_ENV,PT.TAX_CLASS,PT.TAX_CHAP,PT.TAX_AMT "
+ " FROM SORDDET_TEMP PT, ITEM I WHERE SALE_ORDER = ? "
+ " AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder);
......@@ -3021,9 +3135,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
quantity = checkNullAndTrim(rs.getString("QUANTITY"));
tabNum = checkNullAndTrim(rs.getString("TAB_NO"));
discount = rs.getDouble("DISCOUNT");
taxclass= checkNullAndTrim(rs.getString("TAX_CLASS"));
taxEnv= checkNullAndTrim(rs.getString("TAX_ENV"));
taxChap= checkNullAndTrim(rs.getString("TAX_CHAP"));
taxAmt = rs.getDouble("TAX_AMT");
dspDateStr = sdf.format(dspDate).toString();
System.out.println("taxclass::="+taxclass+"taxEnv::="+taxEnv+"taxChap::="+taxChap+"taxAmt::+"+taxAmt);
System.out.println("Final Item Parent with Tab number="+itemParent+":"+tabNum);
itemParent = itemParent+":"+tabNum;
......@@ -3033,7 +3152,11 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String itemQtyStr = hm.get(itemParent);
//hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "~");
//hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount +"~");
hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "::" + 0 +"~");
//changed bby kaustubh on 14 dec start
//hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "::" + 0 +"~");
hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "::" + taxclass + "::" + taxEnv + "::" + taxChap + "::" + taxAmt + "::" + 0 +"~");
//changed bby kaustubh on 14 dec end
}
else
{
......@@ -3042,7 +3165,11 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String itemParentTabNum = itemParentValue[1];*/
//hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "~"));
//hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "::" + discount +"~"));
hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "::" + discount + "::" + 0 + "~"));
//changed bby kaustubh on 14 dec start
//hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "::" + discount + "::" + 0 + "~"));
hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "::" + discount + "::" + taxclass + "::" + taxEnv + "::" + taxChap + "::" + taxAmt + "::" + 0 +"~"));
//changed by kaustubh on 14 dec end
}
itemParent = "";
itemCode = "";
......@@ -3494,7 +3621,11 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String priceListClg = checkNullAndTrim(genericUtility.getColumnValue("price_list__clg", dom1));
String taxChap = checkNullAndTrim(genericUtility.getColumnValue("tax_chap", dom1));
String taxClass = checkNullAndTrim(genericUtility.getColumnValue("tax_class", dom1));
//Added by Kaustubh on 4 Dec 2017 start
String taxAmt = checkNullAndTrim(genericUtility.getColumnValue("tax_amt", dom1));
String taxEnv = checkNullAndTrim(genericUtility.getColumnValue("tax_env", dom1));
//Added by Kaustubh on 4 Dec 2017 end
System.out.println("Due Date recived="+dueDate);
String dueDate1 = genericUtility.getValidDateTimeString(
......@@ -3713,6 +3844,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<tax_chap>").append("<![CDATA["+ taxChap +"]]>").append("</tax_chap>\r\n");
valueXmlString.append("<tax_class>").append("<![CDATA["+ taxClass +"]]>").append("</tax_class>\r\n");
//Added by kaustubh on 4 Dec 2017 start
valueXmlString.append("<tax_amt>").append("<![CDATA["+ taxAmt +"]]>").append("</tax_amt>\r\n");
valueXmlString.append("<tax_env>").append("<![CDATA["+ taxEnv +"]]>").append("</tax_env>\r\n");
//Added by kaustubh on 4 Dec 2017 end
valueXmlString.append("<tax_env>").append("<![CDATA["+ taxEnv +"]]>").append("</tax_env>\r\n");
valueXmlString.append("</Detail2>\r\n");
}
catch(Exception e)
......@@ -3779,10 +3918,20 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String empCode = checkNullAndTrim(detail[4]);
String tabNum = checkNullAndTrim(detail[6]);
//Added By Kaustubh on 14 Dec 2017 Start
String taxClass = checkNullAndTrim(detail[10]);
String taxEnv = checkNullAndTrim(detail[11]);
String taxChap = checkNullAndTrim(detail[9]);
String taxAmt= checkNullAndTrim(detail[12]);
//Added By Kaustubh on 14 Dec 2017 End
String saleOrderHdr = "";
System.out.println("Status["+status+"]");
System.out.println("taxClass::="+taxClass+"taxEnv:=>"+taxEnv+"taxChap::="+taxChap+"taxAmt:="+taxAmt);
if("A".equalsIgnoreCase(status)) // Status
{
......@@ -3940,13 +4089,27 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{
//sql = "UPDATE SORDDET_TEMP SET QUANTITY = ? WHERE SALE_ORDER = ? AND ITEM_CODE = ? ";
//sql = "UPDATE SORDDET_TEMP SET QUANTITY = ? WHERE SALE_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ?";
sql = "UPDATE SORDDET_TEMP SET QUANTITY = ?,DISCOUNT = ? WHERE SALE_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ?";
//Changes By Kaustubh on 14 Dec 2017 Start For Tax Calculation Changes
//sql = "UPDATE SORDDET_TEMP SET QUANTITY = ?,DISCOUNT = ? WHERE SALE_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ?";
sql = " UPDATE SORDDET_TEMP SET QUANTITY = ?,DISCOUNT = ?, TAX_ENV = ?, TAX_CLASS = ? , TAX_CHAP = ? , TAX_AMT = ? "
+ "WHERE SALE_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ?";
//Changes By Kaustubh on 14 Dec 2017 End
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, quantity); // QUANTITY
pstmt.setDouble(2, Double.parseDouble(discount)); //DISCOUNT
pstmt.setString(3, saleOrderHdr); // PURC_ORDER
pstmt.setString(4, itemCode); // ITEM_CODE
pstmt.setString(5, tabNum); // ITEM_CODE
//Added by kaustubh on 14 dec start
pstmt.setString(3, taxEnv);
pstmt.setString(4, taxClass);
pstmt.setString(5, taxChap);
pstmt.setString(6, taxAmt);
//Added by kaustubh on 14 dec end
pstmt.setString(7, saleOrderHdr); // PURC_ORDER
pstmt.setString(8, itemCode); // ITEM_CODE
pstmt.setString(9, tabNum); // ITEM_CODE
pstmt.executeUpdate();
if(pstmt != null)
{
......@@ -3960,11 +4123,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
checkNullAndTrim(dspDate), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
System.out.println("Desp Date="+dspDateStr);
System.out.println("taxEnv::-"+taxEnv);
/*sql = "INSERT INTO SORDDET_TEMP (SALE_ORDER, SITE_CODE, ITEM_CODE, QUANTITY) "
+ " VALUES(?,?,?,?)";*/
sql = "INSERT INTO SORDDET_TEMP (SALE_ORDER, SITE_CODE, ITEM_CODE, QUANTITY, TAB_NO, DSP_DATE, DISCOUNT) "
+ " VALUES(?,?,?,?,?,?,?)";
sql = "INSERT INTO SORDDET_TEMP (SALE_ORDER, SITE_CODE, ITEM_CODE, QUANTITY, TAB_NO, DSP_DATE, DISCOUNT, TAX_ENV, TAX_CLASS, TAX_CHAP, TAX_AMT) "
+ " VALUES(?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrderHdr); // SALE_ORDER
pstmt.setString(2, siteCode); // SITE_CODE
......@@ -3973,6 +4137,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
pstmt.setString(5, tabNum);
pstmt.setTimestamp(6, java.sql.Timestamp.valueOf(dspDateStr));
pstmt.setDouble(7, Double.parseDouble(discount));
//Added by kaustubh on 14 dec start
pstmt.setString(8, taxEnv);
pstmt.setString(9, taxClass);
pstmt.setString(10, taxChap);
pstmt.setString(11, taxAmt);
//Added by kaustubh on 14 dec end
pstmt.executeUpdate();
if(pstmt != null)
......@@ -4963,4 +5133,271 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
return jsonObject;
}
//Added by kaustubh on 4 dec 2017 start
@Override
//public String getList(String param, String field, String[] values) throws RemoteException, ITMException
public String getTaxData(String xmlData, String formNo, String domID, 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+"domID::"+domID+"objName::"+objName);
String retString ="";
// InitialContext ctx = null;
String retXMLStr = null;
MasterStatefulLocal masterStateful = null;
// UserInfoBean userInfo = null;
try
{
InitialContext ctx = new InitialContext( new AppConnectParm().getProperty() );
if( userInfo != null )
{
masterStateful = (MasterStatefulLocal) ctx.lookup("ibase/MasterStatefulEJB/local");
masterStateful.setUserInfo( userInfo.toString(),xmlData );
masterStateful.getContextTitlesList(objName);
String valXMLStr = "";//masterStateful.updateDetailDom(currXmlString);
//System.out.println("Return XML String from updateDetailDom:"+valXMLStr);
boolean isValid = ( valXMLStr.indexOf("<Errors>") != -1) ? false : true;
if( isValid )
{
retXMLStr = masterStateful.getCalculateTax(xmlData, formNo, domID);
String xslFileName = getXSLForTax(userInfo,domID,masterStateful);
System.out.println("Starting XML Transformation xslFileName["+xslFileName+"]dataXML["+retXMLStr+"]");
ValidateXMLInput vxi = new ValidateXMLInput();
String outputFileName = vxi.validate(xslFileName, retXMLStr, CommonConstants.APPLICATION_CONTEXT + File.separator + "temp", "tax", ".html");
FileInputStream fis = new FileInputStream(outputFileName);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
int i = -1;
while((i=fis.read())!=-1)
{
baos.write(i);
}
retXMLStr = checkNull( baos.toString(CommonConstants.ENCODING) );
baos.close();
fis.close();
}
else
{
retXMLStr = valXMLStr;
}
}
else
{
retXMLStr = "error";
// retXMLStr = Messages.getString("RequestHandlerServlet_notLoggedOrSessionExpired")+"\n"+Messages.getString("RequestHandlerServlet_pleaseReconnectToWork."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
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 4 dec 2017 End
//added by kaustubh on 6 Dec 2017 Start
protected String getXSLForTax( UserInfoBean userInfo,String domID,MasterStatefulLocal masterStateful)throws ITMException
{
String taxRetFileName = null;
// UserInfoBean userInfo = null;
String defaultPath = "";
GenerateFormLayout formLayout = null;
GenerateTranLayout tranLayout = null;
String taxXslString = "";
Document metaDataDoc = null;
/*E12GenericUtility genericUtility = new E12GenericUtility();
Document dom = genericUtility.parseString(xmlString)
genericUtility.getColumnValue(colName, dom);*/
try
{
//System.out.println("@@@ getXSLForTax :: CommonConstants.APPLICATION_CONTEXT :"+CommonConstants.APPLICATION_CONTEXT + ":");
if (userInfo != null)
{
/*if(CommonConstants.APPLICATION_CONTEXT != null)
{
defaultPath = CommonConstants.APPLICATION_CONTEXT + CommonConstants.ITM_CONTEXT + File.separator;
}
else
{
defaultPath = ".." + File.separator + "webapps" + File.separator + "ibase" + File.separator + CommonConstants.ITM_CONTEXT + File.separator;
}*/
String taxFileName = "";
String profileIdRes = userInfo.getProfileIdRes();
System.out.println("profileIdRes::"+profileIdRes);
//Added by Prasad on 13/12/16 [Editor option added for Property Editor] START
String editor = "WebSimpleEditor";
//Changed by samadhan on 01/11/2017 for getting metadata from E12GenericUtility to apply enterprise propery editor start
//String propertyEditorDtl = profileIdRes+"~~SEP~~"+editor;
HashMap<String, String> propEditorInfoMap = new HashMap<String,String>();
propEditorInfoMap.put("PROFILE_ID_RES", userInfo.getProfileIdRes());
propEditorInfoMap.put("ENTERPRISE_ID_RES", userInfo.getEnterprise());
propEditorInfoMap.put("EDITOR", editor);
//Changed by samadhan on 01/11/2017 for getting metadata from E12GenericUtility to apply enterprise propery editor end
//Added by Prasad on 13/12/16 [Editor option added for Property Editor] END
taxFileName = "Simple_taxtran_" + userInfo.getUserLanguage() + "_" + userInfo.getUserCountry() + "_" +domID+ ".xsl";
System.out.println("taxFileName"+taxFileName);
//defaultPath = defaultPath + "xsl" + File.separator + CommonConstants.THEME + File.separator + taxFileName;
//File taxXslFile = new File(defaultPath);
// defaultPath = new E12GenericUtility().getWebEditorXslPath(propEditorInfoMap, userInfo.getTransDB());
defaultPath = new E12GenericUtility().getWebEditorXslPath(propEditorInfoMap);
File taxXslFile = new File(defaultPath, taxFileName);
if(!taxXslFile.exists())
{
formLayout = new GenerateFormLayout();
tranLayout = new GenerateTranLayout();
//taxXslString = masterStateful.toXSL("taxtran", "1", "1", editFlag, CommonConstants.APPLICATION_CONTEXT, profileIdRes);
//Changed by Prasad on 13/12/16 [Editor option added for Property Editor]
//metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1", editFlag, profileIdRes);
// metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1", dbid, propEditorInfoMap, userInfo.getTransDB() );
metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1", domID, propEditorInfoMap );
taxXslString = "<?xml version='1.0' encoding='UTF-8'?>";
taxXslString += " \n<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">";
taxXslString += " \n<xsl:template match=\"/\">";
taxXslString += " \n "+formLayout.getDetailXSL( domID, CommonConstants.APPLICATION_CONTEXT,null, tranLayout.getObjParamMap( "taxtran", "1", userInfo ), userInfo );
taxXslString += " \n </xsl:template> \n </xsl:stylesheet>";
System.out.println("SimpleTransactionEditorServlet:taxXslString:["+taxXslString+"]");
byte bufferTax[] = taxXslString.getBytes();
int bytesTax = bufferTax.length;
FileOutputStream fosTax = new FileOutputStream(taxXslFile);
fosTax.write(bufferTax, 0, bytesTax);
fosTax.flush();
fosTax.close();
fosTax = null;
}
taxRetFileName = taxXslFile.getAbsolutePath();
}
}
catch (Exception e)
{
System.out.println("Exception: SimpleTransactionEditorServlet: getXSLForTax:==>"+e);
taxRetFileName = null;
e.printStackTrace();
throw new ITMException(e);
}
return taxRetFileName;
}
private String checkNull(String inputString)
{
if(inputString == null)
{
inputString= "";
}
return inputString;
}
// Added By Kaustubh on 6 Dec 2017 End
@Override
//public String getList(String param, String field, String[] values) throws RemoteException, ITMException
public String getTaxAmt(String xmlData, String formNo, String domID, UserInfoBean userInfo,String objName) throws RemoteException,ITMException
{
System.out.println("Inside getTaxAMt SorderWizardEJB");
System.out.println("In Method : [getTaxData]"+xmlData);
System.out.println("FormNo::"+formNo+"domID::"+domID+"objName::"+objName);
String retString ="";
// InitialContext ctx = null;
String retXMLStr = null;
MasterStatefulLocal masterStateful = null;
// UserInfoBean userInfo = null;
try
{
InitialContext ctx = new InitialContext( new AppConnectParm().getProperty() );
if( userInfo != null )
{
masterStateful = (MasterStatefulLocal) ctx.lookup("ibase/MasterStatefulEJB/local");
masterStateful.setUserInfo( userInfo.toString(),xmlData );
masterStateful.getContextTitlesList(objName);
String valXMLStr = "";//masterStateful.updateDetailDom(currXmlString);
//System.out.println("Return XML String from updateDetailDom:"+valXMLStr);
boolean isValid = ( valXMLStr.indexOf("<Errors>") != -1) ? false : true;
if( isValid )
{
retXMLStr = masterStateful.getCalculateTax(xmlData, formNo, domID);
}
else
{
retXMLStr = valXMLStr;
}
}
else
{
retXMLStr = "error";
// retXMLStr = Messages.getString("RequestHandlerServlet_notLoggedOrSessionExpired")+"\n"+Messages.getString("RequestHandlerServlet_pleaseReconnectToWork."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
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;
}
}
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJBLocal.java
View file @ bdea2dca
package ibase.webitm.ejb.wms;
import ibase.utility.UserInfoBean;
import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException;
......@@ -32,4 +33,12 @@ public interface SorderWizardEJBLocal extends ValidatorLocal
public String getDocIDImages(String refSer,String refId,String imgStr) throws ITMException ;
public String getDefaultValuesFlag(String varName) throws RemoteException,ITMException ;
public JSONObject getDefaultValuesfromJSON(String fileName) throws RemoteException,ITMException ;
//Added By Kaustubh on 4 Dec 2017 Start
public String getTaxData(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 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
}
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJBRemote.java
View file @ bdea2dca
package ibase.webitm.ejb.wms;
import ibase.utility.UserInfoBean;
import ibase.webitm.ejb.ValidatorRemote;
import ibase.webitm.utility.ITMException;
......@@ -32,4 +33,13 @@ public interface SorderWizardEJBRemote extends ValidatorRemote
public String getDocIDImages(String refSer,String refId,String imgStr) throws ITMException ;
public String getDefaultValuesFlag(String varName) throws RemoteException,ITMException ;
public JSONObject getDefaultValuesfromJSON(String fileName) throws RemoteException,ITMException ;
//Added By Kaustubh on 4 Dec 2017 Start
public String getTaxData(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 13 Dec 2017 Start
public String getTaxAmt(String xmlData, String formNo, String domID, UserInfoBean userInfo,String objName) throws RemoteException,ITMException;
//Added By Kaustubh on 13 Dec 2017 Start
}
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