Commit 800552a7 authored by smestry's avatar smestry

Updated the java for product Wizard changes


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104131 ce508802-f39f-4f6c-b175-0d175dae99d5
parent ad9070ec
...@@ -316,7 +316,7 @@ public class ItemDetailsBean ...@@ -316,7 +316,7 @@ public class ItemDetailsBean
ddProductWizRemote = (ibase.webitm.ejb.wms.DDProductWizRemote) ctx.lookup("ibase/DDProductWizEJB/remote"); ddProductWizRemote = (ibase.webitm.ejb.wms.DDProductWizRemote) ctx.lookup("ibase/DDProductWizEJB/remote");
returnVal = ddProductWizRemote.getDefaultBarcodeFlagVal(); returnVal = ddProductWizRemote.getDefaultBarcodeFlagVal();
System.out.println("getCustItemRefFlag =====>>["+returnVal+"]"); System.out.println("getDefaultBarcodeFlag =====>>["+returnVal+"]");
} }
catch (Exception e) catch (Exception e)
{ {
...@@ -335,7 +335,7 @@ public class ItemDetailsBean ...@@ -335,7 +335,7 @@ public class ItemDetailsBean
// Changed by Sneha on 25-10-2016, for customer item reference flag [Start] // Changed by Sneha on 25-10-2016, for customer item reference flag [Start]
public String defaultBarcodeVal(String userId) throws ITMException /*public String defaultBarcodeVal(String userId) throws ITMException
{ {
String returnVal = ""; String returnVal = "";
...@@ -361,7 +361,7 @@ public class ItemDetailsBean ...@@ -361,7 +361,7 @@ public class ItemDetailsBean
} }
} }
return returnVal; return returnVal;
} }*/
// Changed by Sneha on 25-10-2016, for customer item reference flag [End] // Changed by Sneha on 25-10-2016, for customer item reference flag [End]
......
...@@ -979,8 +979,8 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -979,8 +979,8 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
custItemRefVal = getCustItemRefFlagVal(); //Changed by Sneha on 24-10-2016, to add new field customer item references custItemRefVal = getCustItemRefFlagVal(); //Changed by Sneha on 24-10-2016, to add new field customer item references
//System.out.println("custItemRefVal =========>>"+custItemRefVal); //System.out.println("custItemRefVal =========>>"+custItemRefVal);
barcodeFlagVal = getDefaultBarcodeFlagVal(); /*barcodeFlagVal = getDefaultBarcodeFlagVal();
System.out.println("barcodeFlagVal =========>>"+barcodeFlagVal); System.out.println("barcodeFlagVal =========>>"+barcodeFlagVal);*/
String item_parnt = genericUtility.getColumnValue("item_parnt", dom1); String item_parnt = genericUtility.getColumnValue("item_parnt", dom1);
String item_parnt_desc = genericUtility.getColumnValue("item_parnt_desc", dom1); String item_parnt_desc = genericUtility.getColumnValue("item_parnt_desc", dom1);
...@@ -1287,19 +1287,21 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -1287,19 +1287,21 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
} }
//Changed by Sneha on 24-10-2016, to add new field customer item references [End] //Changed by Sneha on 24-10-2016, to add new field customer item references [End]
if(barcodeFlagVal.equalsIgnoreCase("Y")) valueXmlString.append("<item_barcode>").append("<![CDATA[]]>").append("</item_barcode>\r\n");
/*if(barcodeFlagVal.equalsIgnoreCase("Y"))
{ {
String barcodeAutoStr = generateTranId( "w_barcode",loginSiteCode,conn); //String barcodeAutoStr = generateTranId( "w_barcode",loginSiteCode,conn);
System.out.println("barcodeAutoStr===========>>"+barcodeAutoStr); //System.out.println("barcodeAutoStr===========>>"+barcodeAutoStr);
valueXmlString.append("<item_barcode>").append("<![CDATA["+ checkNullAndTrim(barcodeAutoStr) +"]]>").append("</item_barcode>\r\n");
} }
else if(barcodeFlagVal.equalsIgnoreCase("N")) else if(barcodeFlagVal.equalsIgnoreCase("N"))
{ {
valueXmlString.append("<item_barcode>").append("<![CDATA[]]>").append("</item_barcode>\r\n"); valueXmlString.append("<item_barcode>").append("<![CDATA[]]>").append("</item_barcode>\r\n");
} }
*/
} }
......
...@@ -160,6 +160,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -160,6 +160,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
boolean localConnection = false; boolean localConnection = false;
boolean isError = false; boolean isError = false;
String custItemRefParent = "", custItemRefChild = ""; String custItemRefParent = "", custItemRefChild = "";
DDProductWizEJB ddProductWizEJB = new DDProductWizEJB();
System.out.println("@@@@@@@ inside insertItemdetails @@@@@@@"); System.out.println("@@@@@@@ inside insertItemdetails @@@@@@@");
NodeList detail2dom = null; NodeList detail2dom = null;
...@@ -446,10 +447,12 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -446,10 +447,12 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
custItemRefParent = ""; custItemRefParent = "";
} }
} }
System.out.println("custItemRefParent=======>>"+custItemRefParent); //System.out.println("custItemRefParent=======>>"+custItemRefParent);
//Changed by Sneha on 26-09-2019, to add trade mark for item parent [End] //Changed by Sneha on 26-09-2019, to add trade mark for item parent [End]
} }
/*System.out.println("item_parnt : "+ item_parnt +" grp_code : "+ grp_code +" item_parnt_desc : "+ item_parnt_desc + " item_type : " /*System.out.println("item_parnt : "+ item_parnt +" grp_code : "+ grp_code +" item_parnt_desc : "+ item_parnt_desc + " item_type : "
+ item_type +" descr : "+ descr +" dimension_desc : "+ dimension_desc);*/ + item_type +" descr : "+ descr +" dimension_desc : "+ dimension_desc);*/
} }
...@@ -819,10 +822,15 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -819,10 +822,15 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
} }
else if (nodeName.equalsIgnoreCase("item_barcode")) else if (nodeName.equalsIgnoreCase("item_barcode"))
{ {
if ( childNode != null && childNode.getFirstChild() != null ) // Changed by Sneha on 06-12-2016, for Item barcode [Start]
/*if ( childNode != null && childNode.getFirstChild() != null )
{ {
item_barcode = checkNull(childNode.getFirstChild().getNodeValue()); item_barcode = checkNull(childNode.getFirstChild().getNodeValue());
} }*/
// Changed by Sneha on 06-12-2016, for Item barcode [Start]
} }
else if (nodeName.equalsIgnoreCase("supp_item_desc")) else if (nodeName.equalsIgnoreCase("supp_item_desc"))
{ {
...@@ -920,14 +928,14 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -920,14 +928,14 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
if ( childNode != null && childNode.getFirstChild() != null ) if ( childNode != null && childNode.getFirstChild() != null )
{ {
custItemRefChild = checkNull(childNode.getFirstChild().getNodeValue()); custItemRefChild = checkNull(childNode.getFirstChild().getNodeValue());
System.out.println("custItemRefChild inside if =========>> ["+custItemRefChild+"]"); //System.out.println("custItemRefChild inside if =========>> ["+custItemRefChild+"]");
} }
else else
{ {
custItemRefChild = ""; custItemRefChild = "";
} }
} }
System.out.println("custItemRefChild =========>> ["+custItemRefChild+"]"); //System.out.println("custItemRefChild =========>> ["+custItemRefChild+"]");
//Changed by Sneha on 24-10-2016 to add customer item ref [End] //Changed by Sneha on 24-10-2016 to add customer item ref [End]
//Added by Parikshit Kumbhar on date:20/04/2015 [Added pack_size_dtl] end //Added by Parikshit Kumbhar on date:20/04/2015 [Added pack_size_dtl] end
...@@ -937,6 +945,43 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -937,6 +945,43 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
/*pstmtIns.clearParameters();*/ /*pstmtIns.clearParameters();*/
} }
// Changed by Sneha on 16-12-2016, for barcode auto generation [Start]
String barcodeFlagVal = ddProductWizEJB.getDefaultBarcodeFlagVal();
if(barcodeFlagVal.equalsIgnoreCase("Y"))
{
int paramName = 0;
item_barcode = ddProductWizEJB.generateTranId( "w_barcode", loginSiteCode, conn);
String countSerSql = "SELECT COUNT(1) AS COUNT FROM ITEM WHERE TRIM(udf__str2) = ? ";
PreparedStatement pstmtParamName = conn.prepareStatement(countSerSql);
pstmtParamName.setString(1, item_barcode);
ResultSet rsCnt = pstmtParamName.executeQuery();
if (rsCnt.next())
{
paramName = rsCnt.getInt("COUNT");
}
if( pstmtParamName != null )
{
pstmtParamName.close();
pstmtParamName = null;
}
if ( rsCnt != null )
{
rsCnt.close();
rsCnt = null;
}
if (paramName != 0)
{
isError = true;
String errMsg = "Invalid barcode generated. Generated Barcode already exists in item master.";
throw new Exception(errMsg);
}
}
// Changed by Sneha on 16-12-2016, for barcode auto generation [End]
// Changed by Sneha on 30-09-2016, for generating tranid as parent_code, color_code, size_code [Start] // Changed by Sneha on 30-09-2016, for generating tranid as parent_code, color_code, size_code [Start]
//tranId = getTransID( "w_dd_productWiz", conn); //tranId = getTransID( "w_dd_productWiz", conn);
sizeMap = getSizeMap(phy_attrib_1,size_codes,conn); sizeMap = getSizeMap(phy_attrib_1,size_codes,conn);
...@@ -2371,4 +2416,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -2371,4 +2416,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
return sizeMap; return sizeMap;
} }
//Changed by Samadhan on 21/12/2015 for size Grid End. //Changed by Samadhan on 21/12/2015 for size Grid End.
} }
...@@ -33,6 +33,4 @@ public interface DDProductWizRemote extends ValidatorRemote ...@@ -33,6 +33,4 @@ public interface DDProductWizRemote extends ValidatorRemote
public String getDefaultBarcodeFlagVal() throws ITMException, RemoteException; public String getDefaultBarcodeFlagVal() throws ITMException, RemoteException;
public String generateTranId( String windowName, String siteCode, Connection conn )throws ITMException; public String generateTranId( String windowName, String siteCode, Connection conn )throws ITMException;
} }
...@@ -195,10 +195,10 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -195,10 +195,10 @@ public class ProdWizItemChangeServlet extends HttpServlet
{ {
retStr = itemDetailsBean.getDefaultBarcodeFlag(); retStr = itemDetailsBean.getDefaultBarcodeFlag();
} }
else if ( action.equalsIgnoreCase( "GET_DEFAULT_BARCODE_VAL" )) /*else if ( action.equalsIgnoreCase( "GET_DEFAULT_BARCODE_VAL" ))
{ {
retStr = itemDetailsBean.defaultBarcodeVal(userId); retStr = itemDetailsBean.defaultBarcodeVal(userId);
} }*/
// Changed by Sneha on 23-11-2016, to default values flag and autogenerate barcode flag [End] // Changed by Sneha on 23-11-2016, to default values flag and autogenerate barcode flag [End]
// Changed by Sneha on 07-04-2016, for item description [Start] // Changed by Sneha on 07-04-2016, for item description [Start]
......
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