Changes made in SalesOrderIC.java .

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174615 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-dis/ibase/webitm/ejb/dis/SalesOrderIC.java

@@ -4967,7 +4967,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					if (lsEmpCode != null && lsEmpCode.trim().length() > 0)
 					{
 						lsCctrCodeSal = checkNull(genericUtility.getColumnValue("cctr_code__sal", dom));
-						if (lsCctrCodeSal != null && lsCctrCodeSal.trim().length() > 0)
+						//Modified by Anjali R. [To get cctr_code__sal if it is null in dom]on[24/11/2017][Start]
+						//if (lsCctrCodeSal != null && lsCctrCodeSal.trim().length() > 0)
+						if (lsCctrCodeSal == null || lsCctrCodeSal.trim().length() == 0)
+						//Modified by Anjali R. [To get cctr_code__sal if it is null in dom]on[24/11/2017][End]
 						{
 							sql = "select (case when cctr_code__sal is null then '' else cctr_code__sal end) as cctr_code__sal from employee where emp_code = ?";
 							pstmt = conn.prepareStatement(sql);
@@ -5205,7 +5208,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					if (lsEmpCode != null && lsEmpCode.trim().length() > 0)
 					{
 						lsCctrCodeSal = checkNull(genericUtility.getColumnValue("cctr_code__sal", dom));
-						if (lsCctrCodeSal != null && lsCctrCodeSal.trim().length() > 0)
+						//Modified by Anjali R. [To get cctr_code__sal if it is null in dom]on[24/11/2017][Start]
+						//if (lsCctrCodeSal != null && lsCctrCodeSal.trim().length() > 0)
+						if (lsCctrCodeSal == null || lsCctrCodeSal.trim().length() == 0)
+						//Modified by Anjali R. [To get cctr_code__sal if it is null in dom]on[24/11/2017][End]
 						{
 							sql = "select (case when cctr_code__sal is null then '' else cctr_code__sal end) as cctr_code__sal from employee where emp_code = ?";
 							pstmt = conn.prepareStatement(sql);
@@ -5458,8 +5464,10 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 					if (lsEmpCode != null && lsEmpCode.trim().length() > 0)
 					{
 						lsCctrCodeSal = checkNull(genericUtility.getColumnValue("cctr_code__sal", dom));
-
-						if (lsCctrCodeSal != null && lsCctrCodeSal.trim().length() > 0)
+						//Modified by Anjali R. [To get cctr_code__sal if it is null in dom]on[24/11/2017][Start]
+						//if (lsCctrCodeSal != null && lsCctrCodeSal.trim().length() > 0)
+						if (lsCctrCodeSal == null || lsCctrCodeSal.trim().length() == 0)
+						//Modified by Anjali R. [To get cctr_code__sal if it is null in dom]on[24/11/2017][End]
 						{
 							sql = "select (case when cctr_code__sal is null then '' else cctr_code__sal end) as ls_cctr_code__sal" + " from employee where emp_code = ?";
 							pstmt = conn.prepareStatement(sql);