Skip to content

B
business-java
Commit 751bc2cd authored by wansari's avatar wansari
Browse files
Options

D16HVHB003 updated source for taking customer code and site code from... 

D16HVHB003 updated source for taking customer code and site code from site_customer or customer  on HEAD


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@104513 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 626fbe7d
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 71 deletions
webitm-dis/ibase/webitm/ejb/dis/SorderSchemeIC.java
View file @ 751bc2cd
...@@ -358,7 +358,7 @@ public class SorderSchemeIC extends ValidatorEJB implements SorderSchemeICLocal, ...@@ -358,7 +358,7 @@ public class SorderSchemeIC extends ValidatorEJB implements SorderSchemeICLocal,
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String sql = "",siteCodeDescr = ""; String sql = "",siteCodeDescr = "",loginSiteCode = "";
int currentFormNo = 0; int currentFormNo = 0;
StringBuffer valueXmlString = new StringBuffer(); StringBuffer valueXmlString = new StringBuffer();
...@@ -372,6 +372,7 @@ public class SorderSchemeIC extends ValidatorEJB implements SorderSchemeICLocal, ...@@ -372,6 +372,7 @@ public class SorderSchemeIC extends ValidatorEJB implements SorderSchemeICLocal,
/*userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" ); /*userId = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginCode" );
chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" ); chgTerm = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "chgTerm" );
loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );*/ loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );*/
loginSiteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
if(objContext != null && objContext.trim().length() > 0) if(objContext != null && objContext.trim().length() > 0)
{ {
...@@ -390,15 +391,11 @@ public class SorderSchemeIC extends ValidatorEJB implements SorderSchemeICLocal, ...@@ -390,15 +391,11 @@ public class SorderSchemeIC extends ValidatorEJB implements SorderSchemeICLocal,
if( currentColumn.trim().equalsIgnoreCase( "itm_default" )) if( currentColumn.trim().equalsIgnoreCase( "itm_default" ))
{ {
valueXmlString.append( "<site_code><![CDATA[" ).append( loginSiteCode ).append( "]]></site_code>\r\n" );
}
else if( currentColumn.trim().equalsIgnoreCase( "site_code" ))
{
String siteCode = genericUtility.getColumnValue("site_code",dom);
sql = " SELECT DESCR FROM SITE WHERE SITE_CODE = ? "; sql = " SELECT DESCR FROM SITE WHERE SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode); pstmt.setString(1, loginSiteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
...@@ -414,8 +411,7 @@ public class SorderSchemeIC extends ValidatorEJB implements SorderSchemeICLocal, ...@@ -414,8 +411,7 @@ public class SorderSchemeIC extends ValidatorEJB implements SorderSchemeICLocal,
} }
valueXmlString.append( "<site_code__descr><![CDATA[" ).append( siteCodeDescr ).append( "]]></site_code__descr>\r\n" ); valueXmlString.append( "<site_code__descr><![CDATA[" ).append( siteCodeDescr ).append( "]]></site_code__descr>\r\n" );
} }
valueXmlString.append("</Detail1>\r\n"); valueXmlString.append("</Detail1>\r\n");
} }
break; break;
......
webitm-dis/ibase/webitm/ejb/dis/SorderSchemePrc.java
View file @ 751bc2cd
...@@ -177,7 +177,7 @@ public class SorderSchemePrc extends ProcessEJB implements SorderSchemePrcLocal, ...@@ -177,7 +177,7 @@ public class SorderSchemePrc extends ProcessEJB implements SorderSchemePrcLocal,
fromDateTimeStmp = Timestamp.valueOf(genericUtility.getValidDateString( dateFrom , applDateFormat, dbDateFormat)+" 00:00:00"); fromDateTimeStmp = Timestamp.valueOf(genericUtility.getValidDateString( dateFrom , applDateFormat, dbDateFormat)+" 00:00:00");
toDateTimeStmp = Timestamp.valueOf(genericUtility.getValidDateString( dateTo , applDateFormat, dbDateFormat)+" 00:00:00"); toDateTimeStmp = Timestamp.valueOf(genericUtility.getValidDateString( dateTo , applDateFormat, dbDateFormat)+" 00:00:00");
String itemCode = "",custCode = "",custCodeDlv = "",custCodeBil = "", dlvTerm = "",remarks = "", String customerCode = "",itemCode = "",custCode = "",custCodeDlv = "",custCodeBil = "", dlvTerm = "",remarks = "",
crTerm = "",currCode = "",stanCode = "",tranCode = "",transMode = "",currCodeFrt = "",currCodeIns = "",orderType = "",random = "", crTerm = "",currCode = "",stanCode = "",tranCode = "",transMode = "",currCodeFrt = "",currCodeIns = "",orderType = "",random = "",
countCode = "",stateCode = "",stationFrom = ""; countCode = "",stateCode = "",stationFrom = "";
...@@ -204,84 +204,107 @@ public class SorderSchemePrc extends ProcessEJB implements SorderSchemePrcLocal, ...@@ -204,84 +204,107 @@ public class SorderSchemePrc extends ProcessEJB implements SorderSchemePrcLocal,
pstmt.close();pstmt = null; pstmt.close();pstmt = null;
} }
sql = " SELECT DISTINCT SITE_CODE__CH FROM SITE_CUSTOMER WHERE SITE_CODE = ? AND CHANNEL_PARTNER = ? "; /* sql = " SELECT DISTINCT SITE_CODE__CH FROM SITE_CUSTOMER WHERE SITE_CODE = ? AND CHANNEL_PARTNER = ? ";
pstmtData = conn.prepareStatement(sql); pstmtData = conn.prepareStatement(sql);
pstmtData.setString(1,siteCode); pstmtData.setString(1,siteCode);
pstmtData.setString(2,"Y"); pstmtData.setString(2,"Y"); */
sql = " SELECT SITE_CODE__CH,CUST_CODE FROM SITE_CUSTOMER WHERE SITE_CODE = ? AND CHANNEL_PARTNER = ? "
+ " AND CUST_CODE >= ? AND CUST_CODE <= ? "
+ " UNION ALL "
+ " SELECT SITE_CODE,CUST_CODE FROM CUSTOMER WHERE CUST_CODE NOT IN ( SELECT CUST_CODE "
+ " FROM SITE_CUSTOMER WHERE SITE_CODE = ? AND CHANNEL_PARTNER= ? AND CUST_CODE >= ? AND CUST_CODE <= ? ) "
+ " AND CUST_CODE >= ? AND CUST_CODE <= ? AND CHANNEL_PARTNER = ? ";
pstmtData = conn.prepareStatement(sql);
pstmtData.setString(1,siteCode);
pstmtData.setString(2,"Y");
pstmtData.setString(3,custCodeFr);
pstmtData.setString(4,custCodeTo);
pstmtData.setString(5,siteCode);
pstmtData.setString(6,"Y");
pstmtData.setString(7,custCodeFr);
pstmtData.setString(8,custCodeTo);
pstmtData.setString(9,custCodeFr);
pstmtData.setString(10,custCodeTo);
pstmtData.setString(11,"Y");
rsData = pstmtData.executeQuery(); rsData = pstmtData.executeQuery();
while(rsData.next()) while(rsData.next())
{ {
siteCodeCh = checkNullAndTrim(rsData.getString("SITE_CODE__CH")); siteCodeCh = checkNullAndTrim(rsData.getString("SITE_CODE__CH"));
customerCode = checkNullAndTrim(rsData.getString("CUST_CODE"));
System.out.println("Site Code Channel["+siteCodeCh+"]"); System.out.println("Site Code Channel["+siteCodeCh+"] Customer Code ["+customerCode+"]");
sql = " SELECT C.CR_TERM,C.DLV_TERM,C.CURR_CODE,C.TRAN_CODE,C.TRANS_MODE,C.CURR_CODE__FRT,C.CURR_CODE__INS,C.STAN_CODE,C.STATE_CODE,"
+" C.COUNT_CODE,C.LOC_GROUP, C.ADDR1,C.ADDR2,C.ADDR3,C.CITY,C.PIN,C.CUST_CODE__BIL,C.TELE1,C.TELE2,C.TAX_CLASS,C.TAX_CHAP "
+" FROM CUSTOMER C WHERE C.CUST_CODE = ? ";
pstmtSql = conn.prepareStatement(sql);
pstmtSql.setString(1,customerCode);
rsSql = pstmtSql.executeQuery();
if(rsSql.next())
{
crTerm = rsSql.getString("CR_TERM");
dlvTerm = rsSql.getString("DLV_TERM");
currCode = rsSql.getString("CURR_CODE");
tranCode = rsSql.getString("TRAN_CODE");
transMode = rsSql.getString("TRANS_MODE");
currCodeFrt = rsSql.getString("CURR_CODE__FRT");
currCodeIns = rsSql.getString("CURR_CODE__INS");
stanCode = rsSql.getString("STAN_CODE");
stateCode = rsSql.getString("STATE_CODE");
countCode = rsSql.getString("COUNT_CODE");
groupCode = rsSql.getString("LOC_GROUP");
addr1 = checkNullAndTrim(rsSql.getString("ADDR1"));
addr2 = checkNullAndTrim(rsSql.getString("ADDR2"));
addr3 = checkNullAndTrim(rsSql.getString("ADDR3"));
city = checkNullAndTrim(rsSql.getString("CITY"));
pin = checkNullAndTrim(rsSql.getString("PIN"));
custCodeBil = checkNullAndTrim(rsSql.getString("CUST_CODE__BIL"));
tele1 = checkNullAndTrim(rsSql.getString("TELE1"));
tele2 = checkNullAndTrim(rsSql.getString("TELE2"));
taxClass = checkNullAndTrim(rsSql.getString("TAX_CLASS"));
taxChap = checkNullAndTrim(rsSql.getString("TAX_CHAP"));
}
if(rsSql != null)
{
rsSql.close();rsSql = null;
}
if(pstmtSql != null)
{
pstmtSql.close();pstmtSql = null;
}
sql = " SELECT S.SALE_ORDER,H.SITE_CODE,D.ITEM_CODE,I.DESCR,I.UNIT,I.UNIT__RATE,I.ITEM_STRU,ISR.ACCT_CODE__SAL,ISR.CCTR_CODE__SAL, "
+" I.ITEM_SER, (CASE WHEN I.LOC_TYPE__PARENT IS NULL THEN I.LOC_TYPE ELSE I.LOC_TYPE__PARENT END ) AS LOC_TYPE "
+" FROM INVOICE H, INVOICE_TRACE D, ITEM I, ITEMSER ISR, SORDER S "
+" WHERE H.INVOICE_ID = D.INVOICE_ID "
+" AND S.SALE_ORDER = H.SALE_ORDER "
+" AND I.ITEM_CODE = D.ITEM_CODE "
+" AND ISR.ITEM_SER = I.ITEM_SER "
+" AND S.SITE_CODE = ? "
+" AND S.ORDER_DATE BETWEEN ? AND ? "
+" AND D.LINE_TYPE = ? "
+" AND (CASE WHEN S.UDF__STR1 IS NULL THEN 'N' ELSE S.UDF__STR1 END ) ! = ? " ;
sql = " SELECT S.SALE_ORDER,SC.CUST_CODE,H.SITE_CODE,D.ITEM_CODE,I.DESCR,I.UNIT,I.UNIT__RATE,I.ITEM_STRU,ISR.ACCT_CODE__SAL,ISR.CCTR_CODE__SAL, "+
" I.ITEM_SER, (CASE WHEN I.LOC_TYPE__PARENT IS NULL THEN I.LOC_TYPE ELSE I.LOC_TYPE__PARENT END ) AS LOC_TYPE,"+
" C.CR_TERM,C.DLV_TERM,C.CURR_CODE,C.TRAN_CODE,C.TRANS_MODE,C.CURR_CODE__FRT,C.CURR_CODE__INS,C.STAN_CODE,C.STATE_CODE,C.COUNT_CODE,C.LOC_GROUP, "+
" C.ADDR1,C.ADDR2,C.ADDR3,C.CITY,C.PIN,C.CUST_CODE__BIL,C.TELE1,C.TELE2,C.TAX_CLASS,C.TAX_CHAP "+
" FROM INVOICE H, INVOICE_TRACE D, ITEM I, SORDER S, SITE_CUSTOMER SC,CUSTOMER C,ITEMSER ISR "+
" WHERE H.INVOICE_ID = D.INVOICE_ID "+
" AND S.SALE_ORDER = H.SALE_ORDER "+
" AND I.ITEM_CODE = D.ITEM_CODE "+
" AND ISR.ITEM_SER = I.ITEM_SER "+
" AND H.SITE_CODE = SC.SITE_CODE "+
" AND H.SITE_CODE = ? "+
" AND D.LINE_TYPE = ? "+
" AND SC.CHANNEL_PARTNER = ? "+
" AND H.TRAN_DATE BETWEEN ? AND ? "+
" AND SC.CUST_CODE BETWEEN ? AND ? "+
" AND SC.SITE_CODE__CH = ? "+
" AND C.CUST_CODE = SC.CUST_CODE "+
" AND (CASE WHEN S.UDF__STR1 IS NULL THEN 'N' ELSE S.UDF__STR1 END ) ! = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCodeCh); pstmt.setString(1,siteCodeCh);
pstmt.setString(2,"F"); pstmt.setTimestamp(2,fromDateTimeStmp);
pstmt.setString(3,"Y"); pstmt.setTimestamp(3,toDateTimeStmp);
pstmt.setTimestamp(4,fromDateTimeStmp); pstmt.setString(4,"F");
pstmt.setTimestamp(5,toDateTimeStmp); pstmt.setString(5,"Y");
pstmt.setString(6,custCodeFr);
pstmt.setString(7,custCodeTo);
pstmt.setString(8,siteCode);
pstmt.setString(9,"Y");
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
custCode = rs.getString("CUST_CODE");
itemCode = rs.getString("ITEM_CODE"); itemCode = rs.getString("ITEM_CODE");
itemSer = checkNullAndTrim(rs.getString("ITEM_SER"));
itemDescr = rs.getString("DESCR"); itemDescr = rs.getString("DESCR");
unit = rs.getString("UNIT"); unit = rs.getString("UNIT");
unitRate = rs.getString("UNIT__RATE"); unitRate = rs.getString("UNIT__RATE");
taxClass = checkNullAndTrim(rs.getString("TAX_CLASS"));
taxChap = checkNullAndTrim(rs.getString("TAX_CHAP"));
locType = rs.getString("LOC_TYPE");
crTerm = rs.getString("CR_TERM");
dlvTerm = rs.getString("DLV_TERM");
currCode = rs.getString("CURR_CODE");
tranCode = rs.getString("TRAN_CODE");
transMode = rs.getString("TRANS_MODE");
currCodeFrt = rs.getString("CURR_CODE__FRT");
currCodeIns = rs.getString("CURR_CODE__INS");
acctCodeSal = rs.getString("ACCT_CODE__SAL");
cctrCodeSal = rs.getString("CCTR_CODE__SAL");
stanCode = rs.getString("STAN_CODE");
countCode = rs.getString("COUNT_CODE");
stateCode = rs.getString("STATE_CODE");
groupCode = rs.getString("LOC_GROUP");
itemSru = checkNullAndTrim(rs.getString("ITEM_STRU")); itemSru = checkNullAndTrim(rs.getString("ITEM_STRU"));
itemSer = checkNullAndTrim(rs.getString("ITEM_SER"));
addr1 = checkNullAndTrim(rs.getString("ADDR1")); acctCodeSal = checkNullAndTrim(rs.getString("ACCT_CODE__SAL"));
addr2 = checkNullAndTrim(rs.getString("ADDR2")); cctrCodeSal = checkNullAndTrim(rs.getString("CCTR_CODE__SAL"));
addr3 = checkNullAndTrim(rs.getString("ADDR3")); locType = rs.getString("LOC_TYPE");
city = checkNullAndTrim(rs.getString("CITY"));
pin = checkNullAndTrim(rs.getString("PIN"));
custCodeBil = checkNullAndTrim(rs.getString("CUST_CODE__BIL"));
tele1 = checkNullAndTrim(rs.getString("TELE1"));
tele2 = checkNullAndTrim(rs.getString("TELE2"));
if ("F".equalsIgnoreCase(itemSru)) if ("F".equalsIgnoreCase(itemSru))
{ {
...@@ -357,7 +380,7 @@ public class SorderSchemePrc extends ProcessEJB implements SorderSchemePrcLocal, ...@@ -357,7 +380,7 @@ public class SorderSchemePrc extends ProcessEJB implements SorderSchemePrcLocal,
taxEnv = checkNullAndTrim(distCommon.getTaxEnv(stationFrom, stanCode, taxChap, taxClass, siteCode, conn)); taxEnv = checkNullAndTrim(distCommon.getTaxEnv(stationFrom, stanCode, taxChap, taxClass, siteCode, conn));
tempSplitCode = itemSer + "," + custCode.trim() + "@" + crTerm.trim() + "." + locType.trim(); tempSplitCode = itemSer + "," + customerCode.trim() + "@" + crTerm.trim() + "." + locType.trim();
System.out.println("tempSplitCode ["+tempSplitCode+"]"); System.out.println("tempSplitCode ["+tempSplitCode+"]");
...@@ -371,7 +394,7 @@ public class SorderSchemePrc extends ProcessEJB implements SorderSchemePrcLocal, ...@@ -371,7 +394,7 @@ public class SorderSchemePrc extends ProcessEJB implements SorderSchemePrcLocal,
} }
tempMap = new HashMap(); tempMap = new HashMap();
tempMap.put("cust_code", custCode); tempMap.put("cust_code", customerCode);
tempMap.put("site_code", siteCode); tempMap.put("site_code", siteCode);
tempMap.put("order_type", orderType); tempMap.put("order_type", orderType);
tempMap.put("item_ser", itemSer); tempMap.put("item_ser", itemSer);
......
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