Commit 2a800c5e authored by wansari's avatar wansari

D16JSUN0002 updated source for price list and discount filed in Item Details screen


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104891 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1917f8ad
......@@ -157,7 +157,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
else
{
sql = " SELECT COUNT(*) FROM CUSTOMER WHERE CUST_CODE = ? ";
msgNo = "VTCUSTCD1";
msgNo = "VMREGCUST";
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
......@@ -605,11 +605,11 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
}
System.out.println("Total Record Add for Form 2="+countRecord);
if(countRecord == 0)
/*if(countRecord == 0)
{
errString = itmDBAccessLocal.getErrorString("","VMNODETAIL","","",conn);
return errString;
}
}*/
}//End case2
break;
......@@ -803,11 +803,11 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
}
System.out.println("Total Record Add for Form 3="+countRecord+"" );
if(countRecord == 0)
/*if(countRecord == 0)
{
errString = itmDBAccessLocal.getErrorString("","VMNODETAIL","","",conn);
return errString;
}
}*/
/*custType = checkNullAndTrim(genericUtility.getColumnValue("cust_type", dom1));
System.out.println("Customer Type in Detail3 Validation ["+custType+"]");
......@@ -879,7 +879,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
else
{
sql = " SELECT COUNT(*) FROM CUSTOMER WHERE CUST_CODE = ? ";
msgNo = "VTCUSTCD1";
msgNo = "VMREGCUST";
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
......@@ -2173,15 +2173,19 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<item_code protect = '1'>").append("<![CDATA["+rs.getString("ITEM_CODE")+"]]>").append("</item_code>");
valueXmlString.append("<rate_opt protect = '1'>").append("<![CDATA["+checkNullAndTrim(rs.getString("RATE_OPT"))+"]]>").append("</rate_opt>");
valueXmlString.append("<rate_opt__descr>").append("<![CDATA["+rateOptDescr+"]]>").append("</rate_opt__descr>");
valueXmlString.append("<discount protect = '1'>").append("<![CDATA["+discount+"]]>").append("</discount>");
valueXmlString.append("<price_list protect = '1'>").append("<![CDATA["+priceList+"]]>").append("</price_list>");
}
else
{
valueXmlString.append("<item_code>").append("<![CDATA["+rs.getString("ITEM_CODE")+"]]>").append("</item_code>");
valueXmlString.append("<rate_opt>").append("<![CDATA["+checkNullAndTrim(rs.getString("RATE_OPT"))+"]]>").append("</rate_opt>");
valueXmlString.append("<rate_opt__descr>").append("<![CDATA["+rateOptDescr+"]]>").append("</rate_opt__descr>");
valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>");
valueXmlString.append("<price_list>").append("<![CDATA["+priceList+"]]>").append("</price_list>");
}
valueXmlString.append("<price_list>").append("<![CDATA["+priceList+"]]>").append("</price_list>");
valueXmlString.append("<item_descr>").append("<![CDATA["+rs.getString("DESCR")+"]]>").append("</item_descr>");
valueXmlString.append("<eff_from>").append("<![CDATA["+ genericUtility.getValidDateString(rs.getString("EFF_FROM"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) +"]]>").append("</eff_from>");
valueXmlString.append("<valid_upto>").append("<![CDATA["+ genericUtility.getValidDateString(rs.getString("VALID_UPTO"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) +"]]>").append("</valid_upto>");
......@@ -2204,7 +2208,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<chg_date>").append("<![CDATA["+ldDate+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user>").append("<![CDATA["+userId+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term>").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("<cust_code>").append("<![CDATA["+custCode+"]]>").append("</cust_code>");
valueXmlString.append("</Detail3>");
......
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