Commit be4b812e authored by kdabholkar's avatar kdabholkar

New Changes Added regarding edit tax calculation window

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177919 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fadb58ca
...@@ -132,7 +132,6 @@ public class SorderWizHandlerServlet extends HttpServlet ...@@ -132,7 +132,6 @@ public class SorderWizHandlerServlet extends HttpServlet
String empCode = checkNullAndTrim(request.getParameter("EMP_CODE")); String empCode = checkNullAndTrim(request.getParameter("EMP_CODE"));
String status = checkNullAndTrim(request.getParameter("STATUS")); String status = checkNullAndTrim(request.getParameter("STATUS"));
String saleOrder= checkNullAndTrim(request.getParameter("SALE_ORDER")); String saleOrder= checkNullAndTrim(request.getParameter("SALE_ORDER"));
String retString = sordBeanObj.getSorderDetail2(siteCode,empCode,saleOrder,status); String retString = sordBeanObj.getSorderDetail2(siteCode,empCode,saleOrder,status);
sendResponse(response,retString); sendResponse(response,retString);
...@@ -158,7 +157,10 @@ public class SorderWizHandlerServlet extends HttpServlet ...@@ -158,7 +157,10 @@ public class SorderWizHandlerServlet extends HttpServlet
else if("SAVE_SORD_DETAIL".equalsIgnoreCase(action)) else if("SAVE_SORD_DETAIL".equalsIgnoreCase(action))
{ {
String data = checkNullAndTrim(request.getParameter("STR")); String data = checkNullAndTrim(request.getParameter("STR"));
String result = sordBeanObj.SaveSorderDetail(data); String taxXmlFile = checkNullAndTrim(request.getParameter("xmlDataString"));
System.out.println("data in servlet"+data);
System.out.println("xmlString"+taxXmlFile);
String result = sordBeanObj.SaveSorderDetail(data,taxXmlFile);
System.out.println("Result="+result); System.out.println("Result="+result);
sendResponse(response,result); sendResponse(response,result);
...@@ -279,6 +281,49 @@ public class SorderWizHandlerServlet extends HttpServlet ...@@ -279,6 +281,49 @@ public class SorderWizHandlerServlet extends HttpServlet
} }
//Added by kaustubh on 13 Dec 2017 End //Added by kaustubh on 13 Dec 2017 End
//Added by kaustubh on 6 Jan 2018 Start
else if ( "GET_TAX_XML".equals(action) )
{
String empCode = checkNullAndTrim(request.getParameter("empCode"));
String siteCode = checkNullAndTrim(request.getParameter("siteCode"));
String itemCode = checkNullAndTrim(request.getParameter("itemCode"));
String lineNo = checkNullAndTrim(request.getParameter("lineNo"));
String result="";
System.out.println("Inside GET_TAX_XML formNo:"+empCode+"siteCode::");
System.out.println("itemCode::"+itemCode+"lineNo"+lineNo);
boolean isValid = ( result.indexOf("<Errors>") != -1) ? false : true;
if(isValid)
{
result = sordBeanObj.getTaxXml(empCode, siteCode, itemCode, lineNo);
}
sendResponse(response,result);
//System.out.println("XML Transformation Completed["+ retString.length() +"]");
}
else if ( "RE_TAX_XML".equals(action) )
{
String formNo = checkNullAndTrim(request.getParameter("formNo"));
String domID = checkNullAndTrim(request.getParameter("domId"));
String objName = checkNullAndTrim(request.getParameter("objName"));
String xmlData = checkNullAndTrim(request.getParameter("xmlDataString"));
String result="";
System.out.println("Inside GET_TAX_AMT formNo:"+formNo+"domID::"+domID);
System.out.println("xmlData::"+xmlData);
boolean isValid = ( result.indexOf("<Errors>") != -1) ? false : true;
if(isValid)
{
result = sordBeanObj.getTaxAmt(xmlData, formNo, domID, userInfo,objName);
}
sendResponse(response,result);
//System.out.println("XML Transformation Completed["+ retString.length() +"]");
}
//Added by kaustubh on 6 Jan 2018 end
}//End if user info }//End if user info
else else
{ {
......
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