Skip to content

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

commited new changes related rate 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@173933 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 50cd6bb0
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 11 deletions
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJB.java
View file @ 78f8c5a8
......@@ -1462,8 +1462,10 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE ITEM_PARNT IS NULL AND ITEM_SER = ? ";
//sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE ITEM_PARNT IS NULL ";
sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE PRODUCT_CODE IS NULL ";
//sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE PRODUCT_CODE IS NULL ";
sql = "select PRODUCT_CODE,DESCR from PRODUCT ";
//changed by kaustubh on 13 nov 2017 End
......@@ -1846,8 +1848,17 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//Added by Santosh on 04-11-2017 to get physical attributes values from item_type [Start]
String itemType = "",phyAttribute1 = "", phyAttribute2 = "", phyAttribute3 = "", phyAttribute4 = "", phyAttribute5 = "";
//changed by kaustubh on 20 nov After Adding new column in product master that is ITEM_TYPE , now fetching item_type from product table 2017 Start
//sql = "SELECT ITEM_TYPE FROM ITEM WHERE PRODUCT_CODE = ?";
//sql = "SELECT ITEM_TYPE FROM PRODUCT WHERE PRODUCT_CODE = ?";
sql=" SELECT p.PRODUCT_TYPE FROM PRODUCT p,ITEM i "+
" WHERE trim(p.PRODUCT_TYPE) = trim(i.ITEM_TYPE)"+
" and p.PRODUCT_CODE = ? ";
sql = "SELECT ITEM_TYPE FROM ITEM WHERE PRODUCT_CODE = ?";
//changed by kaustubh on 20 nov 2017 Start
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemParent);
......@@ -1855,7 +1866,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
if(rs.next())
{
itemType = checkNullAndTrim(rs.getString("ITEM_TYPE"));
//itemType = checkNullAndTrim(rs.getString("ITEM_TYPE"));
itemType = checkNullAndTrim(rs.getString("PRODUCT_TYPE"));
}
if(pstmt != null)
{
......@@ -2170,17 +2182,26 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
SalesPriceList = distCommon.getSalesPriceList(custCode,custcodedlv,siteCode,ContractNo,itemCode,orderDate,conn);
lsListType = distCommon.getPriceListType(SalesPriceList, conn);
System.out.println("lsListType"+lsListType);
if("B".equalsIgnoreCase(lsListType))
//if(lsListType != "B")
{
//rate = getItemRate(itmCode, otherDetails, conn);
System.out.println("Inside lsListType");
newRate = distCommon.getSalesRate(SalesPriceList,siteCode,custCode,orderDate,orderDate,"C",ContractNo,ContractNo,itemCode,0.0,conn);
//valueXmlString.append("<item_parent_rate><![CDATA[").append(newRate).append("]]></item_parent_rate>\r\n");
/* temRateString.append("<each_rate>");
temRateString.append("<key><![CDATA[").append(descrList.get(k)).append("]]></key>\r\n");
temRateString.append("<value><![CDATA[").append(newRate).append("]]></value>\r\n");
temRateString.append("</each_rate>");*/
}
}
System.out.println("ContractNo"+ContractNo);
System.out.println("lsListType::"+lsListType);
// System.out.println("lsListType::"+lsListType);
System.out.println("SalesPriceList::"+SalesPriceList);
System.out.println("newRate::"+newRate);
......@@ -2196,14 +2217,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
"&#010;"+colName1+" - "+colorList.get(j)+
"&#010;"+colName2+" - "+dimensionList.get(i)+
"&#010;Size - "+sizeList.get(k)+""+
"&#010;Rate - "+rate+"";
"&#010;Rate - "+newRate+"";
//Commented and Changed by Santosh on 04-11-2017 to get physical attributes values from item_type [End]
System.out.println("Your Key is="+key);
/*temRateString.append("<"+sizeList.get(k)+"><![CDATA[").append(rate).append("]]></"+sizeList.get(k)+">\r\n");*/
temRateString.append("<"+descrList.get(k)+"><![CDATA[").append(newRate).append("]]></"+descrList.get(k)+">\r\n");
/* temRateString.append("<"+descrList.get(k)+"><![CDATA[").append(newRate).append("]]></"+descrList.get(k)+">\r\n");*/
//tooltip.add(key);
tooltip.add(toolTipData);
......@@ -2241,7 +2262,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("</tooltip>\r\n");
}
sql = " SELECT ITEM_CODE,descr FROM ITEM I WHERE I.ITEM_CODE = ? AND I.ACTIVE = 'Y' ";
//sql = " SELECT ITEM_CODE,descr FROM ITEM I WHERE I.ITEM_CODE = ? AND I.ACTIVE = 'Y' ";
sql=" SELECT PRODUCT_CODE,DESCR FROM PRODUCT WHERE PRODUCT_CODE= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemParent);
rs = pstmt.executeQuery();
......@@ -2274,18 +2296,21 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<DLVDate><![CDATA[").append(dspDate).append("]]></DLVDate>\r\n");
}
//if("B".equalsIgnoreCase(lsListType))
System.out.println("lsListTypeparent::"+lsListType);
// if("B".equalsIgnoreCase(lsListType))
if( !"B".equalsIgnoreCase(lsListType))
{
itemParentRate = getItemRate(itemParent, otherDetails, conn);
newRate = distCommon.getSalesRate(SalesPriceList,siteCode,custCode,orderDate,"","","","","",0.0,conn);
//itemParentRate = getItemRate(itemParent, otherDetails, conn);
// newRate = distCommon.getSalesRate(SalesPriceList,siteCode,custCode,orderDate,"","","","","",0.0,conn);
newRate = distCommon.getSalesRate(SalesPriceList,siteCode,custCode,orderDate,orderDate,"C",ContractNo,ContractNo,itmCode,0.0,conn);
valueXmlString.append("<trueFlag><![CDATA[").append("true").append("]]></trueFlag>\r\n");
}
else
{
valueXmlString.append("<trueFlag><![CDATA[").append("false").append("]]></trueFlag>\r\n");
}
// System.out.println("newRate1::"+newRate);
System.out.println("newRate1::"+newRate);
System.out.println("itemParentRate1"+itemParentRate);
valueXmlString.append("<item_parent_rate><![CDATA[").append(newRate).append("]]></item_parent_rate>\r\n");
......
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