Skip to content

B
business-java
Commit 07d49ab4 authored by wansari's avatar wansari
Browse files
Options

Updated source to remove check null trim from no_sales_month, dlv_prd_tol_bef,... 

Updated source to remove check null trim from no_sales_month, dlv_prd_tol_bef, shelf_life,min shelf life from wf val data.


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104280 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b5f3edd1
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 9 deletions
webitm-dis/ibase/webitm/ejb/dis/ItemIC.java
View file @ 07d49ab4
...@@ -663,7 +663,9 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -663,7 +663,9 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
//shelf_life //shelf_life
else if(childNodeName.equalsIgnoreCase("shelf_life")) else if(childNodeName.equalsIgnoreCase("shelf_life"))
{ {
childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom)); //Changed by wasim on 04-07-2016 to remove check null trim
//childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom));
childNodeValue = genericUtility.getColumnValue(childNodeName, dom);
track_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("track_shelf_life", dom)); track_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("track_shelf_life", dom));
if(track_shelf_life.equalsIgnoreCase("Y")) if(track_shelf_life.equalsIgnoreCase("Y"))
...@@ -687,9 +689,12 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -687,9 +689,12 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
//min_shelf_life //min_shelf_life
else if(childNodeName.equalsIgnoreCase("min_shelf_life")) else if(childNodeName.equalsIgnoreCase("min_shelf_life"))
{ {
childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom)); //Changed by wasim on 04-07-2016 to remove check null trim
//childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom));
track_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("track_shelf_life", dom)); track_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("track_shelf_life", dom));
str_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("shelf_life", dom)); //str_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("shelf_life", dom));
childNodeValue = genericUtility.getColumnValue(childNodeName, dom);
str_shelf_life = genericUtility.getColumnValue("shelf_life", dom);
shelf_life = Integer.parseInt(str_shelf_life == null ? "0" : str_shelf_life); shelf_life = Integer.parseInt(str_shelf_life == null ? "0" : str_shelf_life);
min_shelf_life = Integer.parseInt(childNodeValue == null ? "0" : childNodeValue); min_shelf_life = Integer.parseInt(childNodeValue == null ? "0" : childNodeValue);
...@@ -777,9 +782,13 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -777,9 +782,13 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
//dlv_prd_tol_bef/dlv_prd_tol_aft //dlv_prd_tol_bef/dlv_prd_tol_aft
else if(childNodeName.equalsIgnoreCase("dlv_prd_tol_bef") || childNodeName.equalsIgnoreCase("dlv_prd_tol_aft")) else if(childNodeName.equalsIgnoreCase("dlv_prd_tol_bef") || childNodeName.equalsIgnoreCase("dlv_prd_tol_aft"))
{ {
childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom)); //Changed by wasim on 04-01-2017 to remove check null trim
//childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom));
childNodeValue = genericUtility.getColumnValue(childNodeName, dom);
spec_tol = checkNullAndTrim(genericUtility.getColumnValue("spec_tol", dom)); spec_tol = checkNullAndTrim(genericUtility.getColumnValue("spec_tol", dom));
dlv_prd_tol = Integer.parseInt(childNodeValue); //dlv_prd_tol = Integer.parseInt(childNodeValue);
dlv_prd_tol = Integer.parseInt(childNodeValue == null ? "0" : childNodeValue);
if(spec_tol.equalsIgnoreCase("Y")) if(spec_tol.equalsIgnoreCase("Y"))
{ {
if(dlv_prd_tol == 0) if(dlv_prd_tol == 0)
...@@ -1412,9 +1421,14 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -1412,9 +1421,14 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
} }
else if(childNodeName.equalsIgnoreCase("no_sales_month")) else if(childNodeName.equalsIgnoreCase("no_sales_month"))
{ {
childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom)); //Changed by wasim on 04-01-2017 to remove checknulltrim
track_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("min_shelf_life", dom)); //childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom));
//track_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("min_shelf_life", dom));
childNodeValue = genericUtility.getColumnValue(childNodeName, dom);
track_shelf_life = genericUtility.getColumnValue("min_shelf_life", dom);
min_shelf_life = Integer.parseInt(track_shelf_life == null ? "0" : track_shelf_life); min_shelf_life = Integer.parseInt(track_shelf_life == null ? "0" : track_shelf_life);
if (childNodeValue != null ) if (childNodeValue != null )
{ {
noSalesMonth = Integer.parseInt(childNodeValue == null ? "0" : childNodeValue); noSalesMonth = Integer.parseInt(childNodeValue == null ? "0" : childNodeValue);
...@@ -1427,7 +1441,7 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -1427,7 +1441,7 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
} }
} }
else if(childNodeName.equalsIgnoreCase("no_sales_month")) /*else if(childNodeName.equalsIgnoreCase("no_sales_month"))
{ {
childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom)); childNodeValue = checkNullAndTrim(genericUtility.getColumnValue(childNodeName, dom));
track_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("min_shelf_life", dom)); track_shelf_life = checkNullAndTrim(genericUtility.getColumnValue("min_shelf_life", dom));
...@@ -1443,7 +1457,7 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote { ...@@ -1443,7 +1457,7 @@ public class ItemIC extends ValidatorEJB implements ItemICLocal, ItemICRemote {
} }
} }
} }*/
/* Changed By Nasruddin 19-SEP-16 Start /* Changed By Nasruddin 19-SEP-16 Start
else if(childNodeName.equalsIgnoreCase("phy_attrib_1") || childNodeName.equalsIgnoreCase("phy_attrib_2") || else if(childNodeName.equalsIgnoreCase("phy_attrib_1") || childNodeName.equalsIgnoreCase("phy_attrib_2") ||
childNodeName.equalsIgnoreCase("phy_attrib_3") || childNodeName.equalsIgnoreCase("phy_attrib_4") || childNodeName.equalsIgnoreCase("phy_attrib_3") || childNodeName.equalsIgnoreCase("phy_attrib_4") ||
......
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