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
Hide whitespace changes
Inline Side-by-side
Showing with 238 additions and 156 deletions
webitm-wms/ibase/webitm/ejb/wms/ItmAttribValIC.java
View file @ f75be5f3
......@@ -56,7 +56,7 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
System.out.println("Current Dom:{"+currXmlDataStr+"}");
System.out.println("Header Dom:{"+hdrXmlDataStr+"}");
System.out.println("All Dom:{"+allXmlDataStr+"}");
errString = defaultItemChanged( currDom, hdrDom, allDom, objContext, currentColumn, editFlag, xtraParams );
System.out.println ( "Return String :" + errString);
}
......@@ -85,7 +85,7 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
String query="";
StringBuffer valueXmlString = new StringBuffer( "<?xml version=\"1.0\"?>\r\n<Root>\r\n<Header>\r\n" );
GenericUtility genericUtility = GenericUtility.getInstance();
try
{
ConnDriver connDriver = new ConnDriver();
......@@ -118,11 +118,11 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
valueXmlString.append( "<chg_term><![CDATA[" ).append( chgTerm ).append( "]]></chg_term>\r\n" );
valueXmlString.append( "<active_yn><![CDATA[" ).append("Y").append( "]]></active_yn>\r\n" );
}
valueXmlString.append( "</Detail1>\r\n" );
}
/* if ( currentColumn.trim().equalsIgnoreCase( "itm_defaultedit" ))
/* if ( currentColumn.trim().equalsIgnoreCase( "itm_defaultedit" ))
{
System.out.println("Edit item default flag --------------"+editFlag);
String descr = checkNull(genericUtility.getColumnValue("descr", currDom));
......@@ -132,7 +132,7 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
{
valueXmlString.append("<descr protect = '1'> <![CDATA[").append(descr).append("]]></descr>\r\n");
}
valueXmlString.append( "</Detail1>\r\n" );
}*/
if ( currentColumn.trim().equalsIgnoreCase( "attrib_code" ))
......@@ -165,12 +165,12 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
if(attribCode != null)
{
query = "select attrib_id from itm_attrib_val where attrib_id = ? and attrib_code='SIZE_TYPE' ";
pstmt= conn.prepareStatement(query);
pstmt.setString(1, attribCode);
rs=pstmt.executeQuery();
if(rs.next())
{
query ="select descr,sh_descr,udf__str1 from itm_attrib_val where attrib_id = ? and attrib_code='SIZE'" ;
pstmt= conn.prepareStatement(query);
pstmt.setString(1, attribCode);
rs=pstmt.executeQuery();
if(rs.next())
{
query ="select descr,sh_descr,udf__str1 from itm_attrib_val where attrib_id = ? and attrib_code='SIZE'" ;
pstmt1 = conn.prepareStatement(query);
pstmt1.setString(1, attribId);
rs1 = pstmt1.executeQuery();
......@@ -189,11 +189,11 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
}
valueXmlString.append( "</Detail1>\r\n" );
pstmt1.close();
rs1.close();
}
pstmt.close();
rs.close();
rs1.close();
}
pstmt.close();
rs.close();
}
}
}
......@@ -269,8 +269,8 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
Node parentNode = null;
Node childNode = null;
String attribCode ="";
String attribId = "";
String query = "";
String attribId = "",shortDescr="",descr="";
String query = "",shdescrSQL="";
int ctr=0,currentFormNo =0,childNodeListLength =0;
String userId="";
String childNodeName = null,childNodeValue = null;
......@@ -286,6 +286,10 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
conn = connDriver.getConnectDB("DriverITM");
userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
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)
{
currentFormNo = Integer.parseInt(objContext);
......@@ -303,7 +307,7 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
childNodeName = childNode.getNodeName();
System.out.println("Node Name:="+childNodeName);
if(childNodeName.equalsIgnoreCase("attrib_code") )
{
System.out.println("inside first child node Val:"+childNodeValue);
......@@ -345,47 +349,75 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
{
attribCode = checkNull(genericUtility.getColumnValue("attrib_code", dom));
attribId = checkNull(genericUtility.getColumnValue("attrib_id", dom));
query = "select attrib_id from itm_attrib_val where attrib_id = ? and attrib_code='SIZE_TYPE' ";
pstmt= conn.prepareStatement(query);
pstmt.setString(1, attribCode);
rs=pstmt.executeQuery();
if(rs.next())
{
query ="select * from itm_attrib_val where attrib_id = ? and attrib_code='SIZE'" ;
pstmt1= conn.prepareStatement(query);
pstmt1.setString(1, attribId);
rs1 = pstmt1.executeQuery();
if(!rs1.next())
{
errString = getErrorString("attrib_id","VTATRIDNIM",userId);
pstmt1.close();
rs1.close();
break ;
}
}
pstmt.close();
rs.close();
}
pstmt= conn.prepareStatement(query);
pstmt.setString(1, attribCode);
rs=pstmt.executeQuery();
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'" ;
pstmt1= conn.prepareStatement(query);
pstmt1.setString(1, attribId);
rs1 = pstmt1.executeQuery();
if(!rs1.next())
{
errString = getErrorString("attrib_id","VTATRIDNIM",userId);
pstmt1.close();
rs1.close();
break ;
}
}
pstmt.close();
rs.close();
}
}
else if(childNodeName.equalsIgnoreCase("descr"))
{
if (childNode.getFirstChild() == null)
{
System.out.println(" descr null"+descr);
errString = getErrorString("descr","VTDESCNVL",userId);
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;
}
attribCode = checkNull(genericUtility.getColumnValue("attrib_code", dom));
attribId = checkNull(genericUtility.getColumnValue("attrib_id", dom));
String descr = checkNull(genericUtility.getColumnValue("descr", dom));
if(editFlag.equalsIgnoreCase("A"))
{
query =" SELECT count(1) FROM itm_attrib_val WHERE attrib_code=? and attrib_id=? " ;
......@@ -406,7 +438,7 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
return errString;
}
}
if(attribCode.equalsIgnoreCase("COLOR"))
{
if((descr.trim()).length()>20)
......@@ -414,11 +446,30 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
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"))
{
query =" SELECT DISTINCT DESCR FROM itm_attrib_val WHERE attrib_code=? and attrib_id=? " ;
//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 ,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.setString(1, attribCode);
pstmt.setString(2, attribId);
......@@ -426,17 +477,26 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
String descrSQL="";
if(rs.next())
{
descrSQL = rs.getString(1);
descrSQL = rs.getString("DESCR");
shdescrSQL=rs.getString("SH_DESCR");
}
pstmt.close();
rs.close();
if(!descrSQL.equalsIgnoreCase(descr) )
{
errString = getErrorString("descr","VTINTGMAGN",userId);
return errString;
{ System.out.println("in descr"+descr);
errString = getErrorString("descr","VTINTGMAGN",userId);
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)
{
System.out.println("Exception ::"+e);
......@@ -447,7 +507,7 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
{
try
{
if( rs != null )
{
rs.close();
......@@ -473,7 +533,7 @@ public class ItmAttribValIC extends ValidatorEJB implements ItmAttribValICRemote
conn.close();
conn = null;
}
}
catch(Exception d)
{
......
webitm-wms/ibase/webitm/ejb/wms/ItmAttribValPos.java
View file @ f75be5f3
......@@ -37,76 +37,85 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
{
String errString = "";
String siteCode = "";
NodeList parentNodeList = null;
NodeList childNodeList = null;
Node parentNode = null;
int childNodeListLength = 0;
Document dom = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
String empCode = "",loginCode= "";
ResultSet rs = null;
String empCode = "",loginCode= "";
CommonWmsUtil wmsUtil = new CommonWmsUtil();
try
try
{
if(editFlag.equalsIgnoreCase("A"))
{
CommonConstants.setIBASEHOME();
setDDSalesConfig();
if(editFlag.equalsIgnoreCase("A"))
{
CommonConstants.setIBASEHOME();
setDDSalesConfig();
GenericUtility genericUtility = GenericUtility.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
System.out.println("STRING{"+domString+"}");
dom = genericUtility.parseString(domString);
siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
System.out.println("********* login site code ["+siteCode+"]");
loginCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
System.out.println("********* login code ["+loginCode+"]");
parentNodeList = dom.getElementsByTagName("Detail1");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
childNodeListLength= childNodeList.getLength();
GenericUtility genericUtility = GenericUtility.getInstance();
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getDBDateFormat());
System.out.println("STRING{"+domString+"}");
dom = genericUtility.parseString(domString);
siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
System.out.println("********* login site code ["+siteCode+"]");
loginCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
System.out.println("********* login code ["+loginCode+"]");
parentNodeList = dom.getElementsByTagName("Detail1");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
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++ )
{
Node childNode = childNodeList.item(i);
String nodeName = childNode.getNodeName();
for ( int i = 0; i < childNodeListLength; i++ )
{
Node childNode = childNodeList.item(i);
String nodeName = childNode.getNodeName();
if (nodeName.equalsIgnoreCase("attrib_code"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
attribCode = checkNull(childNode.getFirstChild().getNodeValue());
}
}
if (nodeName.equalsIgnoreCase("attrib_id"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
attribId = checkNull(childNode.getFirstChild().getNodeValue());
}
}
if (nodeName.equalsIgnoreCase("descr"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
descr = checkNull(childNode.getFirstChild().getNodeValue());
}
}
if (nodeName.equalsIgnoreCase("attrib_code"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
attribCode = checkNull(childNode.getFirstChild().getNodeValue());
}
}
if (nodeName.equalsIgnoreCase("attrib_id"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
attribId = checkNull(childNode.getFirstChild().getNodeValue());
}
}
if (nodeName.equalsIgnoreCase("descr"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
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();
//Changed by wasim on 14-08-2015 to set apiKey for magento [START]
String apiKey = wmsUtil.getDDSalesConfig("API_KEY");
objAttrib.setApiKey(apiKey);
//Changed by wasim on 14-08-2015 to set apiKey for magento [START]
Attribute objAttrib = new Attribute();
//Changed by wasim on 14-08-2015 to set apiKey for magento [START]
String apiKey = wmsUtil.getDDSalesConfig("API_KEY");
objAttrib.setApiKey(apiKey);
//Changed by wasim on 14-08-2015 to set apiKey for magento [START]
//Changed by samadhan start for integrate SIZE attribute only Start
/*
//Changed by samadhan start for integrate SIZE attribute only Start
/*
if(attribCode.equalsIgnoreCase("S001") || attribCode.equalsIgnoreCase("S002") || attribCode.equalsIgnoreCase("S003"))
{
objAttrib.setAttrName("SIZE");
......@@ -115,10 +124,11 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
{
objAttrib.setAttrName(attribCode);
}
*/
objAttrib.setAttrName(attribCode);
//Changed by samadhan start for integrate SIZE attribute only End
/*if(attribCode.equalsIgnoreCase("SIZE"))
*/
objAttrib.setAttrName(attribCode);
System.out.println("attribCode" +attribCode);
//Changed by samadhan start for integrate SIZE attribute only End
/*if(attribCode.equalsIgnoreCase("SIZE"))
{
objAttrib.setAttrValue(attribId);
}
......@@ -126,43 +136,57 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
{
objAttrib.setAttrValue(descr);
}*/
objAttrib.setAttrValue(descr);
int apiAttribCode = 0;
String sql="";
int attribCnt = 0;
sql = "select count(*) from itm_attrib_val where attrib_id = ? and attrib_code='SIZE_TYPE' ";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1, attribCode);
rs=pstmt.executeQuery();
if(rs.next())
{
attribCnt = rs.getInt(1);
}
pstmt.close();
rs.close();
if(attribCnt>0)
{
sql = "select udf__str1 from itm_attrib_val where attrib_id = ? and attrib_code = ? ";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1, attribId);
pstmt.setString(2, "SIZE");
rs=pstmt.executeQuery();
if(rs.next())
{
apiAttribCode = rs.getInt(1);
}
}
else
{
apiAttribCode = wmsUtil.CallAttribute(objAttrib, apiAttribUrl);
}
updateAttribUdfStr(apiAttribCode,attribCode,attribId,conn);
//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);
System.out.println("descr in obj" +descr);
}
//Change by Jagruti on 25/12/2015 for SIZE[End]
int apiAttribCode = 0;
String sql="";
int attribCnt = 0;
}
sql = "select count(*) from itm_attrib_val where attrib_id = ? and attrib_code='SIZE_TYPE' ";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1, attribCode);
rs=pstmt.executeQuery();
if(rs.next())
{
attribCnt = rs.getInt(1);
}
pstmt.close();
rs.close();
if(attribCnt>0)
{
sql = "select udf__str1 from itm_attrib_val where attrib_id = ? and attrib_code = ? ";
pstmt= conn.prepareStatement(sql);
pstmt.setString(1, attribId);
pstmt.setString(2, "SIZE");
rs=pstmt.executeQuery();
if(rs.next())
{
apiAttribCode = rs.getInt(1);
}
}
else
{
apiAttribCode = wmsUtil.CallAttribute(objAttrib, apiAttribUrl);
}
updateAttribUdfStr(apiAttribCode,attribCode,attribId,conn);
}
}
catch(Exception e)
{
......@@ -191,7 +215,6 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
pstmt.close();
pstmt = null;
}
}
catch(Exception e)
{
......@@ -201,7 +224,7 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
}
return errString;
}
private void updateAttribUdfStr(int apiAttribCode, String attribCode,String attribId,Connection conn)
{
String sql = "";
......@@ -219,9 +242,8 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
}
catch(Exception e)
{
}
}
public String checkNull(String input)
{
......@@ -231,7 +253,7 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
}
return input.trim();
}
private void setDDSalesConfig()
{
CommonConstants objCommon =new CommonConstants();
......@@ -266,7 +288,7 @@ public class ItmAttribValPos extends ValidatorEJB implements ItmAttribValPosLoca
if(dom != null)
{
this.apiAttribUrl = genericUtility.getColumnValue("ATTRIB_OPTION_API_URL",dom);
}
}
}
catch(Exception e)
{
......
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