Skip to content

B
business-java
Commit 66f05153 authored by wansari's avatar wansari
Browse files
Options

W16FKAT002 updated XSL for Customer pop help check box issue. and saving... 

W16FKAT002 updated XSL for Customer pop help check box issue. and saving item_ser in Sales order details


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104846 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 408f7a18
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 9 deletions
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJBLocal.java
View file @ 66f05153
......@@ -2,12 +2,10 @@ package ibase.webitm.ejb.wms;
import ibase.webitm.ejb.ValidatorLocal;
import ibase.webitm.utility.ITMException;
import java.rmi.RemoteException;
import javax.ejb.Local;
import org.w3c.dom.Document;
import org.json.simple.JSONObject;
@Local
public interface SorderWizardEJBLocal extends ValidatorLocal
......@@ -28,4 +26,6 @@ public interface SorderWizardEJBLocal extends ValidatorLocal
public String getAutoSearchData(String searchStr,String field,String param) throws ITMException ;
public String getDocIDImages(String refSer,String refId,String imgStr) throws ITMException ;
//public String getDefaultValuesFlag() throws RemoteException,ITMException ;
//public JSONObject getDefaultValuesfromJSON() throws RemoteException,ITMException ;
}
webitm-wms/ibase/webitm/ejb/wms/SorderWizardPosEJB.java
View file @ 66f05153
......@@ -84,7 +84,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
String siteCodeOrd = "",orderDate = "",itemSer = "",custCode = "",custCodeDlv = "",custCodeBil = "", dlvTerm = "", userId = "",remarks = "",
crTerm = "",currCode = "",stanCode = "",tranCode = "",transMode = "",currCodeFrt = "",currCodeIns = "",orderType = "",random = "",
sql = "";
sql = "",priceList = "",priceListClg = "";
try
{
AppConnectParm appConnect = new AppConnectParm();
......@@ -283,6 +283,25 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
pstmt.close();pstmt = null;
}
sql = " SELECT PRICE_LIST,PRICE_LIST__CLG FROM CUST_PLIST WHERE CUST_CODE =? AND ORDER_TYPE =? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCodeDlv);
pstmt.setString(2, orderType);
rs = pstmt.executeQuery();
if (rs.next())
{
priceList = checkNullAndTrim(rs.getString("PRICE_LIST"));
priceListClg = checkNullAndTrim(rs.getString("PRICE_LIST__CLG"));
}
if(rs != null)
{
rs.close();rs = null;
}
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
saleOrder = (saleOrder == null) ? "" : saleOrder;
sql = " SELECT SALE_ORDER FROM SORDER WHERE SALE_ORDER = ? ";
......@@ -384,7 +403,6 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
xmlStringHdr.append("<curr_code__frt>").append("<![CDATA["+currCodeFrt+"]]>").append("</curr_code__frt>\r\n");
xmlStringHdr.append("<curr_code__ins>").append("<![CDATA["+currCodeIns+"]]>").append("</curr_code__ins>\r\n");
xmlStringHdr.append("<udf__num2>").append("<![CDATA["+random+"]]>").append("</udf__num2>\r\n");
xmlStringHdr.append("<dlv_to>").append("<![CDATA["+custName+"]]>").append("</dlv_to>\r\n");
xmlStringHdr.append("<dlv_add1>").append("<![CDATA["+addr1+"]]>").append("</dlv_add1>\r\n");
xmlStringHdr.append("<dlv_add2>").append("<![CDATA["+addr2+"]]>").append("</dlv_add2>\r\n");
......@@ -395,11 +413,9 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
xmlStringHdr.append("<state_code__dlv>").append("<![CDATA["+stateCode+"]]>").append("</state_code__dlv>\r\n");
xmlStringHdr.append("<count_code__dlv>").append("<![CDATA["+countCode+"]]>").append("</count_code__dlv>\r\n");
xmlStringHdr.append("<group_code>").append("<![CDATA["+locGroup+"]]>").append("</group_code>\r\n");
xmlStringHdr.append("<tel1__dlv>").append("<![CDATA["+tel1Dlv+"]]>").append("</tel1__dlv>\r\n");
xmlStringHdr.append("<tel2__dlv>").append("<![CDATA["+tel2Dlv+"]]>").append("</tel2__dlv>\r\n");
xmlStringHdr.append("<part_qty>").append("<![CDATA["+partQty+"]]>").append("</part_qty>\r\n");
xmlStringHdr.append("<due_date>").append("<![CDATA["+dueDate+"]]>").append("</due_date>\r\n");
xmlStringHdr.append("<acct_code__sal>").append("<![CDATA["+acctCodeSal+"]]>").append("</acct_code__sal>\r\n");
xmlStringHdr.append("<cctr_code__sal>").append("<![CDATA["+cctrCodeSal+"]]>").append("</cctr_code__sal>\r\n");
......@@ -416,6 +432,8 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
xmlStringHdr.append("<exch_rate__frt>").append("<![CDATA["+ lcExchRate +"]]>").append("</exch_rate__frt>\r\n");
xmlStringHdr.append("<exch_rate__ins>").append("<![CDATA["+ lcExchRate +"]]>").append("</exch_rate__ins>\r\n");
}
xmlStringHdr.append("<price_list>").append("<![CDATA["+ priceList +"]]>").append("</price_list>\r\n");
xmlStringHdr.append("<price_list__clg>").append("<![CDATA["+ priceListClg +"]]>").append("</price_list__clg>\r\n");
//xmlStringHdr.append("</Detail1>");
StringBuffer xmlStringDet = new StringBuffer();
......@@ -429,7 +447,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
for(int ctrH = 0; ctrH < detail3NodeListlen ; ctrH++)
{
itemCode = "";itemDescr = "";quantity = 0;rate = 0;rateStd = 0;unitRate = "";rateClg = 0;unit = "";
taxChap = "";taxClass = "";taxEnv ="";itmFlag = "";dspDate = "";
taxChap = "";taxClass = "";taxEnv ="";itmFlag = "";dspDate = "";itemSer = "";
NodeList childNodeList = detail3NodeList.item(ctrH).getChildNodes();
int childNodeListlen = childNodeList.getLength();
......@@ -505,6 +523,10 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
discount = Double.parseDouble(childNode.getFirstChild().getNodeValue());
}
// Added by Sneha on 20-01-2017, to add discount field [End]
else if(childNode != null && "item_ser".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{
itemSer = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
}
domID++;
......@@ -519,6 +541,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
xmlStringDet.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>");
xmlStringDet.append("<item_code__ord><![CDATA[").append(itemCode).append("]]></item_code__ord>");
xmlStringDet.append("<item_descr><![CDATA[").append(itemDescr).append("]]></item_descr>");
xmlStringDet.append("<item_ser>").append("<![CDATA["+itemSer+"]]>").append("</item_ser>");
xmlStringDet.append("<site_code><![CDATA[").append(siteCodeOrd).append("]]></site_code>");
xmlStringDet.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>");
xmlStringDet.append("<quantity__stduom><![CDATA[").append(quantity).append("]]></quantity__stduom>");
......@@ -624,11 +647,13 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
else
{
System.out.println("Error while creating Sale Order");
throw new Exception(retString);
//throw new ITMException(retString);
isError = true;
}
}
catch(Exception e)
{
System.out.println("Exception inside SorderWizardPosEJB==>"+e.getMessage());
isError = true;
e.printStackTrace();
throw new ITMException(e);
......@@ -637,6 +662,7 @@ public class SorderWizardPosEJB extends ValidatorEJB implements SorderWizardPosE
{
try
{
System.out.println("isError in Finally SorderWizardPosEJB ["+isError+"]");
if(isError)
{
conn.rollback();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment