Skip to content

B
business-java
Commit f75be5f3 authored by spawar's avatar spawar
Browse files
Options

Added Changes for integrate Size short description as label 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99822 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e5784efa
Show whitespace changes
Inline Side-by-side
Showing with 238 additions and 156 deletions
webitm-wms/ibase/webitm/ejb/wms/ItmAttribValIC.java
View file @ f75be5f3
...@@ -269,8 +269,8 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote ...@@ -269,8 +269,8 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
Node parentNode = null; Node parentNode = null;
Node childNode = null; Node childNode = null;
String attribCode =""; String attribCode ="";
String attribId = ""; String attribId = "",shortDescr="",descr="";
String query = ""; String query = "",shdescrSQL="";
int ctr=0,currentFormNo =0,childNodeListLength =0; int ctr=0,currentFormNo =0,childNodeListLength =0;
String userId=""; String userId="";
String childNodeName = null,childNodeValue = null; String childNodeName = null,childNodeValue = null;
...@@ -286,6 +286,10 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote ...@@ -286,6 +286,10 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode"); userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
descr = checkNull(genericUtility.getColumnValue("descr", dom));
//Changed by Jagruti on 24/12/2015 for short descr[Start].
shortDescr = checkNull(genericUtility.getColumnValue("sh_descr", dom));
//Changed by Jagruti on 24/12/2015 for short descr[End].
if(objContext != null && objContext.trim().length() > 0) if(objContext != null && objContext.trim().length() > 0)
{ {
currentFormNo = Integer.parseInt(objContext); currentFormNo = Integer.parseInt(objContext);
...@@ -352,6 +356,22 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote ...@@ -352,6 +356,22 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
System.out.println("attrib_id" +attribCode);
//Change by Jagruti for descr/short descr lenght[Start]
if((descr.trim()).length()>15)
{
System.out.println("if size greater for descr");
errString = getErrorString("descr","VTSDESCLIM",userId);
//Description/Short Descr should not be greater than 15 character for SIZE attribute
}
if((shortDescr.trim()).length()>15)
{
System.out.println("if size greater for shortdescr");
errString = getErrorString("sh_descr","VTSDESCLIM",userId);
//Description/Short Descr should not be greater than 15 character for SIZE attribute
}
//Change by Jagruti for descr/short descr lenght[End]
query ="select * from itm_attrib_val where attrib_id = ? and attrib_code='SIZE'" ; query ="select * from itm_attrib_val where attrib_id = ? and attrib_code='SIZE'" ;
pstmt1= conn.prepareStatement(query); pstmt1= conn.prepareStatement(query);
pstmt1.setString(1, attribId); pstmt1.setString(1, attribId);
...@@ -374,17 +394,29 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote ...@@ -374,17 +394,29 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
{ {
if (childNode.getFirstChild() == null) if (childNode.getFirstChild() == null)
{ {
System.out.println(" descr null"+descr);
errString = getErrorString("descr","VTDESCNVL",userId); errString = getErrorString("descr","VTDESCNVL",userId);
break ; break ;
} }
} }
//Change by Jagruti on 25/12/2015 for Short Description[Start]
else if(childNodeName.equalsIgnoreCase("sh_descr"))
{
if (childNode.getFirstChild() == null)
{
System.out.println("Short descr null"+shortDescr);
errString = getErrorString("sh_descr","VTDESCNVL",userId);
break ;
}
}
//Change by Jagruti on 25/12/2015 for Short Description[End]
} }
break; break;
} }
attribCode = checkNull(genericUtility.getColumnValue("attrib_code", dom)); attribCode = checkNull(genericUtility.getColumnValue("attrib_code", dom));
attribId = checkNull(genericUtility.getColumnValue("attrib_id", dom)); attribId = checkNull(genericUtility.getColumnValue("attrib_id", dom));
String descr = checkNull(genericUtility.getColumnValue("descr", dom));
if(editFlag.equalsIgnoreCase("A")) if(editFlag.equalsIgnoreCase("A"))
{ {
...@@ -414,11 +446,30 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote ...@@ -414,11 +446,30 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
errString = getErrorString("descr","VTDESCLIMT",userId); errString = getErrorString("descr","VTDESCLIMT",userId);
} }
} }
//Changed by Jagruti on 24/12/2015 for size length validation [Start]
if(attribCode.equalsIgnoreCase("SIZE"))
{
System.out.println("if for size");
if((descr.trim()).length()>15)
{
System.out.println("if size greater than15 for descr");
errString = getErrorString("descr","VTSDESCLIM",userId);
}
if((shortDescr.trim()).length()>15)
{
System.out.println("if size greater than15 for shortdescr");
errString = getErrorString("sh_descr","VTSDESCLIM",userId);
}
}
//Changed by Jagruti on 24/12/2015 for size length validation [End]
if(editFlag.equalsIgnoreCase("E")) if(editFlag.equalsIgnoreCase("E"))
{ {
//Change by Jagruti on 24/12/2015 for edit mode[Start]
query =" SELECT DISTINCT DESCR FROM itm_attrib_val WHERE attrib_code=? and attrib_id=? " ; //query =" SELECT DISTINCT DESCR FROM itm_attrib_val WHERE attrib_code=? and attrib_id=? " ;
query =" SELECT DISTINCT DESCR ,SH_DESCR FROM ITM_ATTRIB_VAL WHERE ATTRIB_CODE=? AND ATTRIB_ID=? " ;
//Change by Jagruti on 24/12/2015 for edit mode[End]
pstmt = conn.prepareStatement(query); pstmt = conn.prepareStatement(query);
pstmt.setString(1, attribCode); pstmt.setString(1, attribCode);
pstmt.setString(2, attribId); pstmt.setString(2, attribId);
...@@ -426,15 +477,24 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote ...@@ -426,15 +477,24 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
String descrSQL=""; String descrSQL="";
if(rs.next()) if(rs.next())
{ {
descrSQL = rs.getString(1); descrSQL = rs.getString("DESCR");
shdescrSQL=rs.getString("SH_DESCR");
} }
pstmt.close(); pstmt.close();
rs.close(); rs.close();
if(!descrSQL.equalsIgnoreCase(descr) ) if(!descrSQL.equalsIgnoreCase(descr) )
{ { System.out.println("in descr"+descr);
errString = getErrorString("descr","VTINTGMAGN",userId); errString = getErrorString("descr","VTINTGMAGN",userId);
return errString; return errString;
} }
//Change by Jagruti on 25/12/2015 for short descr in edit[Start]
else if(!shdescrSQL.equalsIgnoreCase(shortDescr))
{
System.out.println("in short descr"+shortDescr);
errString = getErrorString("sh_descr","VTINTGMAGN",userId);
return errString;
}
//Change by Jagruti on 25/12/2015 for short descr in edit mode[End]
} }
}catch(Exception e) }catch(Exception e)
......
webitm-wms/ibase/webitm/ejb/wms/ItmAttribValPos.java
View file @ f75be5f3
...@@ -68,7 +68,8 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca ...@@ -68,7 +68,8 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
childNodeList = parentNode.getChildNodes(); childNodeList = parentNode.getChildNodes();
childNodeListLength= childNodeList.getLength(); childNodeListLength= childNodeList.getLength();
String attribCode="",attribId="",descr="",shDescr="",activeYN="",sortOrder="",udfStr1="",udfStr2="",udfStr3="",udfStr4="",udfStr5="",itemAtrDescr=""; String attribCode="",attribId="",descr="",shDescr="",activeYN="",sortOrder="",udfStr1="",udfStr2="",udfStr3="",
udfStr4="",udfStr5="",itemAtrDescr="",shortDescr="";
for ( int i = 0; i < childNodeListLength; i++ ) for ( int i = 0; i < childNodeListLength; i++ )
{ {
...@@ -96,7 +97,15 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca ...@@ -96,7 +97,15 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
descr = checkNull(childNode.getFirstChild().getNodeValue()); descr = checkNull(childNode.getFirstChild().getNodeValue());
} }
} }
//Change by Jagruti on 24/12/2015 [Start]
if (nodeName.equalsIgnoreCase("sh_descr"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
shortDescr = checkNull(childNode.getFirstChild().getNodeValue());
}
}
//Change by Jagruti on 24/12/2015 [End]
} }
Attribute objAttrib = new Attribute(); Attribute objAttrib = new Attribute();
...@@ -117,6 +126,7 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca ...@@ -117,6 +126,7 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
} }
*/ */
objAttrib.setAttrName(attribCode); objAttrib.setAttrName(attribCode);
System.out.println("attribCode" +attribCode);
//Changed by samadhan start for integrate SIZE attribute only End //Changed by samadhan start for integrate SIZE attribute only End
/*if(attribCode.equalsIgnoreCase("SIZE")) /*if(attribCode.equalsIgnoreCase("SIZE"))
{ {
...@@ -126,7 +136,22 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca ...@@ -126,7 +136,22 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
{ {
objAttrib.setAttrValue(descr); objAttrib.setAttrValue(descr);
}*/ }*/
//Change by Jagruti on 25/12/2015 for SIZE[Start]
//objAttrib.setAttrValue(descr);
if(attribCode.equalsIgnoreCase("SIZE"))
{
objAttrib.setAttrValue(attribId);
objAttrib.setAttrLabels("1:UK "+shortDescr);
System.out.println("shortDescr in obj" +shortDescr);
System.out.println("attribute code in obj" +attribId);
}
else
{
objAttrib.setAttrValue(descr); objAttrib.setAttrValue(descr);
System.out.println("descr in obj" +descr);
}
//Change by Jagruti on 25/12/2015 for SIZE[End]
int apiAttribCode = 0; int apiAttribCode = 0;
String sql=""; String sql="";
...@@ -161,7 +186,6 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca ...@@ -161,7 +186,6 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
updateAttribUdfStr(apiAttribCode,attribCode,attribId,conn); updateAttribUdfStr(apiAttribCode,attribCode,attribId,conn);
} }
} }
catch(Exception e) catch(Exception e)
...@@ -191,7 +215,6 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca ...@@ -191,7 +215,6 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -221,7 +244,6 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca ...@@ -221,7 +244,6 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
{ {
} }
} }
public String checkNull(String input) public String checkNull(String input)
{ {
......
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