Skip to content

B
business-java
Commit 6f3ecfa6 authored by wansari's avatar wansari
Browse files
Options

W16EKAT001 updated source for Tax chapter 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102846 ce508802-f39f-4f6c-b175-0d175dae99d5
parent a9551345
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 16 deletions
webitm-wms/ibase/webitm/ejb/wms/DDProductWizEJB.java
View file @ 6f3ecfa6
...@@ -702,6 +702,7 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -702,6 +702,7 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
valueXmlString.append("<supp_descr>").append("<![CDATA[]]>").append("</supp_descr>\r\n"); valueXmlString.append("<supp_descr>").append("<![CDATA[]]>").append("</supp_descr>\r\n");
//Added by Parikshit Kumbhar on date:20/04/2015 [Added shipper_size, case_length, case_width,size_height, case_gross_weight, case_net_weight, pack_size_dtl,lang fields] Ends //Added by Parikshit Kumbhar on date:20/04/2015 [Added shipper_size, case_length, case_width,size_height, case_gross_weight, case_net_weight, pack_size_dtl,lang fields] Ends
valueXmlString.append("<date_format>").append("<![CDATA["+ checkNullAndTrim(dateFormat) +"]]>").append("</date_format>\r\n");//Added by parikshit kumbhar on 08/07/2015 [To set date format] valueXmlString.append("<date_format>").append("<![CDATA["+ checkNullAndTrim(dateFormat) +"]]>").append("</date_format>\r\n");//Added by parikshit kumbhar on 08/07/2015 [To set date format]
valueXmlString.append("<tax_chap>").append("<![CDATA[]]>").append("</tax_chap>\r\n");//Added by parikshit kumbhar on 08/07/2015 [To set date format]
valueXmlString.append(getLanguages(conn)); valueXmlString.append(getLanguages(conn));
} }
...@@ -785,6 +786,10 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -785,6 +786,10 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
String brandDescr = genericUtility.getColumnValue("brand_descr", dom1); String brandDescr = genericUtility.getColumnValue("brand_descr", dom1);
//Added by Samadhan on 22/12/2015 [To set Limited Edition,brand] Start //Added by Samadhan on 22/12/2015 [To set Limited Edition,brand] Start
//Changed by wasim on 27-07-2016 to add tax chapter [START]
String taxChap = genericUtility.getColumnValue("tax_chap", dom1);
//Changed by wasim on 27-07-2016 to add tax chapter [START]
valueXmlString.append("<Detail2 domID='0' selected = 'N'>\r\n"); valueXmlString.append("<Detail2 domID='0' selected = 'N'>\r\n");
if(currentColumn.equalsIgnoreCase("itm_default")) if(currentColumn.equalsIgnoreCase("itm_default"))
...@@ -874,6 +879,10 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -874,6 +879,10 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
//Changed by wasim on 14-07-2016 to set login site code [START] //Changed by wasim on 14-07-2016 to set login site code [START]
valueXmlString.append("<site_code>").append("<![CDATA["+checkNullAndTrim(loginSiteCode)+"]]>").append("</site_code>\r\n"); valueXmlString.append("<site_code>").append("<![CDATA["+checkNullAndTrim(loginSiteCode)+"]]>").append("</site_code>\r\n");
//Changed by wasim on 14-07-2016 to set login site code [END] //Changed by wasim on 14-07-2016 to set login site code [END]
//Changed by wasim on 27-07-2016 to add tax chapter [START]
valueXmlString.append("<tax_chap>").append("<![CDATA["+ checkNullAndTrim(taxChap) +"]]>").append("</tax_chap>\r\n");
//Changed by wasim on 27-07-2016 to add tax chapter [END]
} }
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n");
...@@ -964,6 +973,10 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -964,6 +973,10 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
//Changed by wasim on 14-07-2016 to set login site code [START] //Changed by wasim on 14-07-2016 to set login site code [START]
valueXmlString.append("<site_code>").append("<![CDATA["+ checkNullAndTrim(loginSiteCode) +"]]>").append("</site_code>\r\n"); valueXmlString.append("<site_code>").append("<![CDATA["+ checkNullAndTrim(loginSiteCode) +"]]>").append("</site_code>\r\n");
//Changed by wasim on 14-07-2016 to set login site code [END] //Changed by wasim on 14-07-2016 to set login site code [END]
//Changed by wasim on 27-07-2016 to add tax chapter [START]
valueXmlString.append("<tax_chap>").append("<![CDATA["+ checkNullAndTrim(taxChap) +"]]>").append("</tax_chap>\r\n");
//Changed by wasim on 27-07-2016 to add tax chapter [END]
} }
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n");
...@@ -1241,7 +1254,12 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -1241,7 +1254,12 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
} }
// Changed by Sneha on 01-04-2016, for Size Availability [End] // Changed by Sneha on 01-04-2016, for Size Availability [End]
//Changed by wasim on 02-08-2016 for tax chapter pop help [START]
else if(field.equals("tax_chap"))
{
sql = "SELECT TAX_CHAP,DESCR FROM TAXCHAP";
}
//Changed by wasim on 02-08-2016 for tax chapter pop help [END]
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
//Changed by wasim on 14-07-2016 to set site code in loc_code query [START] //Changed by wasim on 14-07-2016 to set site code in loc_code query [START]
if ("loc_code".equalsIgnoreCase(field.trim())) if ("loc_code".equalsIgnoreCase(field.trim()))
......
webitm-wms/ibase/webitm/ejb/wms/DDProductWizEditEJB.java
View file @ 6f3ecfa6
...@@ -541,11 +541,14 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi ...@@ -541,11 +541,14 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi
String brand_descr = checkNullAndTrim(genericUtility.getColumnValue("brand_descr", preFormDom));//Brand descr String brand_descr = checkNullAndTrim(genericUtility.getColumnValue("brand_descr", preFormDom));//Brand descr
String stop_purchase = checkNullAndTrim(genericUtility.getColumnValue("stop_purchase", preFormDom));//Stop purchase String stop_purchase = checkNullAndTrim(genericUtility.getColumnValue("stop_purchase", preFormDom));//Stop purchase
//Changed by Samadhan for brand,limited edition purchase stop end //Changed by Samadhan for brand,limited edition purchase stop end
// Changed by Sneha on 07-07-2016, to edit the item parent description [Start] // Changed by Sneha on 07-07-2016, to edit the item parent description [Start]
String attr_value = checkNullAndTrim(genericUtility.getColumnValue("attr_value", preFormDom));//Stop purchase String attr_value = checkNullAndTrim(genericUtility.getColumnValue("attr_value", preFormDom));//Stop purchase
// Changed by Sneha on 07-07-2016, to edit the item parent description [End] // Changed by Sneha on 07-07-2016, to edit the item parent description [End]
//Changed by wasim on 02-08-2016 to add tax_chap field [START]
String taxChap = checkNullAndTrim(genericUtility.getColumnValue("tax_chap", preFormDom));
//Changed by wasim on 02-08-2016 to add tax_chap field [END]
valueXmlString.append("<item_code>").append("<![CDATA["+ checkNullAndTrim(item_code) +"]]>").append("</item_code>\r\n"); valueXmlString.append("<item_code>").append("<![CDATA["+ checkNullAndTrim(item_code) +"]]>").append("</item_code>\r\n");
valueXmlString.append("<descr>").append("<![CDATA["+ checkNullAndTrim(descr) +"]]>").append("</descr>\r\n"); valueXmlString.append("<descr>").append("<![CDATA["+ checkNullAndTrim(descr) +"]]>").append("</descr>\r\n");
...@@ -590,6 +593,9 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi ...@@ -590,6 +593,9 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi
valueXmlString.append("<attr_value>").append("<![CDATA["+ attr_value +"]]>").append("</attr_value>\r\n"); valueXmlString.append("<attr_value>").append("<![CDATA["+ attr_value +"]]>").append("</attr_value>\r\n");
// Changed by Sneha on 07-07-2016, to edit the item parent description [End] // Changed by Sneha on 07-07-2016, to edit the item parent description [End]
//Changed by wasim on 02-08-2016 to add tax_chap field [START]
valueXmlString.append("<tax_chap>").append("<![CDATA["+ taxChap +"]]>").append("</tax_chap>\r\n");
//Changed by wasim on 02-08-2016 to add tax_chap field [END]
} }
else else
{ {
...@@ -610,8 +616,10 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi ...@@ -610,8 +616,10 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi
" PHY_ATTRIB_21, PHY_ATTRIB_1, PHY_ATTRIB_2, PHY_ATTRIB_3, PUR_LEAD_TIME, LOC_TYPE, " + " PHY_ATTRIB_21, PHY_ATTRIB_1, PHY_ATTRIB_2, PHY_ATTRIB_3, PUR_LEAD_TIME, LOC_TYPE, " +
" UDF__STR1, (SELECT TRIM(DESCR) FROM ITM_ATTRIB_VAL WHERE ATTRIB_CODE='Tax' AND ATTRIB_ID = ITEM.UDF__STR1) TAX " + " UDF__STR1, (SELECT TRIM(DESCR) FROM ITM_ATTRIB_VAL WHERE ATTRIB_CODE='Tax' AND ATTRIB_ID = ITEM.UDF__STR1) TAX " +
" ,PHY_ATTRIB_24,USAGE_TYPE " +//Added by samadhan on 23/12/2015 for brand and limited edition " ,PHY_ATTRIB_24,USAGE_TYPE " +//Added by samadhan on 23/12/2015 for brand and limited edition
" ,TAX_CHAP "+ // Added by wasim on 02-08-2016 to get tax_chap
" FROM ITEM WHERE ITEM_CODE = '"+ itemCode +"'"; " FROM ITEM WHERE ITEM_CODE = '"+ itemCode +"'";
pstmt = conn.prepareStatement(itemParentSelect); pstmt = conn.prepareStatement(itemParentSelect);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
...@@ -651,7 +659,10 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi ...@@ -651,7 +659,10 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi
valueXmlString.append("<brand_descr>").append("<![CDATA["+ checkNullAndTrim(prodPos.getItemAttribVal("DESCR","BRAND",checkNullAndTrim(rs.getString(24)), conn)) +"]]>").append("</brand_descr>\r\n"); valueXmlString.append("<brand_descr>").append("<![CDATA["+ checkNullAndTrim(prodPos.getItemAttribVal("DESCR","BRAND",checkNullAndTrim(rs.getString(24)), conn)) +"]]>").append("</brand_descr>\r\n");
valueXmlString.append("<stop_purchase>").append("<![CDATA["+ "" +"]]>").append("</stop_purchase>\r\n"); valueXmlString.append("<stop_purchase>").append("<![CDATA["+ "" +"]]>").append("</stop_purchase>\r\n");
//Changed by Samadhan for brand,limited edition purchase stop end //Changed by Samadhan for brand,limited edition purchase stop end
//Changed by wasim on 02-08-2016 to add tax_chap field [START]
valueXmlString.append("<tax_chap>").append("<![CDATA["+checkNullAndTrim(rs.getString("TAX_CHAP"))+"]]>").append("</tax_chap>\r\n");
//Changed by wasim on 02-08-2016 to add tax_chap field [END]
} }
rs.close(); rs = null; rs.close(); rs = null;
pstmt.close(); pstmt = null; pstmt.close(); pstmt = null;
...@@ -764,6 +775,8 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi ...@@ -764,6 +775,8 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi
connDriver = null;*/ connDriver = null;*/
conn = getConnection(); conn = getConnection();
//Changed and Commented By Santosh on 14-06-2016 :[END] //Changed and Commented By Santosh on 14-06-2016 :[END]
String taxChap = "";
try try
{ {
...@@ -944,6 +957,7 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi ...@@ -944,6 +957,7 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi
+ " UDF__STR2, PHY_ATTRIB_23, LOC_TYPE, " + " UDF__STR2, PHY_ATTRIB_23, LOC_TYPE, "
+ " UDF__STR1, (SELECT TRIM(DESCR) FROM ITM_ATTRIB_VAL WHERE ATTRIB_CODE='Tax' AND TRIM(ATTRIB_ID) = ITEM.UDF__STR1) TAX, HSN_NO " + " UDF__STR1, (SELECT TRIM(DESCR) FROM ITM_ATTRIB_VAL WHERE ATTRIB_CODE='Tax' AND TRIM(ATTRIB_ID) = ITEM.UDF__STR1) TAX, HSN_NO "
+ " ,USAGE_TYPE, CATALOG_NO "//Changed by samadhan for limited edition and stop purchase + " ,USAGE_TYPE, CATALOG_NO "//Changed by samadhan for limited edition and stop purchase
+ " ,TAX_CHAP "//Changed by wasim on 02-08-2016 for tax chapter
+ " FROM ITEM " + " FROM ITEM "
+ " WHERE ITEM_PARNT = '"+ itemCode +"'"; + " WHERE ITEM_PARNT = '"+ itemCode +"'";
pstmt = conn.prepareStatement( skuDetails ); pstmt = conn.prepareStatement( skuDetails );
...@@ -980,6 +994,10 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi ...@@ -980,6 +994,10 @@ public class DDProductWizEditEJB extends ValidatorEJB implements DDProductWizEdi
valueXmlString.append("<attr_value>").append("<![CDATA["+ attr_value +"]]>").append("</attr_value>\r\n"); valueXmlString.append("<attr_value>").append("<![CDATA["+ attr_value +"]]>").append("</attr_value>\r\n");
// Changed by Sneha on 07-07-2016, to edit the item parent description [End] // Changed by Sneha on 07-07-2016, to edit the item parent description [End]
//Changed by wasim on 02-08-2016 for tax chapter [START]
valueXmlString.append("<tax_chap>").append("<![CDATA["+ checkNullAndTrim(rs.getString("TAX_CHAP")) +"]]>").append("</tax_chap>\r\n");
//Changed by wasim on 02-08-2016 for tax chapter [END]
String categoryDescr = rs.getString(10); String categoryDescr = rs.getString(10);
String[] categoryDescrs = categoryDescr.split(","); String[] categoryDescrs = categoryDescr.split(",");
String categoryCode = ""; String categoryCode = "";
......
webitm-wms/ibase/webitm/ejb/wms/DDProductWizEditPosEJB.java
View file @ 6f3ecfa6
...@@ -75,6 +75,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz ...@@ -75,6 +75,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
String brandCode ="",brandDescr="",ltdEdition="",stopPurchase=""; String brandCode ="",brandDescr="",ltdEdition="",stopPurchase="";
DistCommon distComm = new DistCommon(); DistCommon distComm = new DistCommon();
//Changed by Samadhan for brand,limited edition purchase stop end //Changed by Samadhan for brand,limited edition purchase stop end
private String taxChapChild = "", taxChapParent = ""; //Changed by wasim on 02-08-2016 for tax chapter
/** /**
* Default constructor. * Default constructor.
*/ */
...@@ -427,6 +428,20 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz ...@@ -427,6 +428,20 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
//System.out.println("attrValue=======>>"+attrValue); //System.out.println("attrValue=======>>"+attrValue);
} }
// Changed by Sneha on 07-07-2016, to set parent item description in attr_value [End] // Changed by Sneha on 07-07-2016, to set parent item description in attr_value [End]
//Changed by wasim on 27-07-2016 to add tax chapter for child items [START]
else if (nodeName.equalsIgnoreCase("tax_chap"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
taxChapParent = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
else
{
taxChapParent = "";
}
}
//Changed by wasim on 27-07-2016 to add tax chapter for child items [END]
} }
} }
...@@ -435,7 +450,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz ...@@ -435,7 +450,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
String sql = "UPDATE ITEM SET DESCR = ?, ITEM_SER = ?, GRP_CODE = ?, ITEM_TYPE = ?, LOC_TYPE = ?, LOC_CODE = ?, " String sql = "UPDATE ITEM SET DESCR = ?, ITEM_SER = ?, GRP_CODE = ?, ITEM_TYPE = ?, LOC_TYPE = ?, LOC_CODE = ?, "
+ " SH_DESCR = ?, PHY_ATTRIB_17 = ?, PHY_ATTRIB_18 = ?, PHY_ATTRIB_19 = ?, PHY_ATTRIB_20 = ?, PHY_ATTRIB_21 = ?, " + " SH_DESCR = ?, PHY_ATTRIB_17 = ?, PHY_ATTRIB_18 = ?, PHY_ATTRIB_19 = ?, PHY_ATTRIB_20 = ?, PHY_ATTRIB_21 = ?, "
+ " LOC_TYPE__PARENT = ?, PUR_LEAD_TIME = ?, UDF__STR1 = ?, CHG_DATE = SYSDATE, CHG_TERM = ?, CHG_USER = ? " + " LOC_TYPE__PARENT = ?, PUR_LEAD_TIME = ?, UDF__STR1 = ?, CHG_DATE = SYSDATE, CHG_TERM = ?, CHG_USER = ? "
+ " ,PHY_ATTRIB_24 = ? " //Changed by samadhan on 23/12/2015 for brand + " ,PHY_ATTRIB_24 = ?" //Changed by samadhan on 23/12/2015 for brand
+ " ,TAX_CHAP = ? " //Changed by wasim on 02-08-2016 for tax chapter
+ " WHERE ITEM_CODE = ?"; + " WHERE ITEM_CODE = ?";
System.out.println("sh_descr = ["+ checkNullAndTrim(sh_descr) +"] img_path = ["+checkNullAndTrim(img_path)+"] long_descr = ["+checkNullAndTrim(long_descr)+"]"); 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)+"]"); System.out.println("meta_desc = ["+ checkNullAndTrim(meta_desc) +"] meta_keywords = ["+checkNullAndTrim(meta_keywords)+"] meta_title = ["+checkNullAndTrim(meta_title)+"]");
...@@ -474,7 +490,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz ...@@ -474,7 +490,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
//Changed by Samadhan on 23/12/2015 for brand start //Changed by Samadhan on 23/12/2015 for brand start
pstmtIns.setString(18, brandCode);//phy_attrib_24 pstmtIns.setString(18, brandCode);//phy_attrib_24
//Changed by Samadhan on 23/12/2015 for brand end //Changed by Samadhan on 23/12/2015 for brand end
pstmtIns.setString(19, item_code); pstmtIns.setString(19, taxChapParent); //Changed by wasim on 02-08-2016 for tax chapter for item parent
pstmtIns.setString(20, item_code);
pstmtIns.executeUpdate(); pstmtIns.executeUpdate();
pstmtIns.close(); pstmtIns = null; pstmtIns.close(); pstmtIns = null;
...@@ -844,6 +861,20 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz ...@@ -844,6 +861,20 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
} }
} }
//Changed by Samadhan for brand,limited edition purchase stop end //Changed by Samadhan for brand,limited edition purchase stop end
//Changed by wasim on 27-07-2016 to add tax chapter for child items [START]
else if (nodeName.equalsIgnoreCase("tax_chap"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
taxChapChild = checkNullAndTrim(childNode.getFirstChild().getNodeValue());
}
else
{
taxChapChild = "";
}
}
//Changed by wasim on 27-07-2016 to add tax chapter for child items [END]
} }
// Changed by Sneha on 04-04-2016 for adding new item [Start] // Changed by Sneha on 04-04-2016 for adding new item [Start]
...@@ -860,6 +891,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz ...@@ -860,6 +891,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
+ " PHY_ATTRIB_3 = ?, PHY_ATTRIB_23 = ?, UDF__STR2 = ?, LOC_TYPE__PARENT = ?, " + " PHY_ATTRIB_3 = ?, PHY_ATTRIB_23 = ?, UDF__STR2 = ?, LOC_TYPE__PARENT = ?, "
+ " PUR_LEAD_TIME = ?, UDF__STR1 = ?, CHG_DATE = SYSDATE, CHG_TERM = ?, CHG_USER = ?, HSN_NO = ?" + " PUR_LEAD_TIME = ?, UDF__STR1 = ?, CHG_DATE = SYSDATE, CHG_TERM = ?, CHG_USER = ?, HSN_NO = ?"
+ " ,PHY_ATTRIB_24 = ?, USAGE_TYPE = ?, CATALOG_NO = ? " //Changed by samadhan on 23/12/2015 for brand, limited edition,stop purchase + " ,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
+ " WHERE ITEM_CODE = ?"; + " WHERE ITEM_CODE = ?";
pstmtIns = conn.prepareStatement( sql ); pstmtIns = conn.prepareStatement( sql );
...@@ -891,7 +923,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz ...@@ -891,7 +923,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
pstmtIns.setString(23, ltdEdition);//usage_type pstmtIns.setString(23, ltdEdition);//usage_type
pstmtIns.setString(24, stopPurchase);//cotalog_no pstmtIns.setString(24, stopPurchase);//cotalog_no
//Changed by Samadhan for brand,limited edition purchase stop end //Changed by Samadhan for brand,limited edition purchase stop end
pstmtIns.setString(25, item_code); pstmtIns.setString(25, taxChapChild); //Changed by wasim on 02-08-2016 for tax chapter for child items
pstmtIns.setString(26, item_code);
pstmtIns.executeUpdate(); pstmtIns.executeUpdate();
pstmtIns.close(); pstmtIns = null; pstmtIns.close(); pstmtIns = null;
...@@ -1239,8 +1272,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz ...@@ -1239,8 +1272,8 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
" PHY_ATTRIB_1, PHY_ATTRIB_2, PHY_ATTRIB_3, INTEGRAL_QTY, ISS_CRITERIA, UNIT__PUR, " + " PHY_ATTRIB_1, PHY_ATTRIB_2, PHY_ATTRIB_3, INTEGRAL_QTY, ISS_CRITERIA, UNIT__PUR, " +
" PHY_ATTRIB_23, UDF__STR2, ACTIVE, PHY_ATTRIB_22, SUPP_SOUR, QC_REQD, PACK_CODE, " + " 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," + " 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)" + " 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
" VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; " VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtIns = conn.prepareStatement( sql ); pstmtIns = conn.prepareStatement( sql );
pstmtIns.setString(1, tranId); pstmtIns.setString(1, tranId);
pstmtIns.setString(2, descr); pstmtIns.setString(2, descr);
...@@ -1286,6 +1319,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz ...@@ -1286,6 +1319,7 @@ public class DDProductWizEditPosEJB extends ValidatorEJB implements DDProductWiz
pstmtIns.setString(42, brandCode); pstmtIns.setString(42, brandCode);
pstmtIns.setString(43, sizeMapDtl.get("SH_DESCR")); pstmtIns.setString(43, sizeMapDtl.get("SH_DESCR"));
pstmtIns.setString(44, stopPurchase); pstmtIns.setString(44, stopPurchase);
pstmtIns.setString(45, taxChapChild);//Added by wasim on 02-08-2016 to add tax chapter for child items
pstmtIns.executeUpdate(); pstmtIns.executeUpdate();
pstmtIns.close(); pstmtIns = null; pstmtIns.close(); pstmtIns = null;
......
webitm-wms/ibase/webitm/ejb/wms/DDProductWizPosEJB.java
View file @ 6f3ecfa6
...@@ -75,7 +75,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -75,7 +75,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
item_width, item_height, price_list_dtl, item_gross_wt, item_parnt_desc, item_type_desc, itemser_descr, item_width, item_height, price_list_dtl, item_gross_wt, item_parnt_desc, item_type_desc, itemser_descr,
descr, grp_code_desc, site_codes, color_codes, dimension_desc, supp_item_desc, item_barcode, item_category, descr, grp_code_desc, site_codes, color_codes, dimension_desc, supp_item_desc, item_barcode, item_category,
img_path, item_sh_descr, long_desc, meta_desc, meta_keywords, meta_title, loc_code, img_path, item_sh_descr, long_desc, meta_desc, meta_keywords, meta_title, loc_code,
loginSiteCode , language_dtl, categoryId, tax, item_commodity; // Added By Parikshit on 23/02/2015[Added variable language_dtl ] loginSiteCode , language_dtl, categoryId, tax, item_commodity, taxChapParent = "",taxChapChild = ""; // Added By Parikshit on 23/02/2015[Added variable language_dtl ]
//Added by Chetan Mahajan on date:06/02/2015 [Added new fields] Start //Added by Chetan Mahajan on date:06/02/2015 [Added new fields] Start
private Double pur_lead_time ; private Double pur_lead_time ;
private String suppCode = "" ,loc_type = "",loc_type_child = "", pack_size_dtl = "" ; // Added By Parikshit on 20/02/2015[Added pack_size_dtl] private String suppCode = "" ,loc_type = "",loc_type_child = "", pack_size_dtl = "" ; // Added By Parikshit on 20/02/2015[Added pack_size_dtl]
...@@ -404,9 +404,18 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -404,9 +404,18 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
brandDescr = checkNull(childNode.getFirstChild().getNodeValue()); brandDescr = checkNull(childNode.getFirstChild().getNodeValue());
} }
} }
//Changed by Samadhan on 21/12/2015 for Limited Edition and size grid End //Changed by Samadhan on 21/12/2015 for Limited Edition and size grid End
//Changed by wasim on 27-07-2016 to add tax chapter for item parent [START]
else if (nodeName.equalsIgnoreCase("tax_chap"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
taxChapParent = checkNull(childNode.getFirstChild().getNodeValue());
}
}
//Changed by wasim on 27-07-2016 to add tax chapter 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);*/
...@@ -417,13 +426,21 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -417,13 +426,21 @@ 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, " + " 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, " + " 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)" + " auto_reqc, loc_type__parent, chg_date, chg_term, chg_user,pur_lead_time,udf__str1)" +
" Values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";//Added by Parikshit Kumbhar on 26/05/2015 [Added udf__str1 in query]*/ " Values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";//Added by Parikshit Kumbhar on 26/05/2015 [Added udf__str1 in query]*/
String sql = "insert into item (item_code, descr, item_ser, grp_code, item_type, unit, track_shelf_life, unit__rate, " + //Changed by wasim on 27-07-2016 to add tax chapter [START]
/*String sql = "insert into item (item_code, descr, item_ser, grp_code, item_type, unit, track_shelf_life, unit__rate, " +
" stk_opt, loc_type, loc_code, INTEGRAL_QTY, ISS_CRITERIA, UNIT__PUR, sh_descr, phy_attrib_17, phy_attrib_18, phy_attrib_19, " + " 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, " + " 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)" + " auto_reqc, loc_type__parent, chg_date, chg_term, chg_user,pur_lead_time,udf__str1,usage_type,phy_attrib_24,po_rate_option)" +
" Values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";//Added by Parikshit Kumbhar on 26/05/2015 [Added udf__str1 in query] " Values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";//Added by Parikshit Kumbhar on 26/05/2015 [Added udf__str1 in query]
*/
String sql = "insert into item (item_code, descr, item_ser, grp_code, item_type, unit, track_shelf_life, unit__rate, " +
" 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)" +
" 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 Samadhan on 21/12/2015 for Limited Edition and size grid End
try try
{ {
...@@ -482,6 +499,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -482,6 +499,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
pstmtIns.setString(34, limitedEdition);//Added by Samadhan on 21/12/2015 for Limited Edition . pstmtIns.setString(34, limitedEdition);//Added by Samadhan on 21/12/2015 for Limited Edition .
pstmtIns.setString(35, brandCode);//Added by Samadhan on 21/12/2015 for Brand code . pstmtIns.setString(35, brandCode);//Added by Samadhan on 21/12/2015 for Brand code .
pstmtIns.setString(36, "A");//Added by Samadhan on 23/05/2016 pstmtIns.setString(36, "A");//Added by Samadhan on 23/05/2016
pstmtIns.setString(37, taxChapParent);//Added by wasim on 27/07/2016
/*pstmtIns.addBatch(); /*pstmtIns.addBatch();
pstmtIns.clearParameters();*/ pstmtIns.clearParameters();*/
...@@ -795,6 +813,15 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -795,6 +813,15 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
} }
} }
//Changed by wasim on 27-07-2016 to add tax chapter for child items [START]
else if (nodeName.equalsIgnoreCase("tax_chap"))
{
if ( childNode != null && childNode.getFirstChild() != null )
{
taxChapChild = checkNull(childNode.getFirstChild().getNodeValue());
}
}
//Changed by wasim on 27-07-2016 to add tax chapter for child items [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
/*System.out.println("item_descr : "+ item_descr +" item_length : "+ item_length +" item_width : "+ item_width /*System.out.println("item_descr : "+ item_descr +" item_length : "+ item_length +" item_width : "+ item_width
...@@ -818,13 +845,21 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -818,13 +845,21 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
" order_opt, item_usage, auto_reqc, loc_type__parent, chg_date, chg_term, chg_user,pur_lead_time,udf__str1,hsn_no)" + " order_opt, item_usage, auto_reqc, loc_type__parent, chg_date, chg_term, chg_user,pur_lead_time,udf__str1,hsn_no)" +
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; //Added by Parikshit Kumbhar on 26/05/2015 [Added udf__str1 in query] " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; //Added by Parikshit Kumbhar on 26/05/2015 [Added udf__str1 in query]
*/ */
sql = "insert into item (item_code, descr, item_parnt, item_ser, grp_code, item_type, unit, track_shelf_life, unit__rate, " + //Changed by wasim on 27-07-2016 to add tax chapter for child items [START]
/*sql = "insert into item (item_code, descr, item_parnt, item_ser, grp_code, item_type, unit, track_shelf_life, unit__rate, " +
" stk_opt, loc_type, loc_code, length, width, height, gross_weight, " + " stk_opt, loc_type, loc_code, length, width, height, gross_weight, " +
" phy_attrib_1, phy_attrib_2, phy_attrib_3, INTEGRAL_QTY, ISS_CRITERIA, UNIT__PUR, " + " phy_attrib_1, phy_attrib_2, phy_attrib_3, INTEGRAL_QTY, ISS_CRITERIA, UNIT__PUR, " +
" phy_attrib_23, udf__str2, active, phy_attrib_22, supp_sour, qc_reqd, pack_code, " + " 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)" + " 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)" +
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; " values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";*/
sql = "insert into item (item_code, descr, item_parnt, item_ser, grp_code, item_type, unit, track_shelf_life, unit__rate, " +
" stk_opt, loc_type, loc_code, length, width, height, gross_weight, " +
" phy_attrib_1, phy_attrib_2, phy_attrib_3, INTEGRAL_QTY, ISS_CRITERIA, UNIT__PUR, " +
" 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)" +
" values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//Changed by wasim on 27-07-2016 to add tax chapter for child items [END]
sizeMap = getSizeMap(phy_attrib_1,size_codes,conn); sizeMap = getSizeMap(phy_attrib_1,size_codes,conn);
//Changed by Samadhan on 21/15/2015 for size grid End //Changed by Samadhan on 21/15/2015 for size grid End
...@@ -874,6 +909,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR ...@@ -874,6 +909,7 @@ public class DDProductWizPosEJB extends ValidatorEJB implements DDProductWizPosR
pstmtIns.setString(42, brandCode);//Added By Samadhan on 21/12/2015 for brand pstmtIns.setString(42, brandCode);//Added By Samadhan on 21/12/2015 for brand
pstmtIns.setString(43, sizeMap.get("SH_DESCR"));//Added By Samadhan on 21/12/2015 for Size Short Descr pstmtIns.setString(43, sizeMap.get("SH_DESCR"));//Added By Samadhan on 21/12/2015 for Size Short Descr
pstmtIns.setString(44, "A");//Added By Samadhan on 23/05/2016 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.executeUpdate(); pstmtIns.executeUpdate();
pstmtIns.close(); pstmtIns = null; pstmtIns.close(); pstmtIns = null;
......
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