Bug fix date parsing error in getdiscount.

Rate not setting in itemchange

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@173666 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java

@@ -6,14 +6,6 @@
  * */
 package ibase.webitm.ejb.dis;
 
-import ibase.system.config.ConnDriver;
-import ibase.utility.CommonConstants;
-import ibase.utility.E12GenericUtility;
-import ibase.webitm.ejb.ValidatorEJB;
-import ibase.webitm.ejb.fin.FinCommon;
-import ibase.webitm.ejb.sys.UtilMethods;
-import ibase.webitm.utility.ITMException;
-
 import java.rmi.RemoteException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -30,10 +22,17 @@ import javax.ejb.Stateless; // added for ejb3
 
 import org.w3c.dom.CDATASection;
 import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import ibase.system.config.ConnDriver;
+import ibase.utility.CommonConstants;
+import ibase.utility.E12GenericUtility;
+import ibase.webitm.ejb.ValidatorEJB;
+import ibase.webitm.ejb.fin.FinCommon;
+import ibase.webitm.ejb.sys.UtilMethods;
+import ibase.webitm.utility.ITMException;
+
 
 @Stateless
 // added for ejb3
@@ -10210,7 +10209,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					mQty = Double.parseDouble(checkDouble(genericUtility.getColumnValue("quantity", dom)));
 
 					lcPlistDisc=getDiscount(lsItemCode, lsUnit, mQty, dom, dom1, dom2, conn);
-
+					System.out.println("lcPlistDisc in itemcode IC"+lcPlistDisc);
 					lcDiscount = Double.parseDouble(checkDouble(genericUtility.getColumnValue("discount", dom1)));
 
 					if (lcDiscount == 0 && (lsContractNo == null || lsContractNo.trim().length() == 0))
@@ -10219,16 +10218,44 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						setNodeValue( dom, "discount", getAbsString( String.valueOf(lcPlistDisc)));
 					}
 					lsDiscPriceList = checkNull(genericUtility.getColumnValue("price_list__disc", dom1));
-
+					System.out.println("lsDiscPriceList"+lsDiscPriceList);
+					lcRate=Double.parseDouble(genericUtility.getColumnValue("rate", dom));
+					System.out.println("rate in item code IC"+lcRate);
 					if ("M".equalsIgnoreCase(distCommon.getPriceListType(lsDiscPriceList, conn)))
 					{
 						ldRate = lcRate;
 						lsDiscFlag = true;
+						ldRate=calRate(lcPlistDisc,ldRate);
+						System.out.println("RATE calcrate"+ldRate);
+						lsUnitRate=checkNull(genericUtility.getColumnValue("unit__rate", dom));
+						lsUnitStd=checkNull(genericUtility.getColumnValue("unit__std", dom));
+						
+						System.out.println("lsUnitRate ["+lsUnitRate+"]:::lcRateStduom["+lcRateStduom+"]");
+						
+						lcConvRtuomStduom = Double.parseDouble(checkDouble(genericUtility.getColumnValue("conv__rtuom_stduom", dom)));
+						lcRateStduom = distCommon.convQtyFactor(lsUnitStd, lsUnitRate, lsItemCode, ldRate, conn);
+						System.out.println("Before lcConvRtuomStduom ["+lcConvRtuomStduom+"]:::lcRateStduom["+lcRateStduom+"]");
+						
+						
+						ArrayList ratestduomArr = null;				
+						ratestduomArr = distCommon.getConvQuantityFact(lsUnitStd, lsUnitRate, lsItemCode, ldRate,lcConvRtuomStduom,conn); 
+						//valueXmlString.append("<unit__rate>").append("<![CDATA[" + mVal + "]]>").append("</unit__rate>");
+						
+						lcConvRtuomStduom = Double.parseDouble(ratestduomArr.get(0).toString());
+						lcRateStduom= Double.parseDouble(ratestduomArr.get(1).toString());
+						
+						System.out.println("After lcConvRtuomStduom ["+lcConvRtuomStduom+"]:::lcRateStduom["+lcRateStduom+"]");
+						
+						valueXmlString.append("<conv__rtuom_stduom>").append("<![CDATA[" + lcConvRtuomStduom + "]]>").append("</conv__rtuom_stduom>");
+						setNodeValue( dom, "conv__rtuom_stduom", getAbsString( String.valueOf(lcConvRtuomStduom)));
+						valueXmlString.append("<rate__stduom>").append("<![CDATA[" + lcRateStduom + "]]>").append("</rate__stduom>");
+						setNodeValue( dom, "rate__stduom", getAbsString( String.valueOf(lcRateStduom)));
 						valueXmlString.append("<rate>").append("<![CDATA[" + ldRate + "]]>").append("</rate>");
 						setNodeValue( dom, "rate", getAbsString( String.valueOf(ldRate)));
 						valueXmlString.append("<discount>").append("<![CDATA[" + 0 + "]]>").append("</discount>");
 						setNodeValue( dom, "discount", getAbsString( String.valueOf("0")));
 					}
+					
 					lcQtyStd = Double.parseDouble(checkDouble(genericUtility.getColumnValue("quantity__stduom", dom1)));
 					lsPackCode = genericUtility.getColumnValue("pack_code", dom1);
 					llNoArt = String.valueOf(distCommon.getNoArt(lsSiteCode, lsCustCode, lsItemCode, lsPackCode, lcQtyStd, 'I', acShipperQty, acIntQty, conn));
@@ -12528,7 +12555,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 		double mQty = 0.00, ldConvQtyStduom = 0.00, mRate = 0.00, mNum = 0.00, ldRate = 0.00, idRateWtDiscount = 0.00, acShipperQty = 0.00, acIntegralQty = 0.00, lcRate = 0.00;
 		double lcOrdValue = 0.00, lcShipperQty = 0.00, lcIntQty = 0.00, lcBalQty = 0.00, lcLooseQty = 0.00, lcIntegralQty = 0.00, lcQty1 = 0.00, lcQtyFc = 0.00;
 		String sql = "", mVal = "", mVal1 = "", lsNature = "", lsPriceListParent = "", lsUnitSal = "", lsPriceList = "", lsItemCodeOrd = "", lsContractNo = "", lsListType = "";
-		String lsPlistDisc = "", lsCustCode = "", mSiteCode = "", lsPackCode = "", mStateCd = "", lsOrderType = "", lsCountCodeDlv = "", itemStru = "", lstype = "";
+		String lsPlistDisc = "",lsPlistDiscount="", lsCustCode = "", mSiteCode = "", lsPackCode = "", mStateCd = "", lsOrderType = "", lsCountCodeDlv = "", itemStru = "", lstype = "";
 		String lsCurscheme = "", lsItemCodeParent = "", lsApplyCustList = "", lsNoapplyCustList = "", lsApplicableOrdTypes = "", lsSchemeCode = "", lsPrevscheme = "";
 		String lsCustSchemeCode = "", lsItemStru = "", lsDisPobOrdTypeList = "", lsSchemeEdit = "", lsUnit = "", lsRefNo = "", lsSiteCodeShip = "", mSlabOn = "", lsDescr = "";
 		String lsSalesOrd = "", lsQuotNo = "",reStr="",ldtDateStr="";
@@ -12657,6 +12684,8 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 				valueXmlString.append("<discount>").append("<![CDATA[" + lsPlistDisc + "]]>").append("</discount>");
 				setNodeValue( dom, "discount", getAbsString(String.valueOf(lsPlistDisc)));
 			}
+			lsPlistDiscount = genericUtility.getColumnValue("price_list__disc", dom1);
+			System.out.println("lsPlistDiscount"+lsPlistDiscount);
 			if ("M".equalsIgnoreCase(distCommon.getPriceListType(lsPlistDisc, conn)))
 			{
 				ldRate = idRateWtDiscount;
@@ -13359,7 +13388,9 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 	public double getDiscount(String itemCode, String unit, double itemQuantity, Document dom, Document dom1, Document dom2, Connection conn) throws ITMException, Exception
 	{
 		String priceList, custCode, siteCode;
-		Date orderDate = null, plDate = null;
+		//Date orderDate = null, plDate = null;
+		Date  plDate = null;
+		Timestamp orderDate=null;
 		double plistDisc = 0, discMerge = 0;
 		SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 		try
@@ -13371,6 +13402,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 			} else
 			{
 				orderDate = Timestamp.valueOf(genericUtility.getValidDateString(genericUtility.getColumnValue("order_date", dom1), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()) + " 00:00:00.0");
+				System.out.println("getDiscount orderDate::"+orderDate);
 			}
 			custCode = genericUtility.getColumnValue("cust_code", dom1);
 			siteCode = genericUtility.getColumnValue("site_code", dom1);
@@ -13390,7 +13422,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 		return plistDisc;
 	}
 
-	public double getDiscount(String priceList, Date orderDate, String custCode, String siteCode, String itemCode, String unit, double discMerge, Date pListDate, double quantity, Connection conn) throws ITMException
+	public double getDiscount(String priceList, Timestamp orderDate, String custCode, String siteCode, String itemCode, String unit, double discMerge, Date pListDate, double quantity, Connection conn) throws ITMException
 	{
 		String listType = "", itmSer = "";
 		double disc = 0;
@@ -13411,19 +13443,21 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 				pstmt.setDouble(4, quantity);
 				pstmt.setDouble(5, quantity);
 				pstmt.setDouble(6, quantity);
-				pstmt.setDate(7,  (java.sql.Date) orderDate);
-				pstmt.setDate(8,  (java.sql.Date) orderDate);
+				pstmt.setTimestamp(7, orderDate);
+				pstmt.setTimestamp(8, orderDate);
+				//pstmt.setDate(7,  (java.sql.Date) orderDate);
+				//pstmt.setDate(8,  (java.sql.Date) orderDate);
 				rs = pstmt.executeQuery();
 				while (rs.next())
 				{
-					rate = rs.getDouble("rate");
+					disc = rs.getDouble("rate");
 				}
 				rs.close();
 				rs = null;
 				pstmt.close();
 				pstmt = null;
 			}
-			if (listType.equals("M") || priceList == null || priceList.trim().length() == 0 || rate == 0)
+			if (listType.equals("M") || priceList == null || priceList.trim().length() == 0 || disc == 0)
 			{
 				sql = "select item_ser from item where item_code = ?";
 				pstmt = conn.prepareStatement(sql);