Commit f2d100ff authored by psawant's avatar psawant

Changes in customer Master

Field set from customer Default Master

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@190442 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 0deba401
...@@ -2405,6 +2405,12 @@ implements CustomerLocal, CustomerRemote ...@@ -2405,6 +2405,12 @@ implements CustomerLocal, CustomerRemote
{ {
colName = rsmd.getColumnName(i).toLowerCase(); colName = rsmd.getColumnName(i).toLowerCase();
colValue = checkNull(rs.getString(colName)); colValue = checkNull(rs.getString(colName));
//Changes by Pooja S. on 06/09/18 [value of column does not set if field is not blank] START
if (colValue != null && colValue.trim().length() > 0)
{
valueXmlString.append("<" + colName + ">").append("<![CDATA[" + colValue + "]]>").append("</" + colName + ">");
}
//Changes by Pooja S. on 06/09/18 [value of column does not set if field is not blank] END
if (colName.equals("site_code__pay")) if (colName.equals("site_code__pay"))
{ {
if (colValue == null || colValue.trim().length() == 0) if (colValue == null || colValue.trim().length() == 0)
...@@ -2412,6 +2418,7 @@ implements CustomerLocal, CustomerRemote ...@@ -2412,6 +2418,7 @@ implements CustomerLocal, CustomerRemote
siteCodePay = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"); siteCodePay = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
valueXmlString.append("<" + colName + ">").append("<![CDATA[" + siteCodePay + "]]>").append("</" + colName + ">"); valueXmlString.append("<" + colName + ">").append("<![CDATA[" + siteCodePay + "]]>").append("</" + colName + ">");
} }
} }
/*else if (colName.equals("part_Qty")) /*else if (colName.equals("part_Qty"))
{ {
...@@ -2428,6 +2435,7 @@ implements CustomerLocal, CustomerRemote ...@@ -2428,6 +2435,7 @@ implements CustomerLocal, CustomerRemote
siteCodeRcp = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode"); siteCodeRcp = getValueFromXTRA_PARAMS(xtraParams, "loginSiteCode");
valueXmlString.append("<" + colName + ">").append("<![CDATA[" + siteCodeRcp + "]]>").append("</" + colName + ">"); valueXmlString.append("<" + colName + ">").append("<![CDATA[" + siteCodeRcp + "]]>").append("</" + colName + ">");
} }
} }
else if (colName.equals("curr_code")) else if (colName.equals("curr_code"))
{ {
...@@ -2451,9 +2459,11 @@ implements CustomerLocal, CustomerRemote ...@@ -2451,9 +2459,11 @@ implements CustomerLocal, CustomerRemote
pstm.close(); pstm.close();
pstm = null; pstm = null;
} }
} }
else if (colName.equals("price_list")) else if (colName.equals("price_list"))
{ {
System.out.print("Value colvalue5 \n [" + colValue + "]"); System.out.print("Value colvalue5 \n [" + colValue + "]");
if (colValue == null || (colValue != null && (colValue.equals("") || colValue.trim().length() == 0))) if (colValue == null || (colValue != null && (colValue.equals("") || colValue.trim().length() == 0)))
{ {
...@@ -2477,10 +2487,12 @@ implements CustomerLocal, CustomerRemote ...@@ -2477,10 +2487,12 @@ implements CustomerLocal, CustomerRemote
pstm = null; pstm = null;
} }
} }
else //Changes by Pooja S. on 06/09/18 [value of column does not set if field is not blank] START
/*else
{ {
valueXmlString.append("<" + colName + ">").append("<![CDATA[" + colValue + "]]>").append("</" + colName + ">"); valueXmlString.append("<" + colName + ">").append("<![CDATA[" + colValue + "]]>").append("</" + colName + ">");
} }*/
//Changes by Pooja S. on 06/09/18 [value of column does not set if field is not blank] END
} }
} }
rs.close(); rs.close();
...@@ -2491,7 +2503,7 @@ implements CustomerLocal, CustomerRemote ...@@ -2491,7 +2503,7 @@ implements CustomerLocal, CustomerRemote
else if (currentColumn.trim().equalsIgnoreCase("full_name")) else if (currentColumn.trim().equalsIgnoreCase("full_name"))
{ {
String fullName1 = checkNull(genericUtility.getColumnValue("full_name", dom)); String fullName1 = checkNull(genericUtility.getColumnValue("full_name", dom));
if (fullName1 != null) if (fullName1 != null && fullName1.length()>=0)
{ {
valueXmlString.append("<chq_name ><![CDATA[" + fullName1 + "]]></chq_name>"); valueXmlString.append("<chq_name ><![CDATA[" + fullName1 + "]]></chq_name>");
valueXmlString.append("<eng_name ><![CDATA[" + fullName1 + "]]></eng_name>"); valueXmlString.append("<eng_name ><![CDATA[" + fullName1 + "]]></eng_name>");
......
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