Commit de546897 authored by steurwadkar's avatar steurwadkar

Changes made to apply new CSS to sales order entry screen

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@172940 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 82bfba97
...@@ -1820,6 +1820,60 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1820,6 +1820,60 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
conn = getConnection(); conn = getConnection();
//Added by Santosh on 04-11-2017 to get physical attributes values from item_type [Start]
String itemType = "",phyAttribute1 = "", phyAttribute2 = "", phyAttribute3 = "", phyAttribute4 = "", phyAttribute5 = "";
sql = "SELECT ITEM_TYPE FROM ITEM WHERE ITEM_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemParent);
rs = pstmt.executeQuery();
if(rs.next())
{
itemType = checkNullAndTrim(rs.getString("ITEM_TYPE"));
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs=null;
}
System.out.println("itemType["+itemType+"]");
sql = "SELECT PHY_ATTRIB_1, PHY_ATTRIB_2, PHY_ATTRIB_3, PHY_ATTRIB_4, PHY_ATTRIB_5 FROM ITEM_TYPE WHERE ITEM_TYPE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemType);
rs = pstmt.executeQuery();
if(rs.next())
{
phyAttribute1 = checkNullAndTrim(rs.getString("PHY_ATTRIB_1"));
phyAttribute2 = checkNullAndTrim(rs.getString("PHY_ATTRIB_2"));
phyAttribute3 = checkNullAndTrim(rs.getString("PHY_ATTRIB_3"));
phyAttribute4 = checkNullAndTrim(rs.getString("PHY_ATTRIB_4"));
phyAttribute5 = checkNullAndTrim(rs.getString("PHY_ATTRIB_5"));
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs=null;
}
System.out.println("phyAttribute1["+phyAttribute1+"] phyAttribute2["+phyAttribute2+"] phyAttribute3["+phyAttribute3+"] phyAttribute4["+phyAttribute4+"] phyAttribute5["+phyAttribute5+"]");
//Added by Santosh on 04-11-2017 to get physical attributes values from item_type [End]
//if(tranType.equals("T")) //if(tranType.equals("T"))
//{ //{
valueXmlString.append("<TH_SET selected = 'N'>\r\n"); valueXmlString.append("<TH_SET selected = 'N'>\r\n");
...@@ -1831,8 +1885,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1831,8 +1885,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
pstmt.setString(1, itemParent); pstmt.setString(1, itemParent);
pstmt.setString(2, itemParent); pstmt.setString(2, itemParent);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
valueXmlString.append("<SET><![CDATA[").append("Color").append("]]></SET>\r\n"); //Commented and Changes by Santosh on 04-11-2017 to get physical attributes values from item_type [Start]
valueXmlString.append("<SET><![CDATA[").append("Dimension").append("]]></SET>\r\n"); /*valueXmlString.append("<SET><![CDATA[").append("Color").append("]]></SET>\r\n");
valueXmlString.append("<SET><![CDATA[").append("Dimension").append("]]></SET>\r\n");*/
String colName1 = phyAttribute2.substring(0, 1).toUpperCase() + phyAttribute2.substring(1).toLowerCase();
String colName2 = phyAttribute3.substring(0, 1).toUpperCase() + phyAttribute3.substring(1).toLowerCase();
valueXmlString.append("<SET><![CDATA[").append(colName1 ).append("]]></SET>\r\n");
valueXmlString.append("<SET><![CDATA[").append(colName2).append("]]></SET>\r\n");
//Commented and Changes by Santosh on 04-11-2017 to get physical attributes values from item_type [End]
valueXmlString.append("<SET><![CDATA[").append("Quantity").append("]]></SET>\r\n"); valueXmlString.append("<SET><![CDATA[").append("Quantity").append("]]></SET>\r\n");
while (rs.next()) while (rs.next())
{ {
...@@ -1858,7 +1918,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1858,7 +1918,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
sql = " SELECT DISTINCT I.PHY_ATTRIB_2,V.DESCR FROM ITEM I,ITM_ATTRIB_VAL V WHERE I.ITEM_PARNT = ? AND I.ITEM_CODE != ?" sql = " SELECT DISTINCT I.PHY_ATTRIB_2,V.DESCR FROM ITEM I,ITM_ATTRIB_VAL V WHERE I.ITEM_PARNT = ? AND I.ITEM_CODE != ?"
+" AND I.PHY_ATTRIB_2 = V.ATTRIB_ID " +" AND I.PHY_ATTRIB_2 = V.ATTRIB_ID "
+" AND V.ATTRIB_CODE='COLOR' " //Changed by Santosh on 04-11-2017
//+" AND V.ATTRIB_CODE='COLOR' "
+" AND V.ATTRIB_CODE= '"+colName1.toUpperCase()+"' "
+" AND I.ACTIVE = 'Y' " +" AND I.ACTIVE = 'Y' "
+" ORDER BY I.PHY_ATTRIB_2"; +" ORDER BY I.PHY_ATTRIB_2";
...@@ -1886,7 +1948,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1886,7 +1948,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
sql = " SELECT DISTINCT I.PHY_ATTRIB_3,V.DESCR FROM ITEM I,ITM_ATTRIB_VAL V " sql = " SELECT DISTINCT I.PHY_ATTRIB_3,V.DESCR FROM ITEM I,ITM_ATTRIB_VAL V "
+" WHERE I.ITEM_PARNT = ? AND I.ITEM_CODE != ? AND I.PHY_ATTRIB_3 = V.ATTRIB_ID" +" WHERE I.ITEM_PARNT = ? AND I.ITEM_CODE != ? AND I.PHY_ATTRIB_3 = V.ATTRIB_ID"
+" AND V.ATTRIB_CODE='DIMENSION' " //Changed by Santosh on 04-11-2017
//+" AND V.ATTRIB_CODE='DIMENSION' "
+" AND V.ATTRIB_CODE= '"+colName2.toUpperCase()+"' "
+" AND I.ACTIVE = 'Y' " +" AND I.ACTIVE = 'Y' "
+" ORDER BY I.PHY_ATTRIB_3"; +" ORDER BY I.PHY_ATTRIB_3";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2013,12 +2077,18 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2013,12 +2077,18 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
rate = getItemRate(itmCode, otherDetails, conn); rate = getItemRate(itmCode, otherDetails, conn);
} }
key = key + ":"+ rate; key = key + ":"+ rate;
String toolTipData = key + ":"+ "Item Code- "+itmCode+""+ //Commented and Changed by Santosh on 04-11-2017 to get physical attributes values from item_type [Start]
/*String toolTipData = key + ":"+ "Item Code- "+itmCode+""+
"&#010;Color- "+colorList.get(j)+ "&#010;Color- "+colorList.get(j)+
"&#010;Dimension- "+dimensionList.get(i)+ "&#010;Dimension- "+dimensionList.get(i)+
"&#010;Size- "+sizeList.get(k)+""+ "&#010;Size- "+sizeList.get(k)+""+
"&#010;Rate- "+rate+""; "&#010;Rate- "+rate+"";*/
String toolTipData = key + ":"+ "Item Code - "+itmCode+""+
"&#010;"+colName1+" - "+colorList.get(j)+
"&#010;"+colName2+" - "+dimensionList.get(i)+
"&#010;Size - "+sizeList.get(k)+""+
"&#010;Rate - "+rate+"";
//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); System.out.println("Your Key is="+key);
//tooltip.add(key); //tooltip.add(key);
...@@ -2060,7 +2130,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2060,7 +2130,9 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{ {
//valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></Descr>\r\n"); //valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2))).append("]]></Descr>\r\n");
//valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2) +" (Available in "+cntColors+" colors and "+cntSizes+" sizes) ")).append("]]></Descr>\r\n"); //valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2) +" (Available in "+cntColors+" colors and "+cntSizes+" sizes) ")).append("]]></Descr>\r\n");
valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2) +" available in "+cntColors+" color(s) and "+cntSizes+" size(s) ")).append("]]></Descr>\r\n"); //Changed by Santosh on 04-11-2017
//valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2) +" available in "+cntColors+" color(s) and "+cntSizes+" size(s) ")).append("]]></Descr>\r\n");
valueXmlString.append("<Descr><![CDATA[").append(checkNullAndTrim(rs.getString(2) +" available in "+cntColors+" "+colName1+"(s) and "+cntSizes+" "+colName2+"(s) ")).append("]]></Descr>\r\n");
} }
if (rs != null) if (rs != null)
{ {
......
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