Skip to content

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

W16LKAT002 updated source for discount column issue 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104955 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 79a6fb7d
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 62 deletions
webitm-wms/ibase/webitm/ejb/wms/DDPorderWizEJB.java
View file @ cbe15f43
......@@ -5,8 +5,7 @@
*/
package ibase.webitm.ejb.wms;
import java.io.IOException;
import java.io.OutputStream;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.PreparedStatement;
......@@ -22,9 +21,6 @@ import java.util.GregorianCalendar;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Set;
import java.util.zip.GZIPOutputStream;
import ibase.system.config.ConnDriver;
import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.fin.FinCommon;
......@@ -32,12 +28,7 @@ import ibase.utility.CommonConstants;
import ibase.utility.E12GenericUtility;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator;
import javax.ejb.Stateless;
import javax.servlet.ServletException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
......@@ -547,9 +538,9 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
// Changed by Sneha on 29-05-2016, for PO AutoSave [Start]
// IND_NO, SITE_DESCR
sqlSel = " SELECT ORD_DATE, ITEM_SER, SUPP_CODE, SUPP_NAME, CR_TERM, CRTERM_DESCR, REMARKS, DLV_TERM, TRAN_CODE, "
+ "TRAN_NAME, PRICE_LIST, EXCH_RATE, DEPT_CODE, DEPT_DESCR, TRANS_MODE, SITE_CODE__DLV, SITE_CODE__ORD, PORD_TYPE, "
+ "TASK_DESC, SITE_ADD1, CURR_CODE, TERM_TABLE, UDF_STR__2, UDF_STR__1 "
+ "FROM PORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE__ORD = ? ";
+" TRAN_NAME, PRICE_LIST, EXCH_RATE, DEPT_CODE, DEPT_DESCR, TRANS_MODE, SITE_CODE__DLV, SITE_CODE__ORD, PORD_TYPE, "
+" TASK_DESC, SITE_ADD1, CURR_CODE, TERM_TABLE, UDF_STR__2, UDF_STR__1,PURC_ORDER "
+" FROM PORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE__ORD = ? ";
pstmtSel = conn.prepareStatement(sqlSel);
pstmtSel.setString(1, "A");
pstmtSel.setString(2, empCode);
......@@ -560,7 +551,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
ordDate = rsSel.getDate("ORD_DATE");
//System.out.println(" -------- Inside if for itemchange case 1111111 ------------ ");
valueXmlString.append("<tran_date>").append("<![CDATA["+currDate+"]]>").append("</tran_date>\r\n");
valueXmlString.append("<purc_order>").append("<![CDATA[]]>").append("</purc_order>\r\n");
//valueXmlString.append("<purc_order>").append("<![CDATA[]]>").append("</purc_order>\r\n");
valueXmlString.append("<purc_order>").append("<![CDATA["+checkNullAndTrim(rsSel.getString("PURC_ORDER"))+"]]>").append("</purc_order>\r\n");
valueXmlString.append("<ord_date>").append("<![CDATA["+sdf.format(ordDate).toString() +"]]>").append("</ord_date>\r\n");
valueXmlString.append("<ind_no>").append("<![CDATA[]]>").append("</ind_no>\r\n");
valueXmlString.append("<item_ser>").append("<![CDATA["+checkNullAndTrim(rsSel.getString(2))+"]]>").append("</item_ser>\r\n");
......@@ -881,7 +873,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
HashMap<String, ArrayList> tempMap = new HashMap<String, ArrayList>();
ArrayList tempList = null;
String itemParnt = "", itemSer = "";
String itemParnt = "", itemSer = "",discount = "";
//Changed by Samadhan on 14/07/2015 D15CKAT026 start
for(int ctr = 0 ;ctr < detail2NodeListlen;ctr++)
......@@ -934,13 +926,19 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{
tabNo = itmNode.getFirstChild().getNodeValue();
}
else if(itmNode !=null && ("discount").equalsIgnoreCase(itmNode.getNodeName()))
{
discount = itmNode.getFirstChild().getNodeValue();
}
}
// Changed by Sneha on 25-08-2016, to sort item code according to parent code [Start]
System.out.println("itemParnt["+itemParnt+"]");
if(itemCode != null && itemCode.length() > 0)
{
//String dataStr = itemCode + "~" + quantity + "~" + dlvDate;
String dataStr = itemCode + "~" + quantity + "~" + dlvDate + "~" + tabNo;
//String dataStr = itemCode + "~" + quantity + "~" + dlvDate + "~" + tabNo;
String dataStr = itemCode + "~" + quantity + "~" + dlvDate + "~" + tabNo + "~" + discount;
if(tempMap.containsKey(itemParnt))
{
tempList = (ArrayList)tempMap.get(itemParnt);
......@@ -981,20 +979,23 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{
String itemStr = (String) itemList.get(i);
String[] arr = itemStr.split("~");
//Changed by wasim
/*String[] arr = itemStr.split("~");
itemCode = arr[0];
quantity = arr[1];
dlvDate = arr[2];
tabNo = arr[3];*/
tabNo = arr[3];
System.out.println("itemCode------"+arr[0]);
System.out.println("quantity------"+arr[1]);
System.out.println("dlvDate------"+arr[2]);
//System.out.println("itemCode------"+arr[0]);
//.out.println("quantity------"+arr[1]);
//System.out.println("dlvDate------"+arr[2]);
//detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, count++, itemParnt, itemSer, conn);
//detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, count++, conn);
detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, tabNo, count++, conn);
//Changed by wasim
//detail3Str = getPorderDetails(dom1, dom2, itemCode, quantity, dlvDate, tabNo, count++, conn);
detail3Str = getPorderDetails(dom1, dom2, itemCode, itemStr, count++, conn);
System.out.println("detail3Str["+detail3Str+"]");
valueXmlString.append(detail3Str+"\r\n");
......@@ -1008,7 +1009,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
catch(Exception e)
{
System.out.println("Inside Catch Item change");
System.out.println("Inside Catch Item change PorderWizardEJB"+e.getMessage());
e.printStackTrace();
}
finally
......@@ -1064,7 +1065,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
String trCode = "",trMode = "";
try
{
System.out.println("Inside SorderWizardEJB getList---->Field["+field+"] Values["+values+"] Extra["+extra+"] Details["+details+"]");
System.out.println("Inside PrderWizardEJB getList---->Field["+field+"] Values["+values+"] Extra["+extra+"] Details["+details+"]");
conn = getConnection();
......@@ -1389,6 +1390,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
catch (Exception e)
{
System.out.println("Exception inside getList PorderWizard="+e.getMessage());
e.printStackTrace();
throw new ITMException(e);
}
......@@ -1418,7 +1420,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
}
valueXmlString.append("</Root>\r\n");
System.out.println("\n****ValueXmlString :" + valueXmlString.toString() + ":********");
//System.out.println("\n****ValueXmlString :" + valueXmlString.toString() + ":********");
return valueXmlString.toString();
}
......@@ -1452,9 +1454,10 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
@Override
//public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity,String dlvDate, int ctr , String itemParnt, String itemSer, Connection conn)
public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity,String dlvDate,String tabNo, int ctr , Connection conn)
//public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity,String dlvDate,String tabNo, int ctr , Connection conn)
public String getPorderDetails(Document dom1,Document dom2,String itemCode, String itemStr, int ctr , Connection conn)
{
System.out.println("********Inside Porder Details***********");
System.out.println("********Inside Porder Details***********itemCode["+itemCode+"] itemStr["+itemStr+"] Ctr["+ctr+"]");
/* System.out.println(" itemCode inside getPorderDetails ==========>> " + itemCode);
System.out.println(" quantity inside getPorderDetails ==========>> " + quantity);
System.out.println(" dlvDate inside getPorderDetails ==========>> " + dlvDate);
......@@ -1533,14 +1536,22 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
String purcOrder = "";
double amount;
double quan=Double.parseDouble(quantity);
String dlvleadTime = "";
String taxClass = "", taxChap = "", taxEnv = "", taxEnvfun = "", taxEnvQry = "", stationFrom = "", stationTo = "";
try
{
String quantity = "",dlvDate = "",tabNo = "",discount = "";
String[] arr = itemStr.split("~");
itemCode = arr[0];
quantity = arr[1];
dlvDate = arr[2];
tabNo = arr[3];
discount = arr[4];
double amount;
double quan=Double.parseDouble(quantity);
String dlvleadTime = "";
finCommon = new FinCommon();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
Calendar c = Calendar.getInstance();
......@@ -1932,7 +1943,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
valueXmlString.append("<unit__std><![CDATA[").append(unit).append("]]></unit__std>");
valueXmlString.append("<unit__rate><![CDATA[").append(unit).append("]]></unit__rate>");
valueXmlString.append("<rate><![CDATA[").append( rate ).append("]]></rate>");
valueXmlString.append("<discount><![CDATA[0]]></discount>");
//valueXmlString.append("<discount><![CDATA[0]]></discount>");
valueXmlString.append("<tax_amt><![CDATA[0]]></tax_amt>");
valueXmlString.append("<dlv_qty><![CDATA[0]]></dlv_qty>");
if(dueDate != null)
......@@ -1983,10 +1994,12 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
valueXmlString.append("<form_no><![CDATA[").append(tabNo).append("]]></form_no>\r\n");
valueXmlString.append("<discount><![CDATA[").append(discount).append("]]></discount>\r\n");
valueXmlString.append("</Detail3>\r\n");
}
catch(Exception e)
{
System.out.println("Exception inside getPorderDetails PorderWiz"+e.getMessage());
e.printStackTrace();
}
finally
......@@ -2193,6 +2206,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
catch(Exception e)
{
System.out.println("Exception inside getPoDetails PorderWiz"+e.getMessage());
e.printStackTrace();
}
finally
......@@ -2404,6 +2418,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
valueXmlString.append("<RECORDS>\r\n");
String qty ="0",discount = "0.0";
int dimlistlen = dimensionList.size();
int colorlen = colorList.size();
int sizelen = sizeList.size();
......@@ -2431,7 +2447,10 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
if(dataMap.containsKey(key))
{
isItemExist =true;
String qty ="0";
//String qty ="0";
qty ="0";
discount = "0.0";
for (int x=1;x<paraDatas.length; x++)
{
String itmQty[] = paraDatas[x].split("::");
......@@ -2439,20 +2458,30 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
if(itmQty[0].equals(dataMap.get(key)))
{
qty = itmQty[1];
discount = itmQty[2];
break;
}
}
if(qty.equals("0"))
{
temStrBuffer.append("<![CDATA[").append(dataMap.get(key)).append("]]>\r\n");
//temStrBuffer.append("<![CDATA[").append(dataMap.get(key)).append("]]>\r\n");
temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount).append("]]>\r\n");
}
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).append("]]>\r\n");
}
System.out.println("Your Key is="+key);
tooltip.add(key);
String toolTipData = "Item Code: "+dataMap.get(key)+""+
"&#010;Color: "+colorList.get(j)+
"&#010;Dimension "+dimensionList.get(i)+
"&#010;Size: "+dimensionList.get(i)+"";
//tooltip.add(key);
tooltip.add(toolTipData);
}
else
{
......@@ -2537,7 +2566,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
valueXmlString.append("<td><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></td>\r\n");
valueXmlString.append("<td><![CDATA[").append("0.0").append("]]></td>\r\n");
if(rs.getString(3).equals("Y"))
//if(rs.getString(3).equals("Y"))
if("Y".equals(rs.getString(3)))
{
valueXmlString.append("<td><![CDATA[").append("X").append("]]></td>\r\n");
}
......@@ -2601,6 +2631,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}//End try
catch (Exception e)
{
System.out.println("Exception inside PorderWiz getSKUDetail="+e.getMessage());
e.printStackTrace();
throw new ITMException(e);
}
......@@ -2630,7 +2661,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
}
System.out.println("return Product Set=["+valueXmlString.toString()+"]");
//System.out.println("return Product Set=["+valueXmlString.toString()+"]");
return valueXmlString.toString();
}
......@@ -3048,6 +3079,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
HashMap<String, String> hm = new HashMap<String, String>();
Date dlvDateDt = null;
double discount = 0;
try
{
conn = getConnection();
......@@ -3055,7 +3087,9 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
System.out.println("purcOrder Inside if GET_PURC_DET_2 = ["+ purcOrder +"]");
if("A".equalsIgnoreCase(flag) && purcOrder.length() <= 0) // Add mode, Purchase order blank
//Changed by wasim on 09-03-2017
//if("A".equalsIgnoreCase(flag) && purcOrder.length() <= 0) // Add mode, Purchase order blank
if("A".equalsIgnoreCase(flag))
{
sqlSel = " SELECT PURC_ORDER FROM PORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE__ORD = ? ";
pstmtSel = conn.prepareStatement(sqlSel);
......@@ -3067,8 +3101,11 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{
purcOrderTemp = checkNullAndTrim(rsSel.getString("PURC_ORDER"));
sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY, P.TAB_NO FROM PORDDET_TEMP P, ITEM I WHERE PURC_ORDER = ? "
+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT, P.ITEM_CODE ";
//Changed by wasim added discount column
/*sql = " SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY, P.TAB_NO FROM PORDDET_TEMP P, ITEM I WHERE PURC_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.DLV_DATE, P.QUANTITY, P.TAB_NO, P.DISCOUNT FROM PORDDET_TEMP P, ITEM I WHERE PURC_ORDER = ? "
+ " AND I.ITEM_CODE = P.ITEM_CODE ORDER BY I.ITEM_PARNT, P.ITEM_CODE ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrderTemp);
}
......@@ -3087,11 +3124,18 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
{
//System.out.println("Inside 333333333 ["+ purcOrder +"]");
sql = "SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY, P.FORM_NO AS TAB_NO FROM PORDDET P, ITEM I WHERE PURC_ORDER = ? AND "
//Changed by wasim added discount column
/*sql = "SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY, P.FORM_NO AS TAB_NO FROM PORDDET P, ITEM I WHERE PURC_ORDER = ? AND "
+ "I.ITEM_CODE = P.ITEM_CODE AND P.Item_code not in (SELECT PT.ITEM_CODE FROM PORDDET_TEMP PT WHERE PURC_ORDER = ? ) "
+ "UNION "
+ "SELECT I.ITEM_PARNT, PT.ITEM_CODE, PT.DLV_DATE, PT.QUANTITY, PT.TAB_NO FROM PORDDET_TEMP PT, ITEM I WHERE PURC_ORDER = ? "
+ "AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO ";
+ "AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO ";*/
sql = "SELECT I.ITEM_PARNT, P.ITEM_CODE, P.DLV_DATE, P.QUANTITY, P.FORM_NO AS TAB_NO,P.DISCOUNT FROM PORDDET P, ITEM I WHERE PURC_ORDER = ? AND "
+ "I.ITEM_CODE = P.ITEM_CODE AND P.Item_code not in (SELECT PT.ITEM_CODE FROM PORDDET_TEMP PT WHERE PURC_ORDER = ? ) "
+ "UNION "
+ "SELECT I.ITEM_PARNT, PT.ITEM_CODE, PT.DLV_DATE, PT.QUANTITY, PT.TAB_NO,PT.DISCOUNT FROM PORDDET_TEMP PT, ITEM I WHERE PURC_ORDER = ? "
+ "AND I.ITEM_CODE = PT.ITEM_CODE ORDER BY TAB_NO ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
pstmt.setString(2, purcOrder);
......@@ -3108,6 +3152,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
dlvDate = sdf.format(dlvDateDt).toString();
tabNum = checkNullAndTrim(rs.getString("TAB_NO"));
discount = rs.getDouble("DISCOUNT");
if(itemParent == null || itemParent.length() == 0)
{
......@@ -3123,12 +3168,16 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
if(hm.containsKey(itemParent))
{
String itemQtyStr = hm.get(itemParent);
hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "~");
//Changed by wasim
//hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "~");
hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "~" );
}
else
{
//10115C****301761~02/06/16****301761::1||||10****301738~02/06/16****301738::2~301736::3
hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dlvDate + "****" +itemCode + "::" + quantity + "~"));
//Changed by wasim
//hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dlvDate + "****" +itemCode + "::" + quantity + "~"));
hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dlvDate + "****" +itemCode + "::" + quantity + "::" + discount + "~" ));
}
itemParent = "";
itemCode = "";
......@@ -3159,7 +3208,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
catch(Exception e)
{
System.out.println("Inside catch getPorderDetail2 ");
System.out.println("Inside catch getPorderDetail2"+e.getMessage());
e.printStackTrace();
}
finally
......@@ -3364,7 +3413,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
catch (Exception e)
{
System.out.println("Inside catch savePorderHeader");
System.out.println("Exception inside savePorderHeader PorderWiz"+e.getMessage());
e.printStackTrace();
isError = true;
}
......@@ -3487,7 +3536,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
return "";
}
if(!detail[2].trim().equalsIgnoreCase("") && Integer.parseInt(detail[2]) > 0)
//if(!detail[2].trim().equalsIgnoreCase("") && Integer.parseInt(detail[2]) > 0)
if(!detail[2].trim().equalsIgnoreCase("") && Double.parseDouble(detail[2]) > 0)//Changed by wasim on 09-03-2017 for parsing
{
//sqlSel = "SELECT ITEM_CODE FROM PORDDET_TEMP PD WHERE PURC_ORDER = ? AND ITEM_CODE = ? ";
sqlSel = "SELECT ITEM_CODE FROM PORDDET_TEMP PD WHERE PURC_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ?";
......@@ -3499,12 +3549,14 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
if( rsSel.next() )
{
//sql = "UPDATE PORDDET_TEMP SET QUANTITY = ? WHERE PURC_ORDER = ? AND ITEM_CODE = ? ";
sql = "UPDATE PORDDET_TEMP SET QUANTITY = ? WHERE PURC_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ? ";
//Added discount field by wasim in porddet_temp table
sql = "UPDATE PORDDET_TEMP SET QUANTITY = ?,DISCOUNT = ? WHERE PURC_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, detail[2]); // QUANTITY
pstmt.setString(2, purcOrderFrmHdr); // PURC_ORDER
pstmt.setString(3, detail[1]); // ITEM_CODE
pstmt.setString(4, detail[8]);
pstmt.setString(1, detail[2]); // QUANTITY
pstmt.setDouble(2, Double.parseDouble(detail[9]));
pstmt.setString(3, purcOrderFrmHdr); // PURC_ORDER
pstmt.setString(4, detail[1]); // ITEM_CODE
pstmt.setString(5, detail[8]);
pstmt.executeUpdate();
if(pstmt != null)
{
......@@ -3517,8 +3569,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
dlvDate = genericUtility.getValidDateTimeString(
checkNullAndTrim(detail[3]), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
sql = "INSERT INTO PORDDET_TEMP(PURC_ORDER, SITE_CODE, ITEM_CODE, QUANTITY, DLV_DATE, TAB_NO) "
+ " VALUES(?,?,?,?,?,?)";
sql = "INSERT INTO PORDDET_TEMP(PURC_ORDER, SITE_CODE, ITEM_CODE, QUANTITY, DLV_DATE, TAB_NO, DISCOUNT) "
+ " VALUES(?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrderFrmHdr); // PURC_ORDER
pstmt.setString(2, detail[0]); // SITE_CODE
......@@ -3526,6 +3578,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
pstmt.setString(4, detail[2]); // QUANTITY
pstmt.setTimestamp(5, java.sql.Timestamp.valueOf(dlvDate)); // DLV_DATE
pstmt.setString(6, detail[8]);
pstmt.setDouble(7, Double.parseDouble( detail[9]));//ADDED DISCOUNT COLUMN ON 10-09-2017
pstmt.executeUpdate();
if(pstmt != null)
{
......@@ -3544,7 +3597,8 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
pstmtSel = null;
}
}
else if(detail[2].trim().equalsIgnoreCase("") || Integer.parseInt(detail[2]) <= 0) // if Quantity is zero
//else if(detail[2].trim().equalsIgnoreCase("") || Integer.parseInt(detail[2]) <= 0) // if Quantity is zero
else if(detail[2].trim().equalsIgnoreCase("") || Double.parseDouble(detail[2]) <= 0)//Changed by wasim on 09-03-2017 for parsing
{
//sql = "DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE = ? ";
sql = " DELETE FROM PORDDET_TEMP WHERE PURC_ORDER = ? AND ITEM_CODE = ? AND TAB_NO = ? ";
......@@ -3559,8 +3613,6 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
pstmt = null;
}
}
}
catch (Exception e)
{
......@@ -3703,6 +3755,7 @@ public class DDPorderWizEJB extends ValidatorEJB implements DDPorderWizEJBRemote
}
catch (Exception e)
{
System.out.println("Exception inside resetPorderHeader PorderWiz"+e.getMessage());
e.printStackTrace();
isError = true;
}
......
webitm-wms/ibase/webitm/ejb/wms/DDPorderWizEJBLocal.java
View file @ cbe15f43
......@@ -30,7 +30,9 @@ public interface DDPorderWizEJBLocal extends ValidatorLocal
public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String getList(String field,String[] values,String extra,String details) throws RemoteException,ITMException;
public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity,String dlvDate,String tabNo,int ctr ,Connection conn);
//public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity,String dlvDate,String tabNo,int ctr ,Connection conn);
public String getPorderDetails(Document dom1,Document dom2,String itemCode,String itemDetails,int ctr ,Connection conn);
public String getPoDetails(String obj,String random) throws RemoteException,ITMException;
public String getSKUDetail(String itemParentData,String itemDLVDate,String paraData,String otherDetails) throws RemoteException,ITMException;
......
webitm-wms/ibase/webitm/ejb/wms/DDPorderWizEJBRemote.java
View file @ cbe15f43
......@@ -28,9 +28,10 @@ public interface DDPorderWizEJBRemote extends ValidatorRemote
public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String getList(String field,String[] values,String extra,String details) throws RemoteException,ITMException;
public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity, String dlvDate,String tabNo, int ctr ,Connection conn);
public String getPoDetails(String obj,String random) throws RemoteException,ITMException;
//public String getPorderDetails(Document dom1,Document dom2,String itemCode,String quantity, String dlvDate,String tabNo, int ctr ,Connection conn);
public String getPorderDetails(Document dom1,Document dom2,String itemCode,String itemDetails,int ctr ,Connection conn);
public String getPoDetails(String obj,String random) throws RemoteException,ITMException;
public String getSKUDetail(String itemParentData,String itemDLVDate,String paraData,String otherDetails) throws RemoteException,ITMException;
public String getPurcDetail1(String purcOrder,String flag)throws RemoteException,ITMException;
public String getPorderDetail2(String siteCode,String empCodeFrmReq,String purcOrder,String flag)throws RemoteException,ITMException;
......
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