Skip to content

B
business-java
Commit 6ef4867c authored by smestry's avatar smestry
Browse files
Options

Updated the Product wizard for minor bugs. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102048 ce508802-f39f-4f6c-b175-0d175dae99d5
parent bb29ca3e
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 10 deletions
webitm-wms/ibase/webitm/ejb/wms/DDProductWizEJB.java
View file @ 6ef4867c
...@@ -2,6 +2,7 @@ package ibase.webitm.ejb.wms; ...@@ -2,6 +2,7 @@ package ibase.webitm.ejb.wms;
import ibase.system.config.ConnDriver; import ibase.system.config.ConnDriver;
import ibase.utility.E12GenericUtility; import ibase.utility.E12GenericUtility;
import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.ValidatorEJB; import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.ITMException; import ibase.webitm.utility.ITMException;
...@@ -89,6 +90,11 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -89,6 +90,11 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
Connection conn = null; Connection conn = null;
PreparedStatement pstmt = null ; PreparedStatement pstmt = null ;
ResultSet rs = null; ResultSet rs = null;
// Changed by Sneha on 23-06-2016 [Start]
boolean flag = false;
String item_barcode = "";
// Changed by Sneha on 23-06-2016 [End]
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>"); StringBuffer errStringXml = new StringBuffer("<?xml version = \"1.0\"?> \r\n <Root> <Errors>");
try try
...@@ -307,6 +313,21 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -307,6 +313,21 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
} }
} }
} }
// Changed by Sneha on 23-06-2016 for validation of dimension [Start]
else if (childNodeName.equalsIgnoreCase("dimension_desc"))
{
String dimensionDesc = checkNullAndTrim(genericUtility.getColumnValue("dimension_desc", dom));
//System.out.println("dimensionDesc==========>>"+dimensionDesc);
if (dimensionDesc.length() == 0)
{
errCode = "INVDIMENSI";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
}
// Changed by Sneha on 23-06-2016 for validation of dimension [End]
} }
break; break;
case 2 : case 2 :
...@@ -323,10 +344,18 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -323,10 +344,18 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
if (childNodeName.equalsIgnoreCase("item_barcode")) if (childNodeName.equalsIgnoreCase("item_barcode"))
{ {
int paramName = 0; int paramName = 0;
String item_parnt = genericUtility.getColumnValue("item_barcode", dom); // Changed by Sneha on 23-06-2016 for validation of item_barcode [Start]
//String item_parnt = genericUtility.getColumnValue("item_barcode", dom);
item_barcode = genericUtility.getColumnValue("item_barcode", dom);
// Changed by Sneha on 23-06-2016 for validation of item_barcode [End]
String countSerSql = "SELECT COUNT(1) AS COUNT FROM ITEM WHERE TRIM(udf__str2) = ?"; String countSerSql = "SELECT COUNT(1) AS COUNT FROM ITEM WHERE TRIM(udf__str2) = ?";
PreparedStatement pstmtParamName = conn.prepareStatement(countSerSql); PreparedStatement pstmtParamName = conn.prepareStatement(countSerSql);
pstmtParamName.setString(1, item_parnt);
// Changed by Sneha on 23-06-2016 for validation of item_barcode [Start]
//pstmtParamName.setString(1, item_parnt);
pstmtParamName.setString(1, item_barcode);
// Changed by Sneha on 23-06-2016 for validation of item_barcode [End]
ResultSet rsCnt = pstmtParamName.executeQuery(); ResultSet rsCnt = pstmtParamName.executeQuery();
System.out.println("countSerSql" + countSerSql); System.out.println("countSerSql" + countSerSql);
...@@ -335,11 +364,14 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -335,11 +364,14 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
paramName = rsCnt.getInt("COUNT"); paramName = rsCnt.getInt("COUNT");
} }
if (paramName != 0) { if (paramName != 0)
{
errCode = "DUPITMBARC"; // Changed by Sneha on 23-06-2016 for validation of item_barcode [Start]
flag = true;
/*errCode = "DUPITMBARC";
errList.add(errCode); errList.add(errCode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());*/
// Changed by Sneha on 23-06-2016 for validation of item_barcode [Start]
} }
} }
} }
...@@ -385,10 +417,22 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -385,10 +417,22 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
errFields = null; errFields = null;
errStringXml.append("</Errors> </Root> \r\n"); errStringXml.append("</Errors> </Root> \r\n");
} }
// Changed by Sneha on 23-06-2016 for validation of item_barcode [Start]
else else
{ {
errStringXml = new StringBuffer("");
//errStringXml = new StringBuffer("");
if(flag)
{
//System.out.println("Inside flag=======>>"+flag);
return getError(item_barcode, "DUPITMBARC", conn);
}
else
{
errStringXml = new StringBuffer("");
}
} }
// Changed by Sneha on 23-06-2016 for validation of item_barcode [End]
}// End of try }// End of try
catch(Exception e) catch(Exception e)
{ {
...@@ -427,6 +471,32 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -427,6 +471,32 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
errString = errStringXml.toString(); errString = errStringXml.toString();
return errString; return errString;
} }
// Changed by Sneha on 23-06-2016 for validation of item_barcode [Start]
public String getError(String item_barcode, String Code, Connection conn) throws ITMException, Exception
{
String mainStr ="";
try
{
String errString = "";
errString = new ITMDBAccessEJB().getErrorString("",Code,"","",conn);
String begPart = errString.substring(0,errString.indexOf("<message>")+9);
String endDesc = errString.substring(errString.indexOf("</description>"));
mainStr= begPart+"Invalid Barcode for."+"</message><description>";
mainStr= mainStr+"Barcode already exists in master for the barcode : ["+item_barcode+"]."+endDesc;
System.out.println("mainStr:::::::::::::::::: "+mainStr);
begPart = null;
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
return mainStr;
}
// Changed by Sneha on 23-06-2016 for validation of item_barcode [End]
@Override @Override
public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException public String itemChanged(String xmlString, String xmlString1, String xmlString2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException, ITMException
{ {
...@@ -559,8 +629,13 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -559,8 +629,13 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
valueXmlString.append("<stk_opt>").append("<![CDATA[]]>").append("</stk_opt>\r\n"); valueXmlString.append("<stk_opt>").append("<![CDATA[]]>").append("</stk_opt>\r\n");
valueXmlString.append("<site_codes>").append("<![CDATA[]]>").append("</site_codes>\r\n"); valueXmlString.append("<site_codes>").append("<![CDATA[]]>").append("</site_codes>\r\n");
valueXmlString.append("<site_desc>").append("<![CDATA[]]>").append("</site_desc>\r\n"); valueXmlString.append("<site_desc>").append("<![CDATA[]]>").append("</site_desc>\r\n");
valueXmlString.append("<dimension_desc>").append("<![CDATA[]]>").append("</dimension_desc>\r\n");
valueXmlString.append("<dim_code_desc>").append("<![CDATA[]]>").append("</dim_code_desc>\r\n"); // Sneha
//valueXmlString.append("<dimension_desc>").append("<![CDATA[]]>").append("</dimension_desc>\r\n");
valueXmlString.append("<dimension_desc>").append("<![CDATA[NA]]>").append("</dimension_desc>\r\n");
valueXmlString.append("<dim_code_desc>").append("<![CDATA[Not Applicable]]>").append("</dim_code_desc>\r\n");
// End
valueXmlString.append("<color_codes>").append("<![CDATA[]]>").append("</color_codes>\r\n"); valueXmlString.append("<color_codes>").append("<![CDATA[]]>").append("</color_codes>\r\n");
valueXmlString.append("<color_code_descr>").append("<![CDATA[]]>").append("</color_code_descr>\r\n"); valueXmlString.append("<color_code_descr>").append("<![CDATA[]]>").append("</color_code_descr>\r\n");
valueXmlString.append("<size_codes>").append("<![CDATA[]]>").append("</size_codes>\r\n"); valueXmlString.append("<size_codes>").append("<![CDATA[]]>").append("</size_codes>\r\n");
...@@ -726,6 +801,7 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -726,6 +801,7 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
valueXmlString.append("<site_codes>").append("<![CDATA["+ checkNullAndTrim(site_codes) +"]]>").append("</site_codes>\r\n"); valueXmlString.append("<site_codes>").append("<![CDATA["+ checkNullAndTrim(site_codes) +"]]>").append("</site_codes>\r\n");
valueXmlString.append("<site_desc>").append("<![CDATA["+ checkNullAndTrim(site_desc) +"]]>").append("</site_desc>\r\n"); valueXmlString.append("<site_desc>").append("<![CDATA["+ checkNullAndTrim(site_desc) +"]]>").append("</site_desc>\r\n");
valueXmlString.append("<dimension_desc>").append("<![CDATA["+ checkNullAndTrim(dimension_desc) +"]]>").append("</dimension_desc>\r\n"); valueXmlString.append("<dimension_desc>").append("<![CDATA["+ checkNullAndTrim(dimension_desc) +"]]>").append("</dimension_desc>\r\n");
valueXmlString.append("<dim_code_desc>").append("<![CDATA["+ checkNullAndTrim(dim_code_desc) +"]]>").append("</dim_code_desc>\r\n"); valueXmlString.append("<dim_code_desc>").append("<![CDATA["+ checkNullAndTrim(dim_code_desc) +"]]>").append("</dim_code_desc>\r\n");
valueXmlString.append("<color_codes>").append("<![CDATA["+ checkNullAndTrim(color_codes) +"]]>").append("</color_codes>\r\n"); valueXmlString.append("<color_codes>").append("<![CDATA["+ checkNullAndTrim(color_codes) +"]]>").append("</color_codes>\r\n");
valueXmlString.append("<color_code_descr>").append("<![CDATA["+ checkNullAndTrim(color_code_descr) +"]]>").append("</color_code_descr>\r\n"); valueXmlString.append("<color_code_descr>").append("<![CDATA["+ checkNullAndTrim(color_code_descr) +"]]>").append("</color_code_descr>\r\n");
...@@ -822,7 +898,21 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -822,7 +898,21 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
no++; no++;
//Changed by Samadhan on 21/12/2015 for Set Size Descr instede of size id. //Changed by Samadhan on 21/12/2015 for Set Size Descr instede of size id.
//itemDesc = descr + " " + sizeDesc[k] + " " + color1[j] + " " + dimensionDesc[i]; //itemDesc = descr + " " + sizeDesc[k] + " " + color1[j] + " " + dimensionDesc[i];
itemDesc = descr + " " + size1[k] + " " + color1[j] + " " + dimensionDesc[i];
//Sneha
//itemDesc = descr + " " + size1[k] + " " + color1[j] + " " + dimensionDesc[i];
System.out.println("dimensionDesc[i] value ======>>"+dimensionDesc[i]);
if(dimensionDesc[i].equalsIgnoreCase("NA"))
{
System.out.println("inside if for dimensionDesc[i]======>>"+dimensionDesc[i]);
itemDesc = descr + " " + size1[k] + " " + color1[j];
}
else
{
System.out.println("inside else for dimensionDesc[i]======>>"+dimensionDesc[i]);
itemDesc = descr + " " + size1[k] + " " + color1[j] + " " + dimensionDesc[i];
}
valueXmlString.append("<Detail2 domID='"+ no +"' selected = 'Y'>\r\n"); valueXmlString.append("<Detail2 domID='"+ no +"' selected = 'Y'>\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