Skip to content

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

Updated java file for Product wizard new look and feel. Added new field... 

Updated java file for Product wizard new look and feel. Added new field customer item reference, active, product wizard edit according to size and color selection, functionality to attach images for item.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103875 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 77a89c5e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 788 additions and 302 deletions
webitm-wms/ibase/webitm/bean/wms/ItemDetailsBean.java
View file @ b588811b
......@@ -244,6 +244,38 @@ public class ItemDetailsBean
return valueXmlString.toString();
}
//Added by Parikshit Kumbhar on 18/05/2015 [added getSizeDetails() function] End
// Changed by Sneha on 25-10-2016, for customer item reference flag [Start]
public String getCustItemRefFlag() throws ITMException
{
System.out.println("inside getCustItemRefFlag =======]");
String itemTypeList = "";
DDProductWizRemote ddProductWizRemote = null;
try
{
InitialContext ctx = new InitialContext( new AppConnectParm().getProperty() );
ddProductWizRemote = (ibase.webitm.ejb.wms.DDProductWizRemote) ctx.lookup("ibase/DDProductWizEJB/remote");
itemTypeList = ddProductWizRemote.getCustItemRefFlagVal();
System.out.println("inside itemTypeList =====>>["+itemTypeList+"]");
}
catch (Exception e)
{
throw new ITMException(e);
}
finally
{
if ( ddProductWizRemote != null )
{
ddProductWizRemote = null;
}
}
return itemTypeList;
}
// Changed by Sneha on 25-10-2016, for customer item reference flag [End]
/**
*
* @param input
......@@ -256,5 +288,5 @@ public class ItemDetailsBean
input="";
}
return input.trim();
}
}
}
webitm-wms/ibase/webitm/ejb/wms/DDProductWizEditPosEJB.java
View file @ b588811b
......@@ -142,9 +142,9 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
DDProductWizPosEJB ddProductWizEJB = new DDProductWizPosEJB();
currDate = new Timestamp(System.currentTimeMillis());
HashMap<String, String> itemAttrHashMap = new HashMap<String, String>();
String skuItemDescrs = "", attrValue = "";
String skuItemDescrs = "", attrValue = "", custItemRefChild = "", custItemRefParent = "", active = "";
// Changed by Sneha on 04-04-2016 [End]
System.out.println("xmlStringAll::"+xmlStringAll);
try
......@@ -461,6 +461,21 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
}
//System.out.println("tradeMarkParent ==========>>[" + tradeMarkParent + "]");
//Changed by Sneha on 26-09-2019, to add trade mark for item parent [End]
//Changed by Sneha on 24-10-2016, to add customer item references [Start]
else if (nodeName.equalsIgnoreCase("phy_attrib_4"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
custItemRefParent = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
else
{
custItemRefParent = "";
}
}
System.out.println("custItemRefParent=======>>"+custItemRefParent);
//Changed by Sneha on 26-09-2019, to add trade mark for item parent [End]
}
}
......@@ -470,6 +485,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
+ " ,PHY_ATTRIB_24 = ? " //Changed by samadhan on 23/12/2015 for brand
+ " ,TAX_CHAP = ? " //Changed by wasim on 02-08-2016 for tax chapter
+ " ,TRADE_MARK = ? " //Changed by sneha on 27-09-2016 for trade mark
+ " ,PHY_ATTRIB_4 = ? " //Changed by sneha on 27-09-2016 for trade mark
+ " WHERE ITEM_CODE = ?";
System.out.println("sh_descr = ["+ checkNullAndTrim(sh_descr) +"] img_path = ["+checkNullAndTrim(img_path)+"] long_descr = ["+checkNullAndTrim(long_descr)+"]");
System.out.println("meta_desc = ["+ checkNullAndTrim(meta_desc) +"] meta_keywords = ["+checkNullAndTrim(meta_keywords)+"] meta_title = ["+checkNullAndTrim(meta_title)+"]");
......@@ -510,7 +526,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
//Changed by Samadhan on 23/12/2015 for brand end
pstmtIns.setString(19, taxChapParent); //Changed by wasim on 02-08-2016 for tax chapter for item parent
pstmtIns.setString(20, tradeMarkParent); //Changed by Sneha on 27-09-2016
pstmtIns.setString(21, item_code);
pstmtIns.setString(21, custItemRefParent); //Changed by Sneha on 28-10-2016
pstmtIns.setString(22, item_code);
pstmtIns.executeUpdate();
pstmtIns.close(); pstmtIns = null;
......@@ -907,6 +924,32 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
}
}
//Changed by Sneha on 26-09-2019, to add trade mark for child item [End]
//Changed by Sneha on 28-10-2016 to add customer item ref [Start]
else if (nodeName.equalsIgnoreCase("phy_attrib_4"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
custItemRefChild = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
else
{
custItemRefChild = "";
}
}
else if (nodeName.equalsIgnoreCase("active"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
active = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
else
{
active = "";
}
}
//Changed by Sneha on 28-10-2016 to add customer item ref [End]
}
// Changed by Sneha on 04-04-2016 for adding new item [Start]
......@@ -926,6 +969,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
+ " ,PHY_ATTRIB_24 = ?, USAGE_TYPE = ?, CATALOG_NO = ? " //Changed by samadhan on 23/12/2015 for brand, limited edition,stop purchase
+ " ,TAX_CHAP = ? " //Changed by wasim on 02/08/2016 for tax chap for child items
+ " ,TRADE_MARK = ? " //Changed By Sneha on 27-09-2016 for adding trade mark for child item
+ " ,PHY_ATTRIB_4 = ?, ACTIVE = ? " //Changed By Sneha on 28-10-2016 for adding cust item ref and active for child item
+ " WHERE ITEM_CODE = ?";
pstmtIns = conn.prepareStatement( sql );
......@@ -959,7 +1003,9 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
//Changed by Samadhan for brand,limited edition purchase stop end
pstmtIns.setString(25, taxChapChild); //Changed by wasim on 02-08-2016 for tax chapter for child items
pstmtIns.setString(26, tradeMarkChild);//Changed By Sneha on 27-09-2016 for adding trade mark for child item
pstmtIns.setString(27, item_code);
pstmtIns.setString(27, custItemRefChild);//Changed By Sneha on 28-10-2016 for adding cust item ref for child item
pstmtIns.setString(28, active);//Changed By Sneha on 28-10-2016 for adding cust item ref for child item
pstmtIns.setString(29, item_code);
pstmtIns.executeUpdate();
pstmtIns.close(); pstmtIns = null;
......@@ -1333,8 +1379,9 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
" ORDER_OPT, ITEM_USAGE, AUTO_REQC, LOC_TYPE__PARENT, CHG_DATE, CHG_TERM, CHG_USER,PUR_LEAD_TIME,UDF__STR1,HSN_NO,PHY_ATTRIB_6," +
" USAGE_TYPE,PHY_ATTRIB_24,PHY_ATTRIB_8,CATALOG_NO,TAX_CHAP," + //Changed by wasim on 02-08-2016 to add tax chapter for new child item
" PO_RATE_OPTION, " + // Added by Manish on 21-09-2016 as per devendra sir
" TRADE_MARK) " + // Changed By Sneha on 27-09-2016 for adding trade mark for child item
" VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
" TRADE_MARK " + // Changed By Sneha on 27-09-2016 for adding trade mark for child item
" ,PHY_ATTRIB_4) " + // Changed By Sneha on 27-09-2016 for adding trade mark for child item
" VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtIns = conn.prepareStatement( sql );
pstmtIns.setString(1, tranId);
pstmtIns.setString(2, descr);
......@@ -1360,7 +1407,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
pstmtIns.setString(22, "NO");
pstmtIns.setString(23, item_category);
pstmtIns.setString(24, item_barcode);
pstmtIns.setString(25, "Y");
//pstmtIns.setString(25, "Y");
pstmtIns.setString(25, active); // Change by Sneha on 28-10-2016, for active
pstmtIns.setString(26, size_codes);
pstmtIns.setString(27, "P");
pstmtIns.setString(28, "N");
......@@ -1383,6 +1431,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
pstmtIns.setString(45, taxChapChild);//Added by wasim on 02-08-2016 to add tax chapter for child items
pstmtIns.setString(46, "A"); //Added by Manish on 21-08-2016
pstmtIns.setString(47, tradeMarkChild);//Changed By Sneha on 27-09-2016 for adding trade mark for child item
pstmtIns.setString(48, custItemRefChild);//Changed By Sneha on 27-09-2016 for adding trade mark for child item
pstmtIns.executeUpdate();
pstmtIns.close(); pstmtIns = null;
......
webitm-wms/ibase/webitm/ejb/wms/DDProductWizLocal.java
View file @ b588811b
......@@ -20,4 +20,6 @@ public interface DDProductWizLocal extends ValidatorLocal
public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String getList(String loginCode, String field, String[] values) throws RemoteException,ITMException;
public String getCustItemRefFlagVal() throws RemoteException, ITMException;
}
webitm-wms/ibase/webitm/ejb/wms/DDProductWizPosEJB.java
View file @ b588811b
......@@ -159,7 +159,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
//Connection conn = null;
boolean localConnection = false;
boolean isError = false;
String custItemRefParent = "", custItemRefChild = "";
System.out.println("@@@@@@@ inside insertItemdetails @@@@@@@");
NodeList detail2dom = null;
......@@ -420,7 +420,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
}
//Changed by wasim on 27-07-2016 to add tax chapter for item parent [END]
//Changed by Sneha on 26-09-2019, to add trade mark for item parent [Start]
//Changed by Sneha on 26-09-2016, to add trade mark for item parent [Start]
else if (nodeName.equalsIgnoreCase("trade_mark"))
{
if ( childNode != null && childNode.getFirstChild() != null )
......@@ -432,6 +432,21 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
tradeMarkParent = "";
}
}
//Changed by Sneha on 26-09-2016, to add trade mark for item parent [End]
//Changed by Sneha on 24-10-2016, to add customer item references [Start]
else if (nodeName.equalsIgnoreCase("phy_attrib_4"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
custItemRefParent = checkNull(childNode.getFirstChild().getNodeValue());
}
else
{
custItemRefParent = "";
}
}
System.out.println("custItemRefParent=======>>"+custItemRefParent);
//Changed by Sneha on 26-09-2019, to add trade mark for item parent [End]
}
......@@ -463,8 +478,9 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
" stk_opt, loc_type, loc_code, INTEGRAL_QTY, ISS_CRITERIA, UNIT__PUR, sh_descr, phy_attrib_17, phy_attrib_18, phy_attrib_19, " +
" phy_attrib_20, phy_attrib_21, active, supp_sour, qc_reqd, pack_code, order_opt, item_usage, " +
" auto_reqc, loc_type__parent, chg_date, chg_term, chg_user,pur_lead_time,udf__str1,usage_type," +
" phy_attrib_24,po_rate_option,tax_chap, trade_mark)" +
" Values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
" phy_attrib_24,po_rate_option,tax_chap, trade_mark, " +
" phy_attrib_4) "+ //Changed by Sneha on 26-09-2019, to add customer item references
" Values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//Changed by wasim on 27-07-2016 to add tax chapter [END]
//Changed by Samadhan on 21/12/2015 for Limited Edition and size grid End
//Changed by Sneha on 26-09-2019, to add trade mark for item parent [End]
......@@ -528,12 +544,44 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
pstmtIns.setString(36, "A");//Added by Samadhan on 23/05/2016
pstmtIns.setString(37, taxChapParent);//Added by wasim on 27/07/2016
pstmtIns.setString(38, tradeMarkParent);//Added by Sneha on 27-09-2016
pstmtIns.setString(39, custItemRefParent);//Added by Sneha on 24-10-2016
/*pstmtIns.addBatch();
pstmtIns.clearParameters();*/
pstmtIns.executeUpdate();
pstmtIns.close(); pstmtIns = null;
// Changed by Sneha on 25-10-2016, to insert values in brand master [Start]
System.out.println("####### Inserting values into brand --------------- ");
sql = "INSERT INTO BRAND (BRAND_CODE, DESCRIPTION, ITEM_SER, CHG_DATE, CHG_TERM, CHG_USER, ACTIVE_YN) "
+ " VALUES(?,?,?,?,?,?,?)";
try
{
pstmtIns = conn.prepareStatement(sql);
pstmtIns.setString(1, item_parnt);
pstmtIns.setString(2, item_parnt_desc);
pstmtIns.setString(3, item_ser);
pstmtIns.setTimestamp(4, currDate);
pstmtIns.setString(5, chg_term);
pstmtIns.setString(6, chg_user);
pstmtIns.setString(7, "Y");
pstmtIns.executeUpdate();
if(pstmtIns != null)
{
pstmtIns.close();
pstmtIns = null;
}
}
catch (SQLException e)
{
isError = true;
System.out.println("SQLException ::" + e.getMessage() + ":");
e.printStackTrace();
throw new ITMException(e);
}
// Changed by Sneha on 25-10-2016, to insert values in brand master [End]
// Added by Parikshit Kumbhar on date:13/05/2015 [to add insert query] start
System.out.println("language_dtl :" + language_dtl);
String sqllangForEN = "insert into OBJ_ATTRIBUTE (obj_name, item_attr_val, column_name, languages, attr_value, udf_str1, udf_str2, chg_date, chg_term, chg_user)"
......@@ -851,7 +899,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
}
//Changed by wasim on 27-07-2016 to add tax chapter for child items [END]
//Changed by Sneha on 26-09-2019, to add trade mark for child item [Start]
//Changed by Sneha on 26-09-2016, to add trade mark for child item [Start]
else if (nodeName.equalsIgnoreCase("trade_mark"))
{
if ( childNode != null && childNode.getFirstChild() != null )
......@@ -864,7 +912,23 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
tradeMarkChild = "";
}
}
//Changed by Sneha on 26-09-2019, to add trade mark for child item [End]
//Changed by Sneha on 26-09-2016, to add trade mark for child item [End]
//Changed by Sneha on 24-10-2016 to add customer item ref [Start]
else if (nodeName.equalsIgnoreCase("phy_attrib_4"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
custItemRefChild = checkNull(childNode.getFirstChild().getNodeValue());
System.out.println("custItemRefChild inside if =========>> ["+custItemRefChild+"]");
}
else
{
custItemRefChild = "";
}
}
System.out.println("custItemRefChild =========>> ["+custItemRefChild+"]");
//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
/*System.out.println("item_descr : "+ item_descr +" item_length : "+ item_length +" item_width : "+ item_width
......@@ -877,7 +941,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
//tranId = getTransID( "w_dd_productWiz", conn);
sizeMap = getSizeMap(phy_attrib_1,size_codes,conn);
String phy_attrib_6 = sizeMap.get("DESCR");
System.out.println("phy_attrib_6======>>"+phy_attrib_6);
//System.out.println("phy_attrib_6======>>"+phy_attrib_6);
tranId = getTransID( "w_dd_productWiz", item_parnt, phy_attrib_6, phy_attrib_2, conn);
// Changed by Sneha on 30-09-2016, for generating tranid as parent_code, color_code, size_code [End]
......@@ -917,8 +981,9 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
" phy_attrib_23, udf__str2, active, phy_attrib_22, supp_sour, qc_reqd, pack_code, " +
" order_opt, item_usage, auto_reqc, loc_type__parent, chg_date, chg_term," +
" chg_user,pur_lead_time,udf__str1,hsn_no,phy_attrib_6,usage_type,phy_attrib_24," +
"phy_attrib_8,po_rate_option,tax_chap, trade_mark)" +
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
" phy_attrib_8,po_rate_option,tax_chap, trade_mark," +
" phy_attrib_4)" + //Changed by Sneha on 24-10-2016 to add customer item ref
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//Changed by wasim on 27-07-2016 to add tax chapter for child items [END]
//Changed by Sneha on 26-09-2019, to add trade mark for child item [End]
......@@ -973,6 +1038,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
pstmtIns.setString(44, "A");//Added By Samadhan on 23/05/2016
pstmtIns.setString(45, taxChapChild);//Added By wasim on 27/07/2016 for adding tax chapter for child item
pstmtIns.setString(46, tradeMarkChild);//Changed By Sneha on 27-09-2016 for adding trade mark for child item
pstmtIns.setString(47, custItemRefChild);//Changed By Sneha on 24-10-2016 for adding cust item ref
pstmtIns.executeUpdate();
pstmtIns.close(); pstmtIns = null;
......
webitm-wms/ibase/webitm/ejb/wms/DDProductWizRemote.java
View file @ b588811b
......@@ -20,4 +20,7 @@ public interface DDProductWizRemote extends ValidatorRemote
public String itemChanged(Document dom, Document dom1,Document dom2, String objContext, String currentColumn, String editFlag, String xtraParams) throws RemoteException,ITMException;
public String getList(String loginCode, String field, String[] values) throws RemoteException,ITMException;
public String getCustItemRefFlagVal() throws RemoteException, ITMException;
}
webitm-wms/ibase/webitm/servlet/wms/ProdWizItemChangeServlet.java
View file @ b588811b
......@@ -171,6 +171,14 @@ public class ProdWizItemChangeServlet extends HttpServlet
{
retStr = genericUtility.getApplDateFormat();
}
// Changed by Sneha on 25-10-2016, for customer item reference flag [Start]
if ( action.equalsIgnoreCase( "CUST_ITEM_REF" ) )
{
retStr = itemDetailsBean.getCustItemRefFlag();
}
// Changed by Sneha on 25-10-2016, for customer item reference flag [End]
// Changed by Sneha on 07-04-2016, for item description [Start]
else if(action.equalsIgnoreCase( "GET_ITEM_DESCR" ))
{
......
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