Commit 8ef3cebb authored by wansari's avatar wansari

Changed by wasim to update loc_code sql for setting parameter login site code in sql


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100405 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7627d76e
...@@ -532,8 +532,11 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -532,8 +532,11 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
currDate = sdf.format(new java.util.Date()); currDate = sdf.format(new java.util.Date());
System.out.println("Xtra Params="+xtraParams);//Changed by Wasim on 14-03-2016 to print Extra Params
userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
String chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" ); String chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
String loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );//Changed by wasim on 14-03-2016 to get site code
switch ( currentFormNo ) switch ( currentFormNo )
{ {
...@@ -613,7 +616,9 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -613,7 +616,9 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
// valueXmlString.append("<language_dtl>").append("<![CDATA[]]>").append("</language_dtl>\r\n"); // valueXmlString.append("<language_dtl>").append("<![CDATA[]]>").append("</language_dtl>\r\n");
valueXmlString.append("<tax>").append("<![CDATA[]]>").append("</tax>\r\n"); valueXmlString.append("<tax>").append("<![CDATA[]]>").append("</tax>\r\n");
valueXmlString.append("<tax_desc>").append("<![CDATA[]]>").append("</tax_desc>\r\n"); valueXmlString.append("<tax_desc>").append("<![CDATA[]]>").append("</tax_desc>\r\n");
valueXmlString.append("<site_code>").append("<![CDATA[]]>").append("</site_code>\r\n"); //Changed by wasin on 14-07-2016 to set login site code [START]
valueXmlString.append("<site_code>").append("<![CDATA["+checkNullAndTrim(loginSiteCode)+"]]>").append("</site_code>\r\n");
//Changed by wasin on 14-07-2016 to set login site code [END]
valueXmlString.append("<site_descr>").append("<![CDATA[]]>").append("</site_descr>\r\n"); valueXmlString.append("<site_descr>").append("<![CDATA[]]>").append("</site_descr>\r\n");
valueXmlString.append("<supp_code>").append("<![CDATA[]]>").append("</supp_code>\r\n"); valueXmlString.append("<supp_code>").append("<![CDATA[]]>").append("</supp_code>\r\n");
valueXmlString.append("<supp_descr>").append("<![CDATA[]]>").append("</supp_descr>\r\n"); valueXmlString.append("<supp_descr>").append("<![CDATA[]]>").append("</supp_descr>\r\n");
...@@ -787,6 +792,9 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -787,6 +792,9 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
valueXmlString.append("<item_phy_attrib_24>").append("<![CDATA["+ checkNullAndTrim(brandCode) +"]]>").append("</item_phy_attrib_24>\r\n"); valueXmlString.append("<item_phy_attrib_24>").append("<![CDATA["+ checkNullAndTrim(brandCode) +"]]>").append("</item_phy_attrib_24>\r\n");
valueXmlString.append("<brand_descr>").append("<![CDATA["+ checkNullAndTrim(brandDescr) +"]]>").append("</brand_descr>\r\n"); valueXmlString.append("<brand_descr>").append("<![CDATA["+ checkNullAndTrim(brandDescr) +"]]>").append("</brand_descr>\r\n");
//Added by Samadhan on 22/12/2015 [To set Limited Edition,brand] End //Added by Samadhan on 22/12/2015 [To set Limited Edition,brand] End
//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");
//Changed by wasim on 14-07-2016 to set login site code [END]
} }
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n");
...@@ -860,6 +868,9 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -860,6 +868,9 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
valueXmlString.append("<price_list_dtl>").append("<![CDATA["+ checkNullAndTrim(price_list_dtl) +"]]>").append("</price_list_dtl>\r\n"); valueXmlString.append("<price_list_dtl>").append("<![CDATA["+ checkNullAndTrim(price_list_dtl) +"]]>").append("</price_list_dtl>\r\n");
valueXmlString.append("<supp_item_desc>").append("<![CDATA["+ checkNullAndTrim(supp_item_desc) +"]]>").append("</supp_item_desc>\r\n"); valueXmlString.append("<supp_item_desc>").append("<![CDATA["+ checkNullAndTrim(supp_item_desc) +"]]>").append("</supp_item_desc>\r\n");
//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");
//Changed by wasim on 14-07-2016 to set login site code [END]
} }
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n");
...@@ -1007,6 +1018,8 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -1007,6 +1018,8 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
try try
{ {
System.out.println("Inside getList---->loginCode["+loginCode+"]FIeld["+field+"]Values["+values+"]");//Changed by wasim on 14-07-2016 to print parameter values
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
...@@ -1086,15 +1099,13 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -1086,15 +1099,13 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
//Added by Chetan Mahajan on date:06/02/2015 [Added loc_code] Start //Added by Chetan Mahajan on date:06/02/2015 [Added loc_code] Start
else if (field.equals("loc_code")) else if (field.equals("loc_code"))
{ {
// Changed by Sneha on 12-03-2016, SQL given by Pragyan Sir [Start] //Changed by wasim on 11-03-2016 to get only empty location
//sql = "SELECT LOC_CODE, DESCR, loc_type FROM location ORDER BY LOC_CODE"; //sql = "SELECT LOC_CODE, DESCR,loc_type FROM location ORDER BY LOC_CODE";
// Sneha
sql = " SELECT A.LOC_CODE, A.DESCR, A.LOC_TYPE FROM LOCATION A ,INVSTAT B ,SITE S WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' " sql = " SELECT A.LOC_CODE, A.DESCR, A.LOC_TYPE FROM LOCATION A ,INVSTAT B ,SITE S WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' "
+ " AND A.LOC_TYPE = 'N' AND S.SITE_CODE = 'DDUK' AND (S.FACILITY_CODE = A.FACILITY_CODE or nvl(s.facility_code ,'N') = 'N') " + " AND A.LOC_TYPE = 'N' AND S.SITE_CODE = ? AND (S.FACILITY_CODE = A.FACILITY_CODE or nvl(s.facility_code ,'N') = 'N') "
+ " AND A.INV_STAT IN ('ACTPK', 'CASPK') AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' and " + " AND A.INV_STAT IN ('ACTPK', 'CASPK') AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' and "
+ " nvl((SELECT sum(quantity) FROM STOCK WHERE SITE_CODE = 'DDUK' AND stock.loc_code = a.loc_code),0) = 0 AND ROWNUM < 50 " + " nvl((SELECT sum(quantity) FROM STOCK WHERE SITE_CODE = ? AND stock.loc_code = a.loc_code),0) = 0 AND ROWNUM < 50 "
+ " ORDER BY A.LOC_CODE "; + " ORDER BY A.LOC_CODE ";
// Changed by Sneha on 12-03-2016, SQL given by Pragyan Sir [End]
} }
//Added by Chetan Mahajan on date:06/02/2015 [Added loc_code] End //Added by Chetan Mahajan on date:06/02/2015 [Added loc_code] End
//Changed by Samadhan on 22/12/2015 for Brand Start //Changed by Samadhan on 22/12/2015 for Brand Start
...@@ -1109,6 +1120,13 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote, ...@@ -1109,6 +1120,13 @@ public class DDProductWizEJB extends ValidatorEJB implements DDProductWizRemote,
//Changed by Samadhan on 22/12/2015 for Brand End //Changed by Samadhan on 22/12/2015 for Brand 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]
if ("loc_code".equalsIgnoreCase(field.trim()))
{
pstmt.setString(1,loginCode);
pstmt.setString(2,loginCode);
}
//Changed by wasim on 14-07-2016 to set site code in loc_code query [END]
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
int num = 1; int num = 1;
......
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