Skip to content

B
business-java
Commit 6abdc4c4 authored by wansari's avatar wansari
Browse files
Options

D16JSUN0002 updated source for Item code pop help. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104724 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 71cf0236
Show whitespace changes
Inline Side-by-side
Showing with 28 additions and 107 deletions
webitm-dis/ibase/webitm/ejb/dis/ScontractGwtIC.java
View file @ 6abdc4c4
...@@ -343,7 +343,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -343,7 +343,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
cnt = rs.getInt(1); cnt = rs.getInt(1);
if(cnt == 0 ) if(cnt == 0 )
{ {
errString = itmDBAccessLocal.getErrorString("","VTCRTERM1","","",conn); errString = itmDBAccessLocal.getErrorString("","VMCRTRM","","",conn);
return errString; return errString;
} }
} }
...@@ -367,7 +367,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -367,7 +367,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
cnt = rs.getInt(1); cnt = rs.getInt(1);
if(cnt == 0 ) if(cnt == 0 )
{ {
errString = itmDBAccessLocal.getErrorString("","VTCURRCD1","","",conn); errString = itmDBAccessLocal.getErrorString("","VMCRCODE","","",conn);
return errString; return errString;
} }
} }
...@@ -1061,7 +1061,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1061,7 +1061,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
PreparedStatement pstmt = null, pstmtDescr = null; PreparedStatement pstmt = null, pstmtDescr = null;
ResultSet rs = null, rsDescr = null; ResultSet rs = null, rsDescr = null;
String sql = "",siteCodeDescr = ""; String sql = "";
int currentFormNo = 0; int currentFormNo = 0;
StringBuffer valueXmlString = new StringBuffer(); StringBuffer valueXmlString = new StringBuffer();
...@@ -1072,8 +1072,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1072,8 +1072,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
int num2 = 0; int num2 = 0;
int num3 = 0; int num3 = 0;
int quantity = 0 ; int quantity = 0 ;
//int rate = 0;
//int rateClg = 0;
double rate = 0; double rate = 0;
double rateClg = 0; double rateClg = 0;
int pos = 0; int pos = 0;
...@@ -1086,17 +1084,9 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1086,17 +1084,9 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
int nespRate = 0; int nespRate = 0;
int nrpRate = 0; int nrpRate = 0;
int balValue = 0; int balValue = 0;
int chitemChangedildNodeListLength = 0;
NodeList parentNodeList = null;
NodeList childNodeList = null;
Node parentNode = null;
Node childNode = null;
String childNodeName = null;
String siteCode = ""; String siteCode = "";
String reStr = "";
String itemSer = ""; String itemSer = "";
String itemSerInv = ""; String itemSerInv = "";
String packCode = "";
String itemCode = ""; String itemCode = "";
String contractNo = ""; String contractNo = "";
String validUpTostr = ""; String validUpTostr = "";
...@@ -1106,7 +1096,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1106,7 +1096,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
String custCode = ""; String custCode = "";
String toStation = ""; String toStation = "";
String fromStation = ""; String fromStation = "";
String plistDisc = "";
String siteCodeShip = ""; String siteCodeShip = "";
String contractDateStr = ""; String contractDateStr = "";
String priceListClg = ""; String priceListClg = "";
...@@ -1120,7 +1109,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1120,7 +1109,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
String pList = ""; String pList = "";
String pListDisc = ""; String pListDisc = "";
String contractType = ""; String contractType = "";
String currCodeFrt = "";
String custName = ""; String custName = "";
String frState = ""; String frState = "";
String toState = ""; String toState = "";
...@@ -1141,7 +1129,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1141,7 +1129,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
String dlvTerm = ""; String dlvTerm = "";
String currCode = ""; String currCode = "";
String crDescr = ""; String crDescr = "";
String custCodeDlv = "";
String descr = ""; String descr = "";
String descr1 = ""; String descr1 = "";
String curr = ""; String curr = "";
...@@ -1163,6 +1150,15 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1163,6 +1150,15 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
String itemDescr = ""; String itemDescr = "";
String unit = ""; String unit = "";
String itemFlag = "",rateNesp = "",rateStduom = "",convRtuomStduom = ""; String itemFlag = "",rateNesp = "",rateStduom = "",convRtuomStduom = "";
int count = 0;
int domID = 0;
String lineNo = "",rateOptDescr = "",rateOpt = "";
String discount = "0";
String custType = "",custTypeDescr = "";
String priceRule = "",priceRuleDescr = "",orderType = "",orderTypeDescr = "";
String contractScope = "",contractScopeDescr = "";
String effFrom = "",division = "",validUpto = "";
String confirmed = "";
try try
{ {
conn = getConnection(); conn = getConnection();
...@@ -1207,8 +1203,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1207,8 +1203,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<Detail1 domID = '"+1+"' objContext='1' selected = 'Y'>\r\n"); valueXmlString.append("<Detail1 domID = '"+1+"' objContext='1' selected = 'Y'>\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
String priceRule = "",priceRuleDescr = "",custType = "",custTypeDescr = "",orderType = "",orderTypeDescr = "";
sql = " SELECT * FROM SCONTRACT WHERE CONTRACT_NO = ? "; sql = " SELECT * FROM SCONTRACT WHERE CONTRACT_NO = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, contractNo); pstmt.setString(1, contractNo);
...@@ -1220,7 +1214,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1220,7 +1214,6 @@ 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)) if("V".equalsIgnoreCase(editFlag))
{ {
valueXmlString.append("<cust_code protect = '1'>").append("<![CDATA["+rs.getString("CUST_CODE")+"]]>").append("</cust_code>"); valueXmlString.append("<cust_code protect = '1'>").append("<![CDATA["+rs.getString("CUST_CODE")+"]]>").append("</cust_code>");
...@@ -1249,16 +1242,9 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1249,16 +1242,9 @@ 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("<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_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("<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>");
valueXmlString.append("<cr_term >").append("<![CDATA["+rs.getString("CR_TERM")+"]]>").append("</cr_term>"); valueXmlString.append("<cr_term >").append("<![CDATA["+rs.getString("CR_TERM")+"]]>").append("</cr_term>");
valueXmlString.append("<crterm_descr >").append("<![CDATA[]]>").append("</crterm_descr>"); valueXmlString.append("<crterm_descr >").append("<![CDATA[]]>").append("</crterm_descr>");
...@@ -1273,7 +1259,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1273,7 +1259,6 @@ 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_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>");
...@@ -1380,7 +1365,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1380,7 +1365,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
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["+genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" )+"]]>").append("</site_code>"); valueXmlString.append("<site_code >").append("<![CDATA["+genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" )+"]]>").append("</site_code>");
valueXmlString.append("<cust_code>").append("<![CDATA[]]>").append("</cust_code>"); valueXmlString.append("<cust_code>").append("<![CDATA[]]>").append("</cust_code>");
valueXmlString.append("<cust_type>").append("<![CDATA[R]]>").append("</cust_type>"); valueXmlString.append("<cust_type>").append("<![CDATA[]]>").append("</cust_type>");
valueXmlString.append("<cust_type__descr>").append("<![CDATA[]]>").append("</cust_type__descr>"); valueXmlString.append("<cust_type__descr>").append("<![CDATA[]]>").append("</cust_type__descr>");
valueXmlString.append("<price_rule>").append("<![CDATA[]]>").append("</price_rule>"); valueXmlString.append("<price_rule>").append("<![CDATA[]]>").append("</price_rule>");
valueXmlString.append("<price_rule__descr>").append("<![CDATA[]]>").append("</price_rule__descr>"); valueXmlString.append("<price_rule__descr>").append("<![CDATA[]]>").append("</price_rule__descr>");
...@@ -1396,9 +1381,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1396,9 +1381,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
} }
else if(currentColumn.trim().equalsIgnoreCase("order_type__appl")) else if(currentColumn.trim().equalsIgnoreCase("order_type__appl"))
{ {
String orderType = "",orderTypeDescr = "",priceRule = "",priceRuleDescr = "",custType = "",custTypeDescr = "";
orderType = checkNullAndTrim(genericUtility.getColumnValue("order_type__appl", dom)); orderType = checkNullAndTrim(genericUtility.getColumnValue("order_type__appl", dom));
priceRule = checkNullAndTrim(genericUtility.getColumnValue("price_rule", dom)); priceRule = checkNullAndTrim(genericUtility.getColumnValue("price_rule", dom));
priceRuleDescr = checkNullAndTrim(genericUtility.getColumnValue("price_rule__descr", dom)); priceRuleDescr = checkNullAndTrim(genericUtility.getColumnValue("price_rule__descr", dom));
custCode = checkNullAndTrim(genericUtility.getColumnValue("cust_code", dom)); custCode = checkNullAndTrim(genericUtility.getColumnValue("cust_code", dom));
...@@ -1448,7 +1431,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -1448,7 +1431,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
} }
else if(currentColumn.trim().equalsIgnoreCase("cust_code")) else if(currentColumn.trim().equalsIgnoreCase("cust_code"))
{ {
String orderType = "",orderTypeDescr = "",priceRule = "",custType = "",contractDateAppl = ""; String contractDateAppl = "";
custCode = genericUtility.getColumnValue("cust_code", dom); custCode = genericUtility.getColumnValue("cust_code", dom);
siteCode = genericUtility.getColumnValue("site_code", dom); siteCode = genericUtility.getColumnValue("site_code", dom);
custType = checkNullAndTrim(genericUtility.getColumnValue("cust_type", dom)); custType = checkNullAndTrim(genericUtility.getColumnValue("cust_type", dom));
...@@ -2007,11 +1990,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2007,11 +1990,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
editFlag = (editFlag != null) ? editFlag : genericUtility.getColumnValue("edit_status", dom1); editFlag = (editFlag != null) ? editFlag : genericUtility.getColumnValue("edit_status", dom1);
System.out.println("Case 2 ItemChange editFlag["+editFlag+"]"); System.out.println("Case 2 ItemChange editFlag["+editFlag+"]");
String lineNo = "",contractScope = "",contractScopeDescr = "";
String effFrom = "",division = "",discount = "",validUpto = "";
int domID = 0;
int count = 0;
mode = checkEditMode(dom,"2"); mode = checkEditMode(dom,"2");
if("E".equalsIgnoreCase(mode)) if("E".equalsIgnoreCase(mode))
...@@ -2105,15 +2083,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2105,15 +2083,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
lineNo = " " + domID; lineNo = " " + domID;
lineNo = lineNo.substring( lineNo.length()-3 ); lineNo = lineNo.substring( lineNo.length()-3 );
//valueXmlString.append("<Detail2 domID = '"+domID+"' objContext='2' selected = 'N'>\r\n");
//valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append("<Detail2 domID='" + domID + "' objContext=\"2\" selected=\"Y\">\r\n"); valueXmlString.append("<Detail2 domID='" + domID + "' objContext=\"2\" selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
//valueXmlString.append( "<Detail2 dbID='' domID='"+domID+"' objContext='2' objName='scontract_gwt_wiz' selected='"+selectedChk+"'>\r\n" );
//valueXmlString.append("<attribute pkNames='' status='"+statusChk+"' updateFlag='"+editCustomeFlag+"' selected='"+selectedChk+"' />\r\n");
valueXmlString.append("<line_no protect ='1'>").append("<![CDATA["+lineNo+"]]>").append("</line_no>"); valueXmlString.append("<line_no protect ='1'>").append("<![CDATA["+lineNo+"]]>").append("</line_no>");
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("<valid_upto >").append("<![CDATA[" + genericUtility.getValidDateString(validUpTostr , genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>"); valueXmlString.append("<valid_upto >").append("<![CDATA[" + genericUtility.getValidDateString(validUpTostr , genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>");
...@@ -2133,12 +2104,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2133,12 +2104,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
editFlag = (editFlag != null) ? editFlag : genericUtility.getColumnValue("edit_status", dom1); editFlag = (editFlag != null) ? editFlag : genericUtility.getColumnValue("edit_status", dom1);
System.out.println("Case 3 ItemChange editFlag["+editFlag+"]"); System.out.println("Case 3 ItemChange editFlag["+editFlag+"]");
//valueXmlString.append("<Detail3>");
int count = 0;
int domID = 0;
String lineNo = "",rateOptDescr = "",rateOpt = "";
String discount = "0";
mode = checkEditMode(dom, "3"); mode = checkEditMode(dom, "3");
if("E".equalsIgnoreCase(mode)) if("E".equalsIgnoreCase(mode))
{ {
...@@ -2158,6 +2123,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2158,6 +2123,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
effFromStr = genericUtility.getColumnValue("eff_from", dom1); effFromStr = genericUtility.getColumnValue("eff_from", dom1);
siteCode = genericUtility.getColumnValue("site_code", dom1); siteCode = genericUtility.getColumnValue("site_code", dom1);
siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom1); siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom1);
custCode = checkNullAndTrim(genericUtility.getColumnValue("cust_code", dom1));
if(siteCodeShip == null || siteCodeShip.trim().length() == 0) if(siteCodeShip == null || siteCodeShip.trim().length() == 0)
{ {
...@@ -2173,7 +2139,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2173,7 +2139,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
if(contractNo.length() > 0) if(contractNo.length() > 0)
{ {
//sql = " SELECT * FROM SCONTRACTDET S, ITEM I WHERE S.CONTRACT_NO = ? AND I.ITEM_CODE = S.ITEM_CODE ";
sql = " SELECT S.LINE_NO,S.RATE_OPT,S.ITEM_CODE,I.DESCR,S.SITE_CODE,S.VALID_UPTO,S.EFF_FROM,S.UNIT,S.UNIT__STD,S.ITEM_FLG," sql = " SELECT S.LINE_NO,S.RATE_OPT,S.ITEM_CODE,I.DESCR,S.SITE_CODE,S.VALID_UPTO,S.EFF_FROM,S.UNIT,S.UNIT__STD,S.ITEM_FLG,"
+ " S.TAX_CHAP,S.TAX_ENV,S.TAX_CLASS,S.RATE,S.RATE__CLG,S.UNIT__RATE,S.RATE__STDUOM,S.CONV__RTUOM_STDUOM," + " S.TAX_CHAP,S.TAX_ENV,S.TAX_CLASS,S.RATE,S.RATE__CLG,S.UNIT__RATE,S.RATE__STDUOM,S.CONV__RTUOM_STDUOM,"
+ " S.PRICE_LIST,S.DISCOUNT,I.ITEM_SER " + " S.PRICE_LIST,S.DISCOUNT,I.ITEM_SER "
...@@ -2241,7 +2206,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2241,7 +2206,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
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("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("<cust_code>").append("<![CDATA["+custCode+"]]>").append("</cust_code>");
valueXmlString.append("</Detail3>"); valueXmlString.append("</Detail3>");
count++; count++;
...@@ -2260,7 +2225,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2260,7 +2225,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
else if(currentColumn.trim().equalsIgnoreCase("itm_default_add")) else if(currentColumn.trim().equalsIgnoreCase("itm_default_add"))
{ {
contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1)); contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1));
custCode = checkNullAndTrim(genericUtility.getColumnValue("cust_code", dom1));
siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code", dom1));
validUpTostr = genericUtility.getColumnValue("valid_upto", dom1); validUpTostr = genericUtility.getColumnValue("valid_upto", dom1);
effFromStr = genericUtility.getColumnValue("eff_from", dom1); effFromStr = genericUtility.getColumnValue("eff_from", dom1);
...@@ -2272,8 +2238,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2272,8 +2238,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
lineNo = lineNo.substring( lineNo.length()-3 ); lineNo = lineNo.substring( lineNo.length()-3 );
//lineNo = ""+domID; //lineNo = ""+domID;
//valueXmlString.append("<Detail3 domID = '"+domID+"' objContext='3' selected = 'N'>\r\n");
//valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
valueXmlString.append("<Detail3 domID='" + domID + "' objContext=\"3\" selected=\"Y\">\r\n"); valueXmlString.append("<Detail3 domID='" + domID + "' objContext=\"3\" selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\" pkNames=\"\" />\r\n");
...@@ -2282,7 +2246,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2282,7 +2246,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<item_descr >").append("<![CDATA[]]>").append("</item_descr>"); valueXmlString.append("<item_descr >").append("<![CDATA[]]>").append("</item_descr>");
valueXmlString.append("<line_no>").append("<![CDATA["+lineNo+"]]>").append("</line_no>"); valueXmlString.append("<line_no>").append("<![CDATA["+lineNo+"]]>").append("</line_no>");
valueXmlString.append("<quantity>").append("<![CDATA[0]]>").append("</quantity>"); valueXmlString.append("<quantity>").append("<![CDATA[0]]>").append("</quantity>");
valueXmlString.append("<site_code>").append("<![CDATA["+loginSiteCode+"]]>").append("</site_code>"); valueXmlString.append("<site_code>").append("<![CDATA["+siteCode+"]]>").append("</site_code>");
valueXmlString.append("<status_date >").append("<![CDATA[]]>").append("</status_date>"); valueXmlString.append("<status_date >").append("<![CDATA[]]>").append("</status_date>");
valueXmlString.append("<dsp_date>").append("<![CDATA[]]>").append("</dsp_date>"); valueXmlString.append("<dsp_date>").append("<![CDATA[]]>").append("</dsp_date>");
valueXmlString.append("<valid_upto>").append("<![CDATA[" + genericUtility.getValidDateString(validUpTostr , genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>"); valueXmlString.append("<valid_upto>").append("<![CDATA[" + genericUtility.getValidDateString(validUpTostr , genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>");
...@@ -2306,6 +2270,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2306,6 +2270,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
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("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("<cust_code>").append("<![CDATA["+custCode+"]]>").append("</cust_code>");
valueXmlString.append("</Detail3>"); valueXmlString.append("</Detail3>");
} }
else if(currentColumn.trim().equalsIgnoreCase("item_code")) else if(currentColumn.trim().equalsIgnoreCase("item_code"))
...@@ -2313,7 +2278,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2313,7 +2278,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1)); contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1));
siteCode = genericUtility.getColumnValue("site_code", dom1); siteCode = genericUtility.getColumnValue("site_code", dom1);
siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom1); siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom1);
custCode = checkNullAndTrim(genericUtility.getColumnValue("cust_code", dom1));
itemCode = genericUtility.getColumnValue("item_code", dom); itemCode = genericUtility.getColumnValue("item_code", dom);
lineNo = checkNullAndTrim(genericUtility.getColumnValue("line_no", dom)); lineNo = checkNullAndTrim(genericUtility.getColumnValue("line_no", dom));
priceList = checkNullAndTrim(genericUtility.getColumnValue("price_list", dom)); priceList = checkNullAndTrim(genericUtility.getColumnValue("price_list", dom));
...@@ -2334,8 +2299,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2334,8 +2299,8 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
valueXmlString.append("<site_code>").append("<![CDATA["+siteCode+"]]>").append("</site_code>"); valueXmlString.append("<site_code>").append("<![CDATA["+siteCode+"]]>").append("</site_code>");
valueXmlString.append("<line_no>").append("<![CDATA["+lineNo+"]]>").append("</line_no>"); valueXmlString.append("<line_no>").append("<![CDATA["+lineNo+"]]>").append("</line_no>");
//valueXmlString.append("<price_list>").append("<![CDATA["+priceList+"]]>").append("</price_list>"); //valueXmlString.append("<price_list>").append("<![CDATA["+priceList+"]]>").append("</price_list>");
valueXmlString.append("<rate_opt>").append("<![CDATA["+rateOpt+"]]>").append("</rate_opt>"); //valueXmlString.append("<rate_opt>").append("<![CDATA["+rateOpt+"]]>").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("<valid_upto >").append("<![CDATA[" + genericUtility.getValidDateString(validUpTostr , genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>"); valueXmlString.append("<valid_upto >").append("<![CDATA[" + genericUtility.getValidDateString(validUpTostr , genericUtility.getApplDateFormat()) + "]]>").append("</valid_upto>");
valueXmlString.append("<eff_from >").append("<![CDATA[" + genericUtility.getValidDateString(effFromStr , genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>"); valueXmlString.append("<eff_from >").append("<![CDATA[" + genericUtility.getValidDateString(effFromStr , genericUtility.getApplDateFormat()) + "]]>").append("</eff_from>");
valueXmlString.append("<status_date >").append("<![CDATA["+ ldDate +"]]>").append("</status_date>"); valueXmlString.append("<status_date >").append("<![CDATA["+ ldDate +"]]>").append("</status_date>");
...@@ -2346,7 +2311,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -2346,7 +2311,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
} }
contractDateStr = genericUtility.getValidDateString(genericUtility.getColumnValue("contract_date", dom1) , genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); contractDateStr = genericUtility.getValidDateString(genericUtility.getColumnValue("contract_date", dom1) , genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
contractDate = Timestamp.valueOf(contractDateStr + " 00:00:00.0"); contractDate = Timestamp.valueOf(contractDateStr + " 00:00:00.0");
custCode = genericUtility.getColumnValue("cust_code", dom1); //custCode = genericUtility.getColumnValue("cust_code", dom1);
toStation = genericUtility.getColumnValue("stan_code", dom1); toStation = genericUtility.getColumnValue("stan_code", dom1);
sql = "select item_ser from siteitem where site_code = ? and item_code = ?"; sql = "select item_ser from siteitem where site_code = ? and item_code = ?";
...@@ -3195,6 +3160,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3195,6 +3160,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
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("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("<cust_code>").append("<![CDATA["+custCode+"]]>").append("</cust_code>");
valueXmlString.append("</Detail3>"); valueXmlString.append("</Detail3>");
} }
else if (currentColumn.trim().equalsIgnoreCase("itm_defaultedit")) else if (currentColumn.trim().equalsIgnoreCase("itm_defaultedit"))
...@@ -3203,6 +3169,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3203,6 +3169,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
effFromStr = genericUtility.getColumnValue("eff_from", dom1); effFromStr = genericUtility.getColumnValue("eff_from", dom1);
validUpTostr = genericUtility.getColumnValue("valid_upto", dom1); validUpTostr = genericUtility.getColumnValue("valid_upto", dom1);
siteCode = genericUtility.getColumnValue("site_code", dom1); siteCode = genericUtility.getColumnValue("site_code", dom1);
custCode = genericUtility.getColumnValue("cust_code", dom1);
siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom1); siteCodeShip = genericUtility.getColumnValue("site_code__ship", dom1);
rateOpt = genericUtility.getColumnValue("rate_opt", dom); rateOpt = genericUtility.getColumnValue("rate_opt", dom);
rateOptDescr = genericUtility.getColumnValue("rate_opt__descr", dom); rateOptDescr = genericUtility.getColumnValue("rate_opt__descr", dom);
...@@ -3268,6 +3235,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3268,6 +3235,7 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
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("<edit_status>").append("<![CDATA["+editFlag+"]]>").append("</edit_status>");
valueXmlString.append("<cust_code>").append("<![CDATA["+custCode+"]]>").append("</cust_code>");
valueXmlString.append("</Detail3>"); valueXmlString.append("</Detail3>");
} }
} }
...@@ -3277,9 +3245,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3277,9 +3245,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
editFlag = (editFlag != null) ? editFlag : genericUtility.getColumnValue("edit_status", dom1); editFlag = (editFlag != null) ? editFlag : genericUtility.getColumnValue("edit_status", dom1);
System.out.println("Case 4 ItemChange editFlag["+editFlag+"]"); System.out.println("Case 4 ItemChange editFlag["+editFlag+"]");
int domID = 0,count = 0;
String custType = "",custTypeDescr = "",lineNo = "";
mode = checkEditMode(dom, "4"); mode = checkEditMode(dom, "4");
if("E".equalsIgnoreCase(mode)) if("E".equalsIgnoreCase(mode))
{ {
...@@ -3292,13 +3257,11 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3292,13 +3257,11 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
status = "N"; status = "N";
} }
//valueXmlString.append("<Detail4>");
if(currentColumn.trim().equalsIgnoreCase("itm_default")) if(currentColumn.trim().equalsIgnoreCase("itm_default"))
{ {
contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1)); contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1));
custType = checkNullAndTrim(genericUtility.getColumnValue("cust_type", dom1)); custType = checkNullAndTrim(genericUtility.getColumnValue("cust_type", dom1));
if(preDomExists(dom2, "4")) if(preDomExists(dom2, "4"))
{ {
System.out.println("Detail4 previous form exist"); System.out.println("Detail4 previous form exist");
...@@ -3325,7 +3288,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3325,7 +3288,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
{ {
sql = " SELECT CUST_NAME,CITY FROM CUSTOMER WHERE CUST_CODE = ? "; sql = " SELECT CUST_NAME,CITY FROM CUSTOMER WHERE CUST_CODE = ? ";
} }
//sql = " SELECT FIRST_NAME,CITY FROM STRG_CUSTOMER WHERE SC_CODE = ? ";
pstmtDescr = conn.prepareStatement(sql); pstmtDescr = conn.prepareStatement(sql);
pstmtDescr.setString(1, custCode); pstmtDescr.setString(1, custCode);
rsDescr = pstmtDescr.executeQuery(); rsDescr = pstmtDescr.executeQuery();
...@@ -3414,7 +3376,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -3414,7 +3376,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1)); contractNo = checkNullAndTrim(genericUtility.getColumnValue("contract_no", dom1));
lineNo = checkNullAndTrim(genericUtility.getColumnValue("line_no", dom)); lineNo = checkNullAndTrim(genericUtility.getColumnValue("line_no", dom));
custCode = checkNullAndTrim(genericUtility.getColumnValue("cust_code", dom)); custCode = checkNullAndTrim(genericUtility.getColumnValue("cust_code", dom));
//custCode = checkNullAndTrim(genericUtility.getColumnValue("sc_code", dom));
custName = checkNullAndTrim(genericUtility.getColumnValue("cust_name", dom)); custName = checkNullAndTrim(genericUtility.getColumnValue("cust_name", dom));
city = checkNullAndTrim(genericUtility.getColumnValue("city", dom)); city = checkNullAndTrim(genericUtility.getColumnValue("city", dom));
drgLicNo = checkNullAndTrim(genericUtility.getColumnValue("drug_lic_no", dom)); drgLicNo = checkNullAndTrim(genericUtility.getColumnValue("drug_lic_no", dom));
...@@ -4372,26 +4333,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -4372,26 +4333,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
{ {
lineNoList.add(1);//Initially assign default line number 1 lineNoList.add(1);//Initially assign default line number 1
/*Node elementName = null, parentNode = null;
NodeList elementList = null;
Element elementAttr = null;
String objName = "";
elementList = dom.getElementsByTagName("Detail"+objContext);
elementName = elementList.item(0);
if (elementName!=null && ("Detail"+objContext).equalsIgnoreCase(elementName.getNodeName()))
{
NamedNodeMap etlAttributes = elementName.getAttributes();
if (etlAttributes!=null)
{
if (etlAttributes.getNamedItem("line_no")!=null)
{
lineNo = Integer.parseInt(etlAttributes.getNamedItem("line_no").getNodeValue().trim());
System.out.println("Line number is="+lineNo);
lineNoList.add(lineNo);
}
}
}*/
System.out.println("DOM="+genericUtility.serializeDom(dom)); System.out.println("DOM="+genericUtility.serializeDom(dom));
System.out.println("OBJContext["+objContext+"]"); System.out.println("OBJContext["+objContext+"]");
...@@ -4409,26 +4350,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal, ...@@ -4409,26 +4350,6 @@ public class ScontractGwtIC extends ValidatorEJB implements ScontractGwtICLocal,
System.out.println("Line number is="+lineNo); System.out.println("Line number is="+lineNo);
lineNoList.add(lineNo); lineNoList.add(lineNo);
} }
/*NodeList childNodeList = detailNodeList.item(ctrH).getChildNodes();
int childNodeListlen = childNodeList.getLength();
for(int ctrD = 0; ctrD < childNodeListlen ; ctrD++)
{
Node childNode = childNodeList.item(ctrD);
if(childNode == null || childNode.getNodeType() != childNode.ELEMENT_NODE)
{
continue;
}
if(childNode != null && "line_no".equalsIgnoreCase(childNode.getNodeName()) && childNode.getFirstChild() != null)
{
lineNo = Integer.parseInt(childNode.getFirstChild().getNodeValue().trim());
System.out.println("Line number is="+lineNo);
lineNoList.add(lineNo);
}
}*/
} }
System.out.println("LineNumberList ["+lineNoList+"]"); System.out.println("LineNumberList ["+lineNoList+"]");
maxLineNo = Collections.max(lineNoList); maxLineNo = Collections.max(lineNoList);
......
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