Skip to content

B
business-java
Commit 0c0f15ed authored by wansari's avatar wansari
Browse files
Options

D16JSUN0002 updated source for view mode and bypassing validation. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104669 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4d26c097
Show whitespace changes
Inline Side-by-side
Showing with 116 additions and 28 deletions
webitm-dis/ibase/webitm/ejb/dis/ScontractGwtIC.java
View file @ 0c0f15ed
...@@ -71,8 +71,13 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -71,8 +71,13 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
dom2 = genericUtility.parseString(xmlString2); dom2 = genericUtility.parseString(xmlString2);
} }
String editSatus = genericUtility.getColumnValue("edit_status", dom1);
System.out.println("WfValData editStatus["+editSatus+"]");
if(!"V".equalsIgnoreCase(editSatus))
{
errString = wfValData(dom,dom1,dom2,objContext,editFlag,xtraParams); errString = wfValData(dom,dom1,dom2,objContext,editFlag,xtraParams);
} }
}
catch(Exception e) catch(Exception e)
{ {
System.out.println("Exception : Cpp : wfValData(String xmlString) : ==>\n"+e.getMessage()); System.out.println("Exception : Cpp : wfValData(String xmlString) : ==>\n"+e.getMessage());
...@@ -1215,6 +1220,28 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1215,6 +1220,28 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
orderType = checkNullAndTrim(rs.getString("ORDER_TYPE__APPL")); orderType = checkNullAndTrim(rs.getString("ORDER_TYPE__APPL"));
custCode = checkNullAndTrim(rs.getString("CUST_CODE")); custCode = checkNullAndTrim(rs.getString("CUST_CODE"));
if("V".equalsIgnoreCase(editFlag))
{
valueXmlString.append("<cust_code protect = '1'>").append("<![CDATA["+rs.getString("CUST_CODE")+"]]>").append("</cust_code>");
valueXmlString.append("<cust_type protect= '1'>").append("<![CDATA["+rs.getString("CUST_TYPE")+"]]>").append("</cust_type>");
valueXmlString.append("<price_rule protect = '1'>").append("<![CDATA["+rs.getString("PRICE_RULE")+"]]>").append("</price_rule>");
valueXmlString.append("<order_type__appl protect = '1'>").append("<![CDATA["+rs.getString("ORDER_TYPE__APPL")+"]]>").append("</order_type__appl>");
valueXmlString.append("<eff_from protect = '1'>").append("<![CDATA[" + genericUtility.getValidDateString(rs.getString("EFF_FROM"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>");
valueXmlString.append("<valid_upto protect = '1'>").append("<![CDATA["+genericUtility.getValidDateString(rs.getString("VALID_UPTO"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) +"]]>").append("</valid_upto>");
valueXmlString.append("<dlv_city protect = '1'>").append("<![CDATA["+rs.getString("DLV_CITY")+"]]>").append("</dlv_city>");
}
else
{
valueXmlString.append("<cust_code>").append("<![CDATA["+rs.getString("CUST_CODE")+"]]>").append("</cust_code>");
valueXmlString.append("<cust_type>").append("<![CDATA["+rs.getString("CUST_TYPE")+"]]>").append("</cust_type>");
valueXmlString.append("<price_rule>").append("<![CDATA["+rs.getString("PRICE_RULE")+"]]>").append("</price_rule>");
valueXmlString.append("<order_type__appl>").append("<![CDATA["+rs.getString("ORDER_TYPE__APPL")+"]]>").append("</order_type__appl>");
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>");
valueXmlString.append("<dlv_city >").append("<![CDATA["+rs.getString("DLV_CITY")+"]]>").append("</dlv_city>");
}
valueXmlString.append("<confirmed>").append("<![CDATA[N]]>").append("</confirmed>"); valueXmlString.append("<confirmed>").append("<![CDATA[N]]>").append("</confirmed>");
valueXmlString.append("<contract_no>").append("<![CDATA["+contractNo+"]]>").append("</contract_no>"); valueXmlString.append("<contract_no>").append("<![CDATA["+contractNo+"]]>").append("</contract_no>");
valueXmlString.append("<emp_code__con >").append("<![CDATA[" + genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode") + "]]>").append("</emp_code__con>"); valueXmlString.append("<emp_code__con >").append("<![CDATA[" + genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginEmpCode") + "]]>").append("</emp_code__con>");
...@@ -1222,14 +1249,14 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1222,14 +1249,14 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<tax_date >").append("<![CDATA[" + ldDate + "]]>").append("</tax_date>"); valueXmlString.append("<tax_date >").append("<![CDATA[" + ldDate + "]]>").append("</tax_date>");
valueXmlString.append("<contract_date >").append("<![CDATA[" + ldDate + "]]>").append("</contract_date>"); valueXmlString.append("<contract_date >").append("<![CDATA[" + ldDate + "]]>").append("</contract_date>");
valueXmlString.append("<pl_date >").append("<![CDATA[" + ldDate + "]]>").append("</pl_date>"); valueXmlString.append("<pl_date >").append("<![CDATA[" + ldDate + "]]>").append("</pl_date>");
valueXmlString.append("<eff_from >").append("<![CDATA[" + genericUtility.getValidDateString(rs.getString("EFF_FROM"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>"); //valueXmlString.append("<eff_from >").append("<![CDATA[" + genericUtility.getValidDateString(rs.getString("EFF_FROM"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>");
valueXmlString.append("<part_qty >").append("<![CDATA[Y]]>").append("</part_qty>"); valueXmlString.append("<part_qty >").append("<![CDATA[Y]]>").append("</part_qty>");
valueXmlString.append("<site_code >").append("<![CDATA["+rs.getString("SITE_CODE")+"]]>").append("</site_code>"); valueXmlString.append("<site_code >").append("<![CDATA["+rs.getString("SITE_CODE")+"]]>").append("</site_code>");
valueXmlString.append("<cust_code>").append("<![CDATA["+rs.getString("CUST_CODE")+"]]>").append("</cust_code>"); //valueXmlString.append("<cust_code>").append("<![CDATA["+rs.getString("CUST_CODE")+"]]>").append("</cust_code>");
valueXmlString.append("<cust_type>").append("<![CDATA["+rs.getString("CUST_TYPE")+"]]>").append("</cust_type>"); //valueXmlString.append("<cust_type>").append("<![CDATA["+rs.getString("CUST_TYPE")+"]]>").append("</cust_type>");
valueXmlString.append("<price_rule>").append("<![CDATA["+rs.getString("PRICE_RULE")+"]]>").append("</price_rule>"); //valueXmlString.append("<price_rule>").append("<![CDATA["+rs.getString("PRICE_RULE")+"]]>").append("</price_rule>");
valueXmlString.append("<order_type__appl>").append("<![CDATA["+rs.getString("ORDER_TYPE__APPL")+"]]>").append("</order_type__appl>"); //valueXmlString.append("<order_type__appl>").append("<![CDATA["+rs.getString("ORDER_TYPE__APPL")+"]]>").append("</order_type__appl>");
valueXmlString.append("<valid_upto>").append("<![CDATA["+genericUtility.getValidDateString(rs.getString("VALID_UPTO"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) +"]]>").append("</valid_upto>"); //valueXmlString.append("<valid_upto>").append("<![CDATA["+genericUtility.getValidDateString(rs.getString("VALID_UPTO"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) +"]]>").append("</valid_upto>");
valueXmlString.append("<tax_opt>").append("<![CDATA["+rs.getString("TAX_OPT")+"]]>").append("</tax_opt>"); valueXmlString.append("<tax_opt>").append("<![CDATA["+rs.getString("TAX_OPT")+"]]>").append("</tax_opt>");
valueXmlString.append("<cust_code__bil >").append("<![CDATA["+rs.getString("CUST_CODE__BIL")+"]]>").append("</cust_code__bil>"); valueXmlString.append("<cust_code__bil >").append("<![CDATA["+rs.getString("CUST_CODE__BIL")+"]]>").append("</cust_code__bil>");
...@@ -1246,7 +1273,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1246,7 +1273,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<dlv_add1 >").append("<![CDATA["+rs.getString("DLV_ADD1")+"]]>").append("</dlv_add1>"); valueXmlString.append("<dlv_add1 >").append("<![CDATA["+rs.getString("DLV_ADD1")+"]]>").append("</dlv_add1>");
valueXmlString.append("<dlv_add2 >").append("<![CDATA["+rs.getString("DLV_ADD2")+"]]>").append("</dlv_add2>"); valueXmlString.append("<dlv_add2 >").append("<![CDATA["+rs.getString("DLV_ADD2")+"]]>").append("</dlv_add2>");
valueXmlString.append("<dlv_add3 >").append("<![CDATA["+rs.getString("DLV_ADD3")+"]]>").append("</dlv_add3>"); valueXmlString.append("<dlv_add3 >").append("<![CDATA["+rs.getString("DLV_ADD3")+"]]>").append("</dlv_add3>");
valueXmlString.append("<dlv_city >").append("<![CDATA["+rs.getString("DLV_CITY")+"]]>").append("</dlv_city>"); //valueXmlString.append("<dlv_city >").append("<![CDATA["+rs.getString("DLV_CITY")+"]]>").append("</dlv_city>");
valueXmlString.append("<dlv_pin >").append("<![CDATA["+rs.getString("DLV_PIN")+"]]>").append("</dlv_pin>"); valueXmlString.append("<dlv_pin >").append("<![CDATA["+rs.getString("DLV_PIN")+"]]>").append("</dlv_pin>");
valueXmlString.append("<count_code__dlv >").append("<![CDATA["+rs.getString("COUNT_CODE__DLV")+"]]>").append("</count_code__dlv>"); valueXmlString.append("<count_code__dlv >").append("<![CDATA["+rs.getString("COUNT_CODE__DLV")+"]]>").append("</count_code__dlv>");
valueXmlString.append("<tran_code >").append("<![CDATA["+rs.getString("TRAN_CODE")+"]]>").append("</tran_code>"); valueXmlString.append("<tran_code >").append("<![CDATA["+rs.getString("TRAN_CODE")+"]]>").append("</tran_code>");
...@@ -1326,6 +1353,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1326,6 +1353,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<cust_name >").append("<![CDATA["+checkNullAndTrim(custName)+"]]>").append("</cust_name>"); valueXmlString.append("<cust_name >").append("<![CDATA["+checkNullAndTrim(custName)+"]]>").append("</cust_name>");
valueXmlString.append("<order_type__appl_descr>").append("<![CDATA["+orderTypeDescr+"]]>").append("</order_type__appl_descr>"); valueXmlString.append("<order_type__appl_descr>").append("<![CDATA["+orderTypeDescr+"]]>").append("</order_type__appl_descr>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
} }
if(rs!=null) if(rs!=null)
{ {
...@@ -1360,10 +1388,10 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1360,10 +1388,10 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<order_type__appl_descr>").append("<![CDATA[]]>").append("</order_type__appl_descr>"); valueXmlString.append("<order_type__appl_descr>").append("<![CDATA[]]>").append("</order_type__appl_descr>");
valueXmlString.append("<valid_upto>").append("<![CDATA["+ldDate+"]]>").append("</valid_upto>"); valueXmlString.append("<valid_upto>").append("<![CDATA["+ldDate+"]]>").append("</valid_upto>");
valueXmlString.append("<tax_opt>").append("<![CDATA[L]]>").append("</tax_opt>"); valueXmlString.append("<tax_opt>").append("<![CDATA[L]]>").append("</tax_opt>");
valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>"); valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>"); valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>"); valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
} }
} }
else if(currentColumn.trim().equalsIgnoreCase("order_type__appl")) else if(currentColumn.trim().equalsIgnoreCase("order_type__appl"))
...@@ -1416,6 +1444,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1416,6 +1444,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<cust_type>").append("<![CDATA["+custType+"]]>").append("</cust_type>"); valueXmlString.append("<cust_type>").append("<![CDATA["+custType+"]]>").append("</cust_type>");
valueXmlString.append("<cust_type__descr>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>"); valueXmlString.append("<cust_type__descr>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>");
valueXmlString.append("<confirmed>").append("<![CDATA[N]]>").append("</confirmed>"); valueXmlString.append("<confirmed>").append("<![CDATA[N]]>").append("</confirmed>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
} }
else if(currentColumn.trim().equalsIgnoreCase("cust_code")) else if(currentColumn.trim().equalsIgnoreCase("cust_code"))
{ {
...@@ -1512,6 +1541,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1512,6 +1541,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>"); valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>"); valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>"); valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
} }
else //Regulat customer else //Regulat customer
{ {
...@@ -1963,6 +1994,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1963,6 +1994,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>"); valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>"); valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>"); valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
} }
} }
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
...@@ -1971,6 +2004,9 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1971,6 +2004,9 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
case 2: case 2:
{ {
editFlag = (editFlag != null) ? editFlag : genericUtility.getColumnValue("edit_status", dom1);
System.out.println("Case 2 ItemChange editFlag["+editFlag+"]");
String lineNo = "",contractScope = "",contractScopeDescr = ""; String lineNo = "",contractScope = "",contractScopeDescr = "";
String effFrom = "",division = "",discount = "",validUpto = ""; String effFrom = "",division = "",discount = "",validUpto = "";
int domID = 0; int domID = 0;
...@@ -2021,6 +2057,19 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2021,6 +2057,19 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append("<contract_no protect ='1'>").append("<![CDATA[" + contractNo + "]]>").append("</contract_no>"); valueXmlString.append("<contract_no protect ='1'>").append("<![CDATA[" + contractNo + "]]>").append("</contract_no>");
valueXmlString.append("<line_no protect ='1'>").append("<![CDATA["+lineNo+"]]>").append("</line_no>"); valueXmlString.append("<line_no protect ='1'>").append("<![CDATA["+lineNo+"]]>").append("</line_no>");
if("V".equalsIgnoreCase(editFlag))
{
valueXmlString.append("<valid_upto protect ='1'>").append("<![CDATA[" + genericUtility.getValidDateString(rs.getString("VALID_UPTO"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>");
valueXmlString.append("<eff_from protect ='1'>").append("<![CDATA[" + genericUtility.getValidDateString(rs.getString("EFF_FROM"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>");
valueXmlString.append("<division protect ='1'>").append("<![CDATA["+ rs.getString("DIVISION") +"]]>").append("</division>");
valueXmlString.append("<contract_scope protect ='1'>").append("<![CDATA["+ rs.getString("CONTRACT_SCOPE") +"]]>").append("</contract_scope>");
valueXmlString.append("<contract_scope__descr protect ='1'>").append("<![CDATA["+contractScopeDescr+"]]>").append("</contract_scope__descr>");
valueXmlString.append("<price_list protect ='1'>").append("<![CDATA["+ checkNullAndTrim(rs.getString("PRICE_LIST")) +"]]>").append("</price_list>");
valueXmlString.append("<discount protect ='1'>").append("<![CDATA["+ rs.getDouble("DISCOUNT") +"]]>").append("</discount>");
}
else
{
valueXmlString.append("<valid_upto >").append("<![CDATA[" + genericUtility.getValidDateString(rs.getString("VALID_UPTO"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>"); valueXmlString.append("<valid_upto >").append("<![CDATA[" + genericUtility.getValidDateString(rs.getString("VALID_UPTO"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>");
valueXmlString.append("<eff_from >").append("<![CDATA[" + genericUtility.getValidDateString(rs.getString("EFF_FROM"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>"); valueXmlString.append("<eff_from >").append("<![CDATA[" + genericUtility.getValidDateString(rs.getString("EFF_FROM"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>");
valueXmlString.append("<division>").append("<![CDATA["+ rs.getString("DIVISION") +"]]>").append("</division>"); valueXmlString.append("<division>").append("<![CDATA["+ rs.getString("DIVISION") +"]]>").append("</division>");
...@@ -2028,6 +2077,9 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2028,6 +2077,9 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<contract_scope__descr>").append("<![CDATA["+contractScopeDescr+"]]>").append("</contract_scope__descr>"); valueXmlString.append("<contract_scope__descr>").append("<![CDATA["+contractScopeDescr+"]]>").append("</contract_scope__descr>");
valueXmlString.append("<price_list>").append("<![CDATA["+ checkNullAndTrim(rs.getString("PRICE_LIST")) +"]]>").append("</price_list>"); valueXmlString.append("<price_list>").append("<![CDATA["+ checkNullAndTrim(rs.getString("PRICE_LIST")) +"]]>").append("</price_list>");
valueXmlString.append("<discount>").append("<![CDATA["+ rs.getDouble("DISCOUNT") +"]]>").append("</discount>"); valueXmlString.append("<discount>").append("<![CDATA["+ rs.getDouble("DISCOUNT") +"]]>").append("</discount>");
}
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("</Detail2>"); valueXmlString.append("</Detail2>");
count++; count++;
...@@ -2071,12 +2123,16 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2071,12 +2123,16 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<contract_scope__descr>").append("<![CDATA[]]>").append("</contract_scope__descr>"); valueXmlString.append("<contract_scope__descr>").append("<![CDATA[]]>").append("</contract_scope__descr>");
valueXmlString.append("<price_list>").append("<![CDATA[]]>").append("</price_list>"); valueXmlString.append("<price_list>").append("<![CDATA[]]>").append("</price_list>");
valueXmlString.append("<discount>").append("<![CDATA[0]]>").append("</discount>"); valueXmlString.append("<discount>").append("<![CDATA[0]]>").append("</discount>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("</Detail2>"); valueXmlString.append("</Detail2>");
} }
} }
break; break;
case 3: case 3:
{ {
editFlag = (editFlag != null) ? editFlag : genericUtility.getColumnValue("edit_status", dom1);
System.out.println("Case 3 ItemChange editFlag["+editFlag+"]");
//valueXmlString.append("<Detail3>"); //valueXmlString.append("<Detail3>");
int count = 0; int count = 0;
int domID = 0; int domID = 0;
...@@ -2146,9 +2202,20 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2146,9 +2202,20 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<contract_no>").append("<![CDATA["+contractNo+"]]>").append("</contract_no>"); valueXmlString.append("<contract_no>").append("<![CDATA["+contractNo+"]]>").append("</contract_no>");
valueXmlString.append("<line_no>").append("<![CDATA["+lineNo+"]]>").append("</line_no>"); valueXmlString.append("<line_no>").append("<![CDATA["+lineNo+"]]>").append("</line_no>");
if("V".equalsIgnoreCase(editFlag))
{
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>");
}
else
{
valueXmlString.append("<item_code>").append("<![CDATA["+rs.getString("ITEM_CODE")+"]]>").append("</item_code>"); 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>").append("<![CDATA["+checkNullAndTrim(rs.getString("RATE_OPT"))+"]]>").append("</rate_opt>");
valueXmlString.append("<rate_opt__descr>").append("<![CDATA["+rateOptDescr+"]]>").append("</rate_opt__descr>"); valueXmlString.append("<rate_opt__descr>").append("<![CDATA["+rateOptDescr+"]]>").append("</rate_opt__descr>");
}
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("<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("<eff_from>").append("<![CDATA["+ genericUtility.getValidDateString(rs.getString("EFF_FROM"), genericUtility.getDBDateTimeFormat(), genericUtility.getApplDateFormat()) +"]]>").append("</eff_from>");
...@@ -2172,8 +2239,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2172,8 +2239,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<chg_date>").append("<![CDATA["+ldDate+"]]>").append("</chg_date>"); valueXmlString.append("<chg_date>").append("<![CDATA["+ldDate+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user>").append("<![CDATA["+userId+"]]>").append("</chg_user>"); valueXmlString.append("<chg_user>").append("<![CDATA["+userId+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term>").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>"); valueXmlString.append("<chg_term>").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>"); valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("</Detail3>"); valueXmlString.append("</Detail3>");
...@@ -2237,8 +2304,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2237,8 +2304,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>"); valueXmlString.append("<chg_date >").append("<![CDATA["+ldDate+"]]>").append("</chg_date>");
valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>"); valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>"); valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>"); valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("</Detail3>"); valueXmlString.append("</Detail3>");
} }
else if(currentColumn.trim().equalsIgnoreCase("item_code")) else if(currentColumn.trim().equalsIgnoreCase("item_code"))
...@@ -3127,7 +3194,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3127,7 +3194,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>"); 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>");
//Changed by wasim to set discount% [END] //Changed by wasim to set discount% [END]
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("</Detail3>"); valueXmlString.append("</Detail3>");
} }
else if (currentColumn.trim().equalsIgnoreCase("itm_defaultedit")) else if (currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
...@@ -3200,12 +3267,16 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3200,12 +3267,16 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>"); valueXmlString.append("<chg_user >").append("<![CDATA["+userId+"]]>").append("</chg_user>");
valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>"); valueXmlString.append("<chg_term >").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>"); valueXmlString.append("<discount>").append("<![CDATA["+discount+"]]>").append("</discount>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("</Detail3>"); valueXmlString.append("</Detail3>");
} }
} }
break; break;
case 4: case 4:
{ {
editFlag = (editFlag != null) ? editFlag : genericUtility.getColumnValue("edit_status", dom1);
System.out.println("Case 4 ItemChange editFlag["+editFlag+"]");
int domID = 0,count = 0; int domID = 0,count = 0;
String custType = "",custTypeDescr = "",lineNo = ""; String custType = "",custTypeDescr = "",lineNo = "";
...@@ -3280,12 +3351,27 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3280,12 +3351,27 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append("<contract_no>").append("<![CDATA[" +contractNo+"]]>").append("</contract_no>"); valueXmlString.append("<contract_no>").append("<![CDATA[" +contractNo+"]]>").append("</contract_no>");
valueXmlString.append("<line_no>").append("<![CDATA["+lineNo+"]]>").append("</line_no>"); valueXmlString.append("<line_no>").append("<![CDATA["+lineNo+"]]>").append("</line_no>");
if("V".equalsIgnoreCase(editFlag))
{
valueXmlString.append("<cust_code protect = '1'>").append("<![CDATA["+custCode+"]]>").append("</cust_code>");
valueXmlString.append("<cust_name protect = '1'>").append("<![CDATA["+custName+"]]>").append("</cust_name>");
valueXmlString.append("<city protect = '1'>").append("<![CDATA["+city+"]]>").append("</city>");
valueXmlString.append("<drug_lic_no protect = '1'>").append("<![CDATA["+checkNullAndTrim(rs.getString("DRUG_LIC_NO"))+"]]>").append("</drug_lic_no>");
valueXmlString.append("<cust_type protect = '1'>").append("<![CDATA["+custType+"]]>").append("</cust_type>");
valueXmlString.append("<cust_type__descr protect = '1'>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>");
}
else
{
valueXmlString.append("<cust_code>").append("<![CDATA["+custCode+"]]>").append("</cust_code>"); valueXmlString.append("<cust_code>").append("<![CDATA["+custCode+"]]>").append("</cust_code>");
valueXmlString.append("<cust_name>").append("<![CDATA["+custName+"]]>").append("</cust_name>"); valueXmlString.append("<cust_name>").append("<![CDATA["+custName+"]]>").append("</cust_name>");
valueXmlString.append("<city>").append("<![CDATA["+city+"]]>").append("</city>"); valueXmlString.append("<city>").append("<![CDATA["+city+"]]>").append("</city>");
valueXmlString.append("<drug_lic_no>").append("<![CDATA["+checkNullAndTrim(rs.getString("DRUG_LIC_NO"))+"]]>").append("</drug_lic_no>"); valueXmlString.append("<drug_lic_no>").append("<![CDATA["+checkNullAndTrim(rs.getString("DRUG_LIC_NO"))+"]]>").append("</drug_lic_no>");
valueXmlString.append("<cust_type>").append("<![CDATA["+custType+"]]>").append("</cust_type>"); valueXmlString.append("<cust_type>").append("<![CDATA["+custType+"]]>").append("</cust_type>");
valueXmlString.append("<cust_type__descr>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>"); valueXmlString.append("<cust_type__descr>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>");
}
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
count++; count++;
} }
...@@ -3320,6 +3406,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3320,6 +3406,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<drug_lic_no>").append("<![CDATA[]]>").append("</drug_lic_no>"); valueXmlString.append("<drug_lic_no>").append("<![CDATA[]]>").append("</drug_lic_no>");
valueXmlString.append("<cust_type>").append("<![CDATA["+custType+"]]>").append("</cust_type>"); valueXmlString.append("<cust_type>").append("<![CDATA["+custType+"]]>").append("</cust_type>");
valueXmlString.append("<cust_type__descr>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>"); valueXmlString.append("<cust_type__descr>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
} }
else if(currentColumn.trim().equalsIgnoreCase("cust_code")) else if(currentColumn.trim().equalsIgnoreCase("cust_code"))
...@@ -3378,6 +3465,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3378,6 +3465,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<drug_lic_no>").append("<![CDATA["+drgLicNo+"]]>").append("</drug_lic_no>"); valueXmlString.append("<drug_lic_no>").append("<![CDATA["+drgLicNo+"]]>").append("</drug_lic_no>");
valueXmlString.append("<cust_type>").append("<![CDATA["+custType+"]]>").append("</cust_type>"); valueXmlString.append("<cust_type>").append("<![CDATA["+custType+"]]>").append("</cust_type>");
valueXmlString.append("<cust_type__descr>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>"); valueXmlString.append("<cust_type__descr>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>");
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
} }
} }
......
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