Skip to content

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

New Changes Added regarding edit tax calculation window 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177918 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0de4e01f
Hide whitespace changes
Inline Side-by-side
Showing with 334 additions and 37 deletions
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJB.java
View file @ fadb58ca
...@@ -1134,6 +1134,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1134,6 +1134,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("</Detail3>\r\n"); valueXmlString.append("</Detail3>\r\n");
System.out.println("saleOrderwwww"+saleOrder);
if(currentColumn.equalsIgnoreCase("itm_default")) if(currentColumn.equalsIgnoreCase("itm_default"))
{ {
NodeList detail2NodeList = dom2.getElementsByTagName("Detail2"); NodeList detail2NodeList = dom2.getElementsByTagName("Detail2");
...@@ -1145,7 +1147,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1145,7 +1147,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
for(int ctr = 0 ;ctr < detail2NodeListlen;ctr++) for(int ctr = 0 ;ctr < detail2NodeListlen;ctr++)
{ {
String quantity = "",tabNo = "",discount = "",rate = "", taxClass="",taxChap="",taxEnv="",taxAmt=""; String quantity = "",tabNo = "",discount = "",rate = "", taxClass="",taxChap="",taxEnv="",taxAmt="",taxXml="";
Node childNode = detail2NodeList.item(ctr); Node childNode = detail2NodeList.item(ctr);
if(childNode != null && childNode.getNodeType() != childNode.ELEMENT_NODE) if(childNode != null && childNode.getNodeType() != childNode.ELEMENT_NODE)
...@@ -1218,6 +1220,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1218,6 +1220,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
if(itmNode.getFirstChild() != null) if(itmNode.getFirstChild() != null)
taxAmt = itmNode.getFirstChild().getNodeValue(); taxAmt = itmNode.getFirstChild().getNodeValue();
} }
else if(itmNode !=null && ("tax_xml").equalsIgnoreCase(itmNode.getNodeName()))
{
if(itmNode.getFirstChild() != null)
taxXml = itmNode.getFirstChild().getNodeValue();
}
} }
System.out.println("itemParnt["+itemParnt+"]"); System.out.println("itemParnt["+itemParnt+"]");
...@@ -1227,7 +1235,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1227,7 +1235,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo; //String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo;
// String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo +"~"+ discount +"~"+ rate +"~"+taxClass+"~"+taxChap+"~"+taxEnv; // String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo +"~"+ discount +"~"+ rate +"~"+taxClass+"~"+taxChap+"~"+taxEnv;
String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo +"~"+ discount +"~"+ rate+"~"+taxClass+"~"+taxChap+"~"+taxEnv+"~"+taxAmt; String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo +"~"+ discount +"~"+ rate+"~"+taxClass+"~"+taxChap+"~"+taxEnv+"~"+taxAmt+"~"+saleOrder;
System.out.println("Data String="+dataStr); System.out.println("Data String="+dataStr);
...@@ -2130,7 +2138,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2130,7 +2138,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<RECORDS>\r\n"); valueXmlString.append("<RECORDS>\r\n");
String qty = "0", discount = "0.0",rate = "0.0",itemParentRate= "",taxClass="",taxEnv="", String qty = "0", discount = "0.0",rate = "0.0",itemParentRate= "",taxClass="",taxEnv="",
taxChap="",itemSer="",stationFrom="",stationTo="",tax_amt="",schemeCode="",schemeDesc=""; taxChap="",itemSer="",stationFrom="",stationTo="",tax_amt="",schemeCode="",schemeDesc="",taxXml="";
double newRate=0.0,taxAmount=0.0; double newRate=0.0,taxAmount=0.0;
String itmCode = "",SalesPriceList = "",lsListType= "",ContractNo = ""; String itmCode = "",SalesPriceList = "",lsListType= "",ContractNo = "";
int dimlistlen = dimensionList.size(); int dimlistlen = dimensionList.size();
...@@ -2176,6 +2184,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2176,6 +2184,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
taxEnv = ""; taxEnv = "";
taxChap=""; taxChap="";
tax_amt = "0"; tax_amt = "0";
taxXml = "";
boolean isNewRecord = true; boolean isNewRecord = true;
for (int x=1;x<paraDatas.length; x++) for (int x=1;x<paraDatas.length; x++)
{ {
...@@ -2189,6 +2198,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2189,6 +2198,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
taxChap = itmQty[5]; taxChap = itmQty[5];
tax_amt = itmQty[6]; tax_amt = itmQty[6];
rate = itmQty[7]; rate = itmQty[7];
taxXml = "";
if(itmQty.length == 9)
{
taxXml = itmQty[8];
}
System.out.println("set_taxXml"+taxXml);
//System.out.println("set rate"+itmQty[8]);
isNewRecord = false; isNewRecord = false;
break; break;
} }
...@@ -2424,12 +2441,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2424,12 +2441,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//temStrBuffer.append("<![CDATA[").append(dataMap.get(key)).append("]]>\r\n"); //temStrBuffer.append("<![CDATA[").append(dataMap.get(key)).append("]]>\r\n");
System.out.println("inside qty"); System.out.println("inside qty");
temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt+"~"+schemeCode+"~"+schemeDesc).append("]]>\r\n"); temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt+"~"+schemeCode+"~"+schemeDesc).append("]]>\r\n");
temStrBuffer.append("<taxXml>").append(taxXml).append("</taxXml>\r\n");
} }
else else
{ {
//temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty).append("]]>\r\n"); //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(dataMap.get(key)+"~"+qty+"~"+discount+"~"+rate).append("]]>\r\n");
temStrBuffer.append("<![CDATA[").append(itmCode+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt+"~"+schemeCode+"~"+schemeDesc).append("]]>\r\n"); temStrBuffer.append("<![CDATA[").append(itmCode+"~"+qty+"~"+discount+"~"+newRate+"~"+taxClass+"~"+taxEnv+"~"+taxChap+"~"+tax_amt+"~"+schemeCode+"~"+schemeDesc).append("]]>\r\n");
temStrBuffer.append("<taxXml>").append(taxXml).append("</taxXml>\r\n");
} }
// key = key + ":"+ rate; // key = key + ":"+ rate;
System.out.println("newRateCalulated"+newRate); System.out.println("newRateCalulated"+newRate);
...@@ -2488,7 +2507,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2488,7 +2507,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
for (int i = 0; i < tooltip.size(); i++) for (int i = 0; i < tooltip.size(); i++)
{ {
System.out.println("Adding="+tooltip.get(i)); //System.out.println("Adding="+tooltip.get(i));
valueXmlString.append("<tooltip>\r\n"); valueXmlString.append("<tooltip>\r\n");
valueXmlString.append("<![CDATA[").append(tooltip.get(i)).append("]]>\r\n"); valueXmlString.append("<![CDATA[").append(tooltip.get(i)).append("]]>\r\n");
...@@ -2497,7 +2516,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2497,7 +2516,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
for (int j = 0; j < stockValues.size(); j++) for (int j = 0; j < stockValues.size(); j++)
{ {
System.out.println("Adding="+stockValues.get(j)); //System.out.println("Adding="+stockValues.get(j));
valueXmlString.append("<stockValues>\r\n"); valueXmlString.append("<stockValues>\r\n");
valueXmlString.append("<![CDATA[").append(stockValues.get(j)).append("]]>\r\n"); valueXmlString.append("<![CDATA[").append(stockValues.get(j)).append("]]>\r\n");
...@@ -2511,6 +2530,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2511,6 +2530,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
System.out.println("DESCR"+rs.getString(2));
//valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></Descr>\r\n"); //valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></Descr>\r\n");
//valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2) +" (Available in "+cntColors+" colors and "+cntSizes+" sizes) ")).append("]]></Descr>\r\n"); //valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2) +" (Available in "+cntColors+" colors and "+cntSizes+" sizes) ")).append("]]></Descr>\r\n");
//Changed by Santosh on 04-11-2017 //Changed by Santosh on 04-11-2017
...@@ -2660,13 +2681,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2660,13 +2681,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
double rate = 0,netAmount = 0,lcStdrate = 0,rateClg = 0,amount = 0; double rate = 0,netAmount = 0,lcStdrate = 0,rateClg = 0,amount = 0;
String lineNo = "",itemDescr = "",unit = "",siteCode = "",itemSer = "",custCodeDlv = "",custCodeBil = "",orderType = "",priceList = "",priceListClg = "", String lineNo = "",itemDescr = "",unit = "",siteCode = "",itemSer = "",custCodeDlv = "",custCodeBil = "",orderType = "",priceList = "",priceListClg = "",
taxChap = "",taxClass = "",stationFrom = "",stationTo = "",unitRate = "",itmStru = "",packInstr = "", taxChap = "",taxClass = "",stationFrom = "",stationTo = "",unitRate = "",itmStru = "",packInstr = "",
lsPriceList = "",orderDate = "",dueDate = "",custCode = "",custItemRef = "",saleOrder = ""; lsPriceList = "",orderDate = "",dueDate = "",custCode = "",custItemRef = "",saleOrder = "",empCode="";
try try
{ {
System.out.println("dom1["+genericUtility.serializeDom(dom1)+"]dom2[\n"+genericUtility.serializeDom(dom2)+"]itemparant["+itemParent+"]"); 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+"]"); System.out.println("Inside getSorderDetails-->ItemParent["+itemParent+"] DetailString["+aString+"] DOMId["+domID+"]");
String itemCode = "",quantity = "",ordDate = "",tabNo = "",discount = "",itemRate = "",taxAmt="",taxEnv = "",schemeCode="",SchemeDesc=""; String itemCode = "",quantity = "",ordDate = "",tabNo = "",discount = "",itemRate = "",taxAmt="",taxEnv = "",schemeCode="",SchemeDesc="",taxXml="",
taxXml11="",saleOrderTemp="";
String[] arr = aString.split("~"); String[] arr = aString.split("~");
itemCode = arr[0]; itemCode = arr[0];
quantity = arr[1]; quantity = arr[1];
...@@ -2678,6 +2700,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2678,6 +2700,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
taxChap = arr[7]; taxChap = arr[7];
taxEnv = arr[8]; taxEnv = arr[8];
taxAmt = arr[9]; taxAmt = arr[9];
//taxXml = arr[10];
//taxXml11 = arr[11];
//schemeCode = arr[10]; //schemeCode = arr[10];
//SchemeDesc = arr[11]; //SchemeDesc = arr[11];
...@@ -2693,6 +2717,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2693,6 +2717,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
custCodeBil = checkNullAndTrim(genericUtility.getColumnValue("cust_code__bil", dom1)); custCodeBil = checkNullAndTrim(genericUtility.getColumnValue("cust_code__bil", dom1));
orderType = checkNullAndTrim(genericUtility.getColumnValue("order_type", dom1)); orderType = checkNullAndTrim(genericUtility.getColumnValue("order_type", dom1));
custCode = checkNullAndTrim(genericUtility.getColumnValue("cust_code", dom1)); custCode = checkNullAndTrim(genericUtility.getColumnValue("cust_code", dom1));
empCode = checkNullAndTrim(genericUtility.getColumnValue("emp_code__ord", dom1));
System.out.println("saleOrder"+saleOrder); System.out.println("saleOrder"+saleOrder);
System.out.println("siteCode"+siteCode); System.out.println("siteCode"+siteCode);
...@@ -2702,6 +2727,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2702,6 +2727,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
System.out.println("orderType"+orderType); System.out.println("orderType"+orderType);
System.out.println("custCode"+custCode); System.out.println("custCode"+custCode);
System.out.println("taxClassnew"+taxClass+"taxChapNew"+taxChap+"taxEnvNew"+taxEnv); System.out.println("taxClassnew"+taxClass+"taxChapNew"+taxChap+"taxEnvNew"+taxEnv);
System.out.println("taxXml01"+taxXml);
System.out.println("taxXml11"+taxXml11);
//Commented temporary //Commented temporary
//custCodeDlv = custCode;//for temporary need to check //custCodeDlv = custCode;//for temporary need to check
...@@ -2933,7 +2960,59 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2933,7 +2960,59 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//changes by kaustubh on 21 dec 2017 End //changes by kaustubh on 21 dec 2017 End
//Changes by kaustubh on 05 Jan 2017 start
sql = " SELECT SALE_ORDER FROM SORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "A");
pstmt.setString(2, empCode);
pstmt.setString(3, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("@@inside scheme query");
saleOrderTemp = checkNullAndTrim(rs.getString("SALE_ORDER"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
System.out.println("saleOrderTemp"+saleOrderTemp);
sql = " select tax_xml from SORDDET_TEMP where item_code= ? and sale_order= ? and TAB_NO= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
pstmt.setString(2, saleOrderTemp);
pstmt.setString(3, tabNo);
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("@@inside xml query ");
taxXml = checkNullAndTrim(rs.getString("tax_xml"));
}
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 2017 start
if ( rateClg == 0 ) if ( rateClg == 0 )
{ {
...@@ -2965,7 +3044,13 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2965,7 +3044,13 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//Added By Kaustubh on 21 Dec 2017 start //Added By Kaustubh on 21 Dec 2017 start
valueXmlString.append("<schemeCode><![CDATA[").append(schemeCode).append("]]></schemeCode>\r\n"); valueXmlString.append("<schemeCode><![CDATA[").append(schemeCode).append("]]></schemeCode>\r\n");
valueXmlString.append("<schemeDescr><![CDATA[").append(SchemeDesc).append("]]></schemeDescr>\r\n"); valueXmlString.append("<schemeDescr><![CDATA[").append(SchemeDesc).append("]]></schemeDescr>\r\n");
//Added By Kaustubh on 21 Dec 2017 end
//Added By Kaustubh on 5 jan 2017 start
valueXmlString.append("<tax_xml>").append(taxXml).append("</tax_xml>\r\n");
//Added By Kaustubh on 5 Jan 2017 end
valueXmlString.append("</Detail3>\r\n"); valueXmlString.append("</Detail3>\r\n");
} }
catch(Exception ex) catch(Exception ex)
...@@ -3153,7 +3238,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3153,7 +3238,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
ResultSet rs = null; ResultSet rs = null;
Connection conn = null; Connection conn = null;
String itemParent = "",itemCode = "",finalItmQtyStr = "",quantity = "",dspDateStr = "",saleOrderTemp = "",tabNum = "",taxclass="",taxEnv="",taxChap=""; String itemParent = "",itemCode = "",finalItmQtyStr = "",quantity = "",dspDateStr = "",saleOrderTemp = "",tabNum = "",taxclass="",taxEnv="",taxChap="",taxXml="",saleOrderNew="";
double taxAmt=0.0; double taxAmt=0.0;
HashMap<String, String> hm = new HashMap<String, String>(); HashMap<String, String> hm = new HashMap<String, String>();
Date dspDate = null; Date dspDate = null;
...@@ -3181,10 +3266,15 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3181,10 +3266,15 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{ {
saleOrderTemp = checkNullAndTrim(rs.getString("SALE_ORDER")); saleOrderTemp = checkNullAndTrim(rs.getString("SALE_ORDER"));
/*sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.QUANTITY FROM SORDDET_TEMP P, ITEM I WHERE SALE_ORDER = ? " //Changes by Kaustubh on 3 Jan 2018 start
+ " 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,P.TAX_ENV,P.TAX_CLASS,P.TAX_CHAP,P.TAX_AMT 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 "; + " 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,P.TAX_ENV,P.TAX_CLASS,P.TAX_CHAP,P.TAX_AMT,P.TAX_XML FROM SORDDET_TEMP P, ITEM I WHERE SALE_ORDER = ? "
+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT, P.ITEM_CODE ";
//Changes by Kaustubh on 3 Jan 2018 end
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrderTemp); pstmt.setString(1, saleOrderTemp);
} }
...@@ -3209,7 +3299,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3209,7 +3299,7 @@ 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 " 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 = ? ) " + "I.ITEM_CODE = P.ITEM_CODE AND P.ITEM_CODE NOT IN (SELECT PT.ITEM_CODE FROM SORDDET_TEMP PT WHERE SALE_ORDER = ? ) "
+ "UNION " + "UNION "
+ "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 " + "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, PT.TAX_XML "
+ " FROM SORDDET_TEMP PT, ITEM I WHERE SALE_ORDER = ? " + " FROM SORDDET_TEMP PT, ITEM I WHERE SALE_ORDER = ? "
+ " AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO "; + " AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO ";
...@@ -3233,11 +3323,15 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3233,11 +3323,15 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
taxEnv= checkNullAndTrim(rs.getString("TAX_ENV")); taxEnv= checkNullAndTrim(rs.getString("TAX_ENV"));
taxChap= checkNullAndTrim(rs.getString("TAX_CHAP")); taxChap= checkNullAndTrim(rs.getString("TAX_CHAP"));
taxAmt = rs.getDouble("TAX_AMT"); taxAmt = rs.getDouble("TAX_AMT");
taxXml = checkNullAndTrim(rs.getString("TAX_XML"));
dspDateStr = sdf.format(dspDate).toString(); dspDateStr = sdf.format(dspDate).toString();
System.out.println("taxclass::="+taxclass+"taxEnv::="+taxEnv+"taxChap::="+taxChap+"taxAmt::+"+taxAmt); System.out.println("taxclass::="+taxclass+"taxEnv::="+taxEnv+"taxChap::="+taxChap+"taxAmt::+"+taxAmt);
System.out.println("Final Item Parent with Tab number="+itemParent+":"+tabNum); System.out.println("Final Item Parent with Tab number="+itemParent+":"+tabNum);
System.out.println("tax_xml"+taxXml);
System.out.println("tax_xml"+saleOrderNew);
itemParent = itemParent+":"+tabNum; itemParent = itemParent+":"+tabNum;
...@@ -3249,7 +3343,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3249,7 +3343,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//changed bby kaustubh on 14 dec start //changed bby kaustubh on 14 dec start
//hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "::" + 0 +"~"); //hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "::" + 0 +"~");
hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "::" + taxclass + "::" + taxEnv + "::" + taxChap + "::" + taxAmt + "::" + 0 +"~"); // hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "::" + taxclass + "::" + taxEnv + "::" + taxChap + "::" + taxAmt + "::" + 0 +"~");
hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "::" + taxclass + "::" + taxEnv + "::" + taxChap + "::" + taxAmt + "::" + 0 + "::" + taxXml+"::"+ saleOrderNew + "::" +"~");
//changed bby kaustubh on 14 dec end //changed bby kaustubh on 14 dec end
} }
else else
...@@ -3262,7 +3358,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3262,7 +3358,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//changed bby kaustubh on 14 dec start //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 + "::" + 0 + "~"));
hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "::" + discount + "::" + taxclass + "::" + taxEnv + "::" + taxChap + "::" + taxAmt + "::" + 0 +"~")); hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "::" + discount + "::" + taxclass + "::" + taxEnv + "::" + taxChap + "::" + taxAmt + "::" + 0 +"::" + taxXml+"::"+saleOrderNew+"::"+"~"));
//changed by kaustubh on 14 dec end //changed by kaustubh on 14 dec end
} }
itemParent = ""; itemParent = "";
...@@ -3629,6 +3725,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3629,6 +3725,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
System.out.println("******** Inside SaveSorderHeader ***********"); System.out.println("******** Inside SaveSorderHeader ***********");
//System.out.println("******** Data["+data+"]"); //System.out.println("******** Data["+data+"]");
System.out.println("Dom1"+dom1);
String sql = "",retStr = ""; String sql = "",retStr = "";
PreparedStatement pstmt = null,pstmtSel = null ; PreparedStatement pstmt = null,pstmtSel = null ;
ResultSet rs = null,rsSel = null; ResultSet rs = null,rsSel = null;
...@@ -3727,6 +3825,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3727,6 +3825,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String schemeDescr = checkNullAndTrim(genericUtility.getColumnValue("schemeDescr", dom1)); String schemeDescr = checkNullAndTrim(genericUtility.getColumnValue("schemeDescr", dom1));
//Added by Kaustubh on 21 Dec 2017 end //Added by Kaustubh on 21 Dec 2017 end
//Added by Kaustubh on 05 Jan 2017 start
String taxXml = checkNullAndTrim(genericUtility.getColumnValue("schemeCode", dom1));
//Added by Kaustubh on 05 Jan 2017 end
String dueDate1 = genericUtility.getValidDateTimeString( String dueDate1 = genericUtility.getValidDateTimeString(
checkNullAndTrim(dueDate), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); checkNullAndTrim(dueDate), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
...@@ -3947,6 +4048,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3947,6 +4048,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//Added by kaustubh on 4 Dec 2017 start //Added by kaustubh on 4 Dec 2017 start
valueXmlString.append("<tax_amt>").append("<![CDATA["+ taxAmt +"]]>").append("</tax_amt>\r\n"); valueXmlString.append("<tax_amt>").append("<![CDATA["+ taxAmt +"]]>").append("</tax_amt>\r\n");
valueXmlString.append("<tax_env>").append("<![CDATA["+ taxEnv +"]]>").append("</tax_env>\r\n"); valueXmlString.append("<tax_env>").append("<![CDATA["+ taxEnv +"]]>").append("</tax_env>\r\n");
valueXmlString.append("<tax_xml>").append("<![CDATA["+ taxXml +"]]>").append("</tax_xml>\r\n");
//Added by kaustubh on 4 Dec 2017 end //Added by kaustubh on 4 Dec 2017 end
...@@ -3999,7 +4101,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -3999,7 +4101,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
return valueXmlString; return valueXmlString;
} }
public String SaveSorderDetail(String data) throws ITMException public String SaveSorderDetail(String data,String taxXmlFile) throws ITMException
{ {
System.out.println("******** Inside SaveSorderDetail ********** ["+data+"]"); System.out.println("******** Inside SaveSorderDetail ********** ["+data+"]");
...@@ -4016,6 +4118,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -4016,6 +4118,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String[] detail = data.split("~"); String[] detail = data.split("~");
String status = checkNullAndTrim(detail[0]); String status = checkNullAndTrim(detail[0]);
String siteCode = checkNullAndTrim(detail[1]); String siteCode = checkNullAndTrim(detail[1]);
String itemCode = checkNullAndTrim(detail[2]); String itemCode = checkNullAndTrim(detail[2]);
...@@ -4031,13 +4135,18 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -4031,13 +4135,18 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String taxEnv = checkNullAndTrim(detail[11]); String taxEnv = checkNullAndTrim(detail[11]);
String taxChap = checkNullAndTrim(detail[9]); String taxChap = checkNullAndTrim(detail[9]);
String taxAmt= checkNullAndTrim(detail[12]); String taxAmt= checkNullAndTrim(detail[12]);
//Added By Kaustubh on 14 Dec 2017 End //Added By Kaustubh on 14 Dec 2017 End
//Added By Kaustubh on 02 Jan 2018 start
String taxXml= taxXmlFile;
//Added By Kaustubh on 02 JAn 2018 End
String saleOrderHdr = ""; String saleOrderHdr = "";
System.out.println("Status["+status+"]"); System.out.println("Status["+status+"]");
System.out.println("taxClass::="+taxClass+"taxEnv:=>"+taxEnv+"taxChap::="+taxChap+"taxAmt:="+taxAmt); System.out.println("taxClass::="+taxClass+"taxEnv:=>"+taxEnv+"taxChap::="+taxChap+"taxAmt:="+taxAmt);
System.out.println("taxXml["+taxXml+"]");
if("A".equalsIgnoreCase(status)) // Status if("A".equalsIgnoreCase(status)) // Status
{ {
...@@ -4199,7 +4308,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -4199,7 +4308,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//Changes By Kaustubh on 14 Dec 2017 Start For Tax Calculation Changes //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 = ? WHERE SALE_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ?";
sql = " UPDATE SORDDET_TEMP SET QUANTITY = ?,DISCOUNT = ?, TAX_ENV = ?, TAX_CLASS = ? , TAX_CHAP = ? , TAX_AMT = ? " sql = " UPDATE SORDDET_TEMP SET QUANTITY = ?,DISCOUNT = ?, TAX_ENV = ?, TAX_CLASS = ? , TAX_CHAP = ? , TAX_AMT = ? , TAX_XML = ? "
+ "WHERE SALE_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ?"; + "WHERE SALE_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ?";
...@@ -4212,10 +4321,11 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -4212,10 +4321,11 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
pstmt.setString(4, taxClass); pstmt.setString(4, taxClass);
pstmt.setString(5, taxChap); pstmt.setString(5, taxChap);
pstmt.setString(6, taxAmt); pstmt.setString(6, taxAmt);
pstmt.setString(7, taxXml);
//Added by kaustubh on 14 dec end //Added by kaustubh on 14 dec end
pstmt.setString(7, saleOrderHdr); // PURC_ORDER pstmt.setString(8, saleOrderHdr); // PURC_ORDER
pstmt.setString(8, itemCode); // ITEM_CODE pstmt.setString(9, itemCode); // ITEM_CODE
pstmt.setString(9, tabNum); // ITEM_CODE pstmt.setString(10, tabNum); // ITEM_CODE
pstmt.executeUpdate(); pstmt.executeUpdate();
if(pstmt != null) if(pstmt != null)
{ {
...@@ -4233,8 +4343,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -4233,8 +4343,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
/*sql = "INSERT INTO SORDDET_TEMP (SALE_ORDER, SITE_CODE, ITEM_CODE, QUANTITY) " /*sql = "INSERT INTO SORDDET_TEMP (SALE_ORDER, SITE_CODE, ITEM_CODE, QUANTITY) "
+ " VALUES(?,?,?,?)";*/ + " 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) " 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, TAX_XML) "
+ " VALUES(?,?,?,?,?,?,?,?,?,?,?)"; + " VALUES(?,?,?,?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrderHdr); // SALE_ORDER pstmt.setString(1, saleOrderHdr); // SALE_ORDER
pstmt.setString(2, siteCode); // SITE_CODE pstmt.setString(2, siteCode); // SITE_CODE
...@@ -4248,6 +4358,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -4248,6 +4358,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
pstmt.setString(9, taxClass); pstmt.setString(9, taxClass);
pstmt.setString(10, taxChap); pstmt.setString(10, taxChap);
pstmt.setString(11, taxAmt); pstmt.setString(11, taxAmt);
pstmt.setString(12, taxXml);
//Added by kaustubh on 14 dec end //Added by kaustubh on 14 dec end
pstmt.executeUpdate(); pstmt.executeUpdate();
...@@ -5374,7 +5485,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -5374,7 +5485,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
propEditorInfoMap.put("EDITOR", editor); propEditorInfoMap.put("EDITOR", editor);
//Changed by samadhan on 01/11/2017 for getting metadata from E12GenericUtility to apply enterprise propery editor end //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 //Added by Prasad on 13/12/16 [Editor option added for Property Editor] END
taxFileName = "Wizard_taxtran_" + userInfo.getUserLanguage() + "_" + userInfo.getUserCountry() + "_" +"v"+ ".xsl"; taxFileName = "Wizard_taxtran_" + userInfo.getUserLanguage() + "_" + userInfo.getUserCountry() + "_" +"A"+ ".xsl";
System.out.println("taxFileName"+taxFileName); System.out.println("taxFileName"+taxFileName);
//defaultPath = defaultPath + "xsl" + File.separator + CommonConstants.THEME + File.separator + taxFileName; //defaultPath = defaultPath + "xsl" + File.separator + CommonConstants.THEME + File.separator + taxFileName;
//File taxXslFile = new File(defaultPath); //File taxXslFile = new File(defaultPath);
...@@ -5391,12 +5502,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -5391,12 +5502,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1", editFlag, profileIdRes); //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", dbid, propEditorInfoMap, userInfo.getTransDB() );
metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1", "V", propEditorInfoMap,userInfo.getTransDB() ); metaDataDoc = formLayout.setLocaleLabels("taxtran","1",userInfo.getUserLanguage(), userInfo.getUserCountry(), "1", "A", propEditorInfoMap,userInfo.getTransDB() );
taxXslString = "<?xml version='1.0' encoding='UTF-8'?>"; 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:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\">";
taxXslString += " \n<xsl:template match=\"/\">"; taxXslString += " \n<xsl:template match=\"/\">";
taxXslString += " \n "+formLayout.getDetailXSL( "V", CommonConstants.APPLICATION_CONTEXT,null, tranLayout.getObjParamMap( "taxtran", "1", userInfo ), userInfo ); taxXslString += " \n "+formLayout.getDetailXSL( "A", CommonConstants.APPLICATION_CONTEXT,null, tranLayout.getObjParamMap( "taxtran", "1", userInfo ), userInfo );
taxXslString += " \n </xsl:template> \n </xsl:stylesheet>"; taxXslString += " \n </xsl:template> \n </xsl:stylesheet>";
System.out.println("SimpleTransactionEditorServlet:taxXslString:["+taxXslString+"]"); System.out.println("SimpleTransactionEditorServlet:taxXslString:["+taxXslString+"]");
...@@ -5555,4 +5666,106 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -5555,4 +5666,106 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
} }
//Added by kaustubh on 22 dec 2017 End //Added by kaustubh on 22 dec 2017 End
@Override
public String getTaxXml(String empCode, String siteCode, String itemCode,String lineNo) throws RemoteException,ITMException
{
System.out.println("Inside getTaxAml SorderWizardEJB");
System.out.println("In Method : [empCode]"+empCode);
System.out.println("FormNo::"+siteCode+"domID::"+itemCode+"objName::"+lineNo);
String retString ="";
String sql = "";
PreparedStatement pstmt = null ;
ResultSet rs = null;
String retXMLStr = null;
Connection conn = null;
conn = getConnection();
try
{
String saleOrderTemp="",taxXml="";
sql = " SELECT SALE_ORDER FROM SORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "A");
pstmt.setString(2, empCode);
pstmt.setString(3, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("@@inside scheme query");
saleOrderTemp = checkNullAndTrim(rs.getString("SALE_ORDER"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
System.out.println("saleOrderTemp"+saleOrderTemp);
sql = " select tax_xml from SORDDET_TEMP where item_code= ? and sale_order= ? and TAB_NO= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
pstmt.setString(2, saleOrderTemp);
pstmt.setString(3, lineNo);
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("@@inside xml query ");
taxXml = checkNullAndTrim(rs.getString("tax_xml"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
retXMLStr = taxXml;
}
catch(Exception ex)
{
System.out.println("Inside Catch getSorderDetails"+ex.getMessage());
ex.printStackTrace();
}
finally
{
try
{
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
}
catch(Exception e)
{
e.printStackTrace();
}
}
return retXMLStr;
}
} }
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJBLocal.java
View file @ fadb58ca
...@@ -25,7 +25,9 @@ public interface SorderWizardEJBLocal extends ValidatorLocal ...@@ -25,7 +25,9 @@ public interface SorderWizardEJBLocal extends ValidatorLocal
public String ResetHeader(String data) throws ITMException ; public String ResetHeader(String data) throws ITMException ;
public String getSorderHeader(String saleOrder, String flag) throws ITMException; public String getSorderHeader(String saleOrder, String flag) throws ITMException;
public String getSorderDetail(String saleOrder,String flag) throws ITMException; public String getSorderDetail(String saleOrder,String flag) throws ITMException;
public String SaveSorderDetail(String str) throws ITMException; //Changed by Kaustubh on 2 jan 2018 start
public String SaveSorderDetail(String str,String xmlStringFile) throws ITMException;
//Changed by Kaustubh on 2 jan 2018 end
public String getSKUDetail(String itemParent,String itemDLVDate,String paraData,String details) throws ITMException ; public String getSKUDetail(String itemParent,String itemDLVDate,String paraData,String details) throws ITMException ;
//public String getSKUDetail(String itemParent,String itemDetails,String otherDetails) throws ITMException; //public String getSKUDetail(String itemParent,String itemDetails,String otherDetails) throws ITMException;
...@@ -45,4 +47,8 @@ public interface SorderWizardEJBLocal extends ValidatorLocal ...@@ -45,4 +47,8 @@ public interface SorderWizardEJBLocal extends ValidatorLocal
//Added By Kaustubh on 22 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; public String getSchemeDetail(String xmlData, String formNo, UserInfoBean userInfo,String objName) throws RemoteException,ITMException;
//Added By Kaustubh on 22 Dec 2017 end //Added By Kaustubh on 22 Dec 2017 end
//Added By Kaustubh on 6 Jan 2017 Start
public String getTaxXml(String empCode, String siteCode, String itemCode,String lineNo) throws RemoteException,ITMException;
//Added By Kaustubh on 6 Jan 2017 end
} }
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJBRemote.java
View file @ fadb58ca
...@@ -25,7 +25,7 @@ public interface SorderWizardEJBRemote extends ValidatorRemote ...@@ -25,7 +25,7 @@ public interface SorderWizardEJBRemote extends ValidatorRemote
public String ResetHeader(String data) throws ITMException; public String ResetHeader(String data) throws ITMException;
public String getSorderHeader(String saleOrder, String flag) throws ITMException; public String getSorderHeader(String saleOrder, String flag) throws ITMException;
public String getSorderDetail(String saleOrder,String flag) throws ITMException; public String getSorderDetail(String saleOrder,String flag) throws ITMException;
public String SaveSorderDetail(String str) throws ITMException; public String SaveSorderDetail(String str,String xmlStringFile) throws ITMException;
public String getSKUDetail(String itemParent,String itemDLVDate,String paraData,String details) throws ITMException; public String getSKUDetail(String itemParent,String itemDLVDate,String paraData,String details) throws ITMException;
//public String getSKUDetail(String itemParent,String itemDetails,String otherDetails) throws ITMException; //public String getSKUDetail(String itemParent,String itemDetails,String otherDetails) throws ITMException;
...@@ -45,5 +45,8 @@ public interface SorderWizardEJBRemote extends ValidatorRemote ...@@ -45,5 +45,8 @@ public interface SorderWizardEJBRemote extends ValidatorRemote
//Added By Kaustubh on 22 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; public String getSchemeDetail(String xmlData, String formNo, UserInfoBean userInfo,String objName) throws RemoteException,ITMException;
//Added By Kaustubh on 22 Dec 2017 end //Added By Kaustubh on 22 Dec 2017 end
//Added By Kaustubh on 6 Jan 2017 Start
public String getTaxXml(String empCode, String siteCode, String itemCode,String lineNo) throws RemoteException,ITMException;
//Added By Kaustubh on 6 Jan 2017 end
} }
webitm-wms/ibase/webitm/ejb/wms/SorderWizardPosEJB.java
View file @ fadb58ca
...@@ -84,7 +84,9 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -84,7 +84,9 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
String siteCodeOrd = "",orderDate = "",itemSer = "",custCode = "",custCodeDlv = "",custCodeBil = "", dlvTerm = "", userId = "",remarks = "", String siteCodeOrd = "",orderDate = "",itemSer = "",custCode = "",custCodeDlv = "",custCodeBil = "", dlvTerm = "", userId = "",remarks = "",
crTerm = "",currCode = "",stanCode = "",tranCode = "",transMode = "",currCodeFrt = "",currCodeIns = "",orderType = "",random = "", crTerm = "",currCode = "",stanCode = "",tranCode = "",transMode = "",currCodeFrt = "",currCodeIns = "",orderType = "",random = "",
sql = "",priceList = "",priceListClg = ""; sql = "",priceList = "",priceListClg = "",
siteCode = "",empCodeOrdDet = "",tabNo="",taxXml="";
String lsCctrcodeSal = ""; String lsCctrcodeSal = "";
try try
...@@ -94,12 +96,14 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -94,12 +96,14 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
InitialContext ctx = new InitialContext(p); InitialContext ctx = new InitialContext(p);
dom = genericUtility.parseString(xmlstring); dom = genericUtility.parseString(xmlstring);
System.out.println("domXML"+genericUtility.serializeDom(dom));
currDate = getCurrdateAppFormat(); currDate = getCurrdateAppFormat();
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
String addr1 = "",addr2 = "", addr3 = "",city = "",pin = "",stateCode = "",countCode = "",tel1Dlv = "",tel2Dlv = "",emailAddr = "",locGroup = "", String addr1 = "",addr2 = "", addr3 = "",city = "",pin = "",stateCode = "",countCode = "",tel1Dlv = "",tel2Dlv = "",emailAddr = "",locGroup = "",
custName = "",status = "",empCodeOrd = "",saleOrder = "",partQty = "",dueDate = "",acctCodeSal = "",cctrCodeSal = "",lcExchRate = ""; custName = "",status = "",empCodeOrd = "",saleOrder = "",partQty = "",dueDate = "",acctCodeSal = "",cctrCodeSal = "",lcExchRate = "",saleOrderTemp="";
Node detail1Node = dom.getElementsByTagName("Detail1").item(0); Node detail1Node = dom.getElementsByTagName("Detail1").item(0);
NodeList detail1List = detail1Node.getChildNodes(); NodeList detail1List = detail1Node.getChildNodes();
...@@ -107,7 +111,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -107,7 +111,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
System.out.println("Detail1 Length =========================================="+detail1ListLen); System.out.println("Detail1 Length =========================================="+detail1ListLen);
for(int ctr = 0 ;ctr < detail1ListLen; ctr++) for(int ctr = 0 ;ctr < detail1ListLen; ctr++)
{ {
Node childNode = detail1List.item(ctr); Node childNode = detail1List.item(ctr);
if(childNode == null || childNode.getNodeType() != childNode.ELEMENT_NODE) if(childNode == null || childNode.getNodeType() != childNode.ELEMENT_NODE)
{ {
continue; continue;
...@@ -251,6 +255,8 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -251,6 +255,8 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
} }
} }
System.out.println("siteCodeOrd"+siteCodeOrd+"empCodeOrd"+empCodeOrd);
lcExchRate = checkNullAndTrim(String.valueOf(finCommon.getDailyExchRateSellBuy(currCode, "", siteCodeOrd, orderDate, "S", conn))); lcExchRate = checkNullAndTrim(String.valueOf(finCommon.getDailyExchRateSellBuy(currCode, "", siteCodeOrd, orderDate, "S", conn)));
System.out.println("Sales Order Exchange Rate is=["+lcExchRate+"]"); System.out.println("Sales Order Exchange Rate is=["+lcExchRate+"]");
...@@ -275,6 +281,37 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -275,6 +281,37 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
}*/ }*/
//Changed by wasim on 09-DEC-2016 for account code sal [START] //Changed by wasim on 09-DEC-2016 for account code sal [START]
//Changed by Kaustubh on 08-JAN-2018 [START]
sql = " SELECT SALE_ORDER FROM SORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "A");
pstmt.setString(2, empCodeOrd);
pstmt.setString(3, siteCodeOrd);
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("@@inside sale order query");
saleOrderTemp = checkNullAndTrim(rs.getString("SALE_ORDER"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
System.out.println("saleOrderTemp"+saleOrderTemp);
//Changed by Kaustubh on 08-JAN-2018 [End]
lsCctrcodeSal = finCommon.getAcctDetrTtype("", itemSer, "SAL", orderType, conn); lsCctrcodeSal = finCommon.getAcctDetrTtype("", itemSer, "SAL", orderType, conn);
System.out.println("lsCctrcodeSal in SorderWizPost Save["+lsCctrcodeSal+"]"); System.out.println("lsCctrcodeSal in SorderWizPost Save["+lsCctrcodeSal+"]");
String lsAcctcodeSalArr[] = lsCctrcodeSal.split(","); String lsAcctcodeSalArr[] = lsCctrcodeSal.split(",");
...@@ -468,7 +505,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -468,7 +505,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
//xmlStringHdr.append("</Detail1>"); //xmlStringHdr.append("</Detail1>");
StringBuffer xmlStringDet = new StringBuffer(); StringBuffer xmlStringDet = new StringBuffer();
String lineNoCntr = "",lineNoOrd = "",itemCode = "",taxChap = "",taxClass = "",taxEnv = "",empCodeAprv = "",unit = "",unitRate = "",itmFlag = "",itemDescr = "",dspDate = ""; String lineNoCntr = "",lineNoOrd = "",itemCode = "",taxChap = "",taxClass = "",taxEnv = "",empCodeAprv = "",unit = "",unitRate = "",itmFlag = "",itemDescr = "",dspDate = "",tabID = "";
int domID = 0; int domID = 0;
double quantity = 0,rate = 0,rateStd = 0,rateClg = 0, discount = 0; double quantity = 0,rate = 0,rateStd = 0,rateClg = 0, discount = 0;
...@@ -481,6 +518,11 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -481,6 +518,11 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
taxChap = "";taxClass = "";taxEnv ="";itmFlag = "";dspDate = "";itemSer = ""; taxChap = "";taxClass = "";taxEnv ="";itmFlag = "";dspDate = "";itemSer = "";
NodeList childNodeList = detail3NodeList.item(ctrH).getChildNodes(); NodeList childNodeList = detail3NodeList.item(ctrH).getChildNodes();
tabID = detail3NodeList.item(ctrH).getAttributes().getNamedItem("domID").getNodeValue();
System.out.println("tabID"+tabID);
int childNodeListlen = childNodeList.getLength(); int childNodeListlen = childNodeList.getLength();
for(int ctrD = 0; ctrD < childNodeListlen ; ctrD++) for(int ctrD = 0; ctrD < childNodeListlen ; ctrD++)
...@@ -558,9 +600,42 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -558,9 +600,42 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
{ {
itemSer = checkNullAndTrim(childNode.getFirstChild().getNodeValue()); itemSer = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
} }
// Added by Kaustubh on 08-01-2018, [start]
// Added by Kaustubh on 08-01-2018, [end]
} }
domID++; domID++;
// Added by Kaustubh on 08-01-2018, [start]
sql = " select tax_xml from SORDDET_TEMP where item_code= ? and sale_order= ? and TAB_NO= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
pstmt.setString(2, saleOrderTemp);
pstmt.setString(3, tabID);
rs = pstmt.executeQuery();
if(rs.next())
{
System.out.println("@@inside xml query ");
taxXml = checkNullAndTrim(rs.getString("tax_xml"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
System.out.println("FinaltaxXml"+taxXml);
// Added by Kaustubh on 08-01-2018, [end]
xmlStringDet.append("<Detail2 dbID=':' domID='"+ domID +"' objName='sorder' objContext='2'>"); xmlStringDet.append("<Detail2 dbID=':' domID='"+ domID +"' objName='sorder' objContext='2'>");
xmlStringDet.append("<attribute pkNames='sale_order:line_no:' status='N' updateFlag='A' selected='N'/>"); xmlStringDet.append("<attribute pkNames='sale_order:line_no:' status='N' updateFlag='A' selected='N'/>");
...@@ -599,7 +674,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -599,7 +674,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
xmlStringDet.append("<conv__rtuom_stduom>").append("<![CDATA[" + 1 + "]]>").append("</conv__rtuom_stduom>"); xmlStringDet.append("<conv__rtuom_stduom>").append("<![CDATA[" + 1 + "]]>").append("</conv__rtuom_stduom>");
xmlStringDet.append("<dsp_date>").append("<![CDATA["+dspDate+"]]>").append("</dsp_date>"); xmlStringDet.append("<dsp_date>").append("<![CDATA["+dspDate+"]]>").append("</dsp_date>");
xmlStringDet.append("<cust_spec__no>").append("<![CDATA["+lineNoCntr+"]]>").append("</cust_spec__no>"); xmlStringDet.append("<cust_spec__no>").append("<![CDATA["+lineNoCntr+"]]>").append("</cust_spec__no>");
xmlStringDet.append(taxXml);
xmlStringDet.append("</Detail2>"); xmlStringDet.append("</Detail2>");
} }
...@@ -612,7 +687,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE ...@@ -612,7 +687,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
System.out.println("@@xmlString For generation Sale Order:: "+xmlString.toString()); System.out.println("@@xmlString For generation Sale Order:: "+xmlString.toString());
masterStatefulLocal = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local"); masterStatefulLocal = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
if(xtraParams == null) //if(xtraParams == null)
{ {
xtraParams = getXtraParams(userId,siteCodeOrd,userId,conn); xtraParams = getXtraParams(userId,siteCodeOrd,userId,conn);
} }
......
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