Skip to content

B
business-java
Commit 34fedf1e authored by msingh's avatar msingh
Browse files
Options

Changes in SalesReturnConf.java for DDUK 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99321 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 3c207cd8
Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 222 deletions
webitm-wms/ibase/webitm/ejb/wms/SalesReturnConf.java
View file @ 34fedf1e
...@@ -34,24 +34,24 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -34,24 +34,24 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
GenericUtility genericUtility1 = GenericUtility.getInstance(); //Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001 GenericUtility genericUtility1 = GenericUtility.getInstance(); //Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
@Override @Override
public String confirm( String tranId, String xtraParams, String forcedFlag ) throws RemoteException,ITMException public String confirm( String tranId, String xtraParams, String forcedFlag ) throws RemoteException,ITMException
{ {
System.out.println("SalesReturnConf Called........"+tranId); System.out.println("SalesReturnConf Called........"+tranId);
Connection conn = null; Connection conn = null;
String errString = "",retStr = "",sql = "",tranType = "",siteCode = "",sorderRtrStr = "", String errString = "",retStr = "",sql = "",tranType = "",siteCode = "",sorderRtrStr = "",
refundReturnStr = "",invoiceId = "",tranIdCrn = ""; refundReturnStr = "",invoiceId = "",tranIdCrn = "";
String finparamCcterm = "", tranIdPayment = ""; //Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001 String finparamCcterm = "", tranIdPayment = ""; //Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
CommonWmsUtil common = new CommonWmsUtil(); //Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001 CommonWmsUtil common = new CommonWmsUtil(); //Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
ITMDBAccessEJB itmdbAccess = new ITMDBAccessEJB(); ITMDBAccessEJB itmdbAccess = new ITMDBAccessEJB();
ResultSet rs = null; ResultSet rs = null;
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
boolean isError = false; boolean isError = false;
//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start //Changed by samadhan on 16/6/2015 for status tracking update in magento system.start
String despId = ""; String despId = "";
String saleOrder=""; String saleOrder="";
...@@ -78,11 +78,11 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -78,11 +78,11 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
} }
System.out.println("TranType--------->>["+tranType+"]"); System.out.println("TranType--------->>["+tranType+"]");
System.out.println("invoiceId--------->>["+invoiceId+"]"); System.out.println("invoiceId--------->>["+invoiceId+"]");
//Changed by samadhan on 16/6/2015 for status tracking update in magento system.start //Changed by samadhan on 16/6/2015 for status tracking update in magento system.start
pstmt.close(); pstmt.close();
rs.close(); rs.close();
ShipmentStatus objShipment = new ShipmentStatus(); ShipmentStatus objShipment = new ShipmentStatus();
CommonWmsUtil wmsUtil = new CommonWmsUtil(); CommonWmsUtil wmsUtil = new CommonWmsUtil();
String apiShipUrl = wmsUtil.getDDSalesConfig("SHIP_STATUS_URL"); String apiShipUrl = wmsUtil.getDDSalesConfig("SHIP_STATUS_URL");
...@@ -90,7 +90,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -90,7 +90,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
String apiKey = wmsUtil.getDDSalesConfig("API_KEY"); String apiKey = wmsUtil.getDDSalesConfig("API_KEY");
objShipment.setApiKey(apiKey); objShipment.setApiKey(apiKey);
//Changed by wasim on 14-08-2015 to set api Key for magento [END] //Changed by wasim on 14-08-2015 to set api Key for magento [END]
sql="select desp_id,sale_order from invoice where invoice_id = ?"; sql="select desp_id,sale_order from invoice where invoice_id = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, invoiceId); pstmt.setString(1, invoiceId);
...@@ -165,39 +165,39 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -165,39 +165,39 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
//Changed by samadhan on 16/6/2015 for status tracking update in magento system.end //Changed by samadhan on 16/6/2015 for status tracking update in magento system.end
conn.commit(); conn.commit();
} }
refundReturnStr = generateAutoPayment(sreturnDetail, conn); refundReturnStr = generateAutoPayment(sreturnDetail, conn);
System.out.println("After refundReturnStr---->>["+refundReturnStr+"]"); System.out.println("After refundReturnStr---->>["+refundReturnStr+"]");
//Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001 //Changed by Sneha on 02/07/2015, for Auto Confirm Payment, Request ID: D15DKAT001
finparamCcterm = common.getfinparm("999999", "REC_PAY_AUTOCNF", conn); finparamCcterm = common.getfinparm("999999", "REC_PAY_AUTOCNF", conn);
if("Y".equalsIgnoreCase(finparamCcterm)) if("Y".equalsIgnoreCase(finparamCcterm))
{ {
Document headerDom = null; Document headerDom = null;
headerDom = genericUtility1.parseString(refundReturnStr); headerDom = genericUtility1.parseString(refundReturnStr);
tranIdPayment = genericUtility1.getColumnValue("TranID", headerDom); tranIdPayment = genericUtility1.getColumnValue("TranID", headerDom);
System.out.println("tranId :::::::::: " + tranIdPayment); System.out.println("tranId :::::::::: " + tranIdPayment);
if(refundReturnStr != null && refundReturnStr.indexOf("Success") > -1) if(refundReturnStr != null && refundReturnStr.indexOf("Success") > -1)
{ {
System.out.println("Inside If loop :::::::::: "); System.out.println("Inside If loop :::::::::: ");
conn.commit(); conn.commit();
System.out.println("Commited Sucessfully :::::::::: "); System.out.println("Commited Sucessfully :::::::::: ");
refundReturnStr = "success"; refundReturnStr = "success";
AppConnectParm appConnect = new AppConnectParm(); AppConnectParm appConnect = new AppConnectParm();
Properties p = appConnect.getProperty(); Properties p = appConnect.getProperty();
InitialContext ctx = new InitialContext(p); InitialContext ctx = new InitialContext(p);
RefundGateWayPaymentLocal locObj = (RefundGateWayPaymentLocal) ctx.lookup("ibase/RefundGateWayPayment/local"); RefundGateWayPaymentLocal locObj = (RefundGateWayPaymentLocal) ctx.lookup("ibase/RefundGateWayPayment/local");
errString=locObj.segPay(tranIdPayment, xtraParams, forcedFlag, conn); errString=locObj.segPay(tranIdPayment, xtraParams, forcedFlag, conn);
return errString; return errString;
/*System.out.println("Calling WSR :::::::::: "); /*System.out.println("Calling WSR :::::::::: ");
errString = wmsUtil.callNVOComponent(tranIdPayment, xtraParams, forcedFlag, "prcm_default_1", "nvo_business_object_misc_pay", conn); errString = wmsUtil.callNVOComponent(tranIdPayment, xtraParams, forcedFlag, "prcm_default_1", "nvo_business_object_misc_pay", conn);
System.out.println("return from WSR ::::::::::" + errString); System.out.println("return from WSR ::::::::::" + errString);
if(errString.indexOf("VTSUCC1") > -1) if(errString.indexOf("VTSUCC1") > -1)
{ {
System.out.println("Success :::::::::: "); System.out.println("Success :::::::::: ");
...@@ -207,13 +207,13 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -207,13 +207,13 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
isError = true; isError = true;
return errString; return errString;
}*/ }*/
} }
else else
{ {
refundReturnStr = refundReturnStr; refundReturnStr = refundReturnStr;
} }
} }
else else
{ {
...@@ -300,9 +300,9 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -300,9 +300,9 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
ResultSet rs = null; ResultSet rs = null;
String tranId = "" ,invoiceId = "" , xtraParams = "",siteCode = "",tranIdCrn = ""; String tranId = "" ,invoiceId = "" , xtraParams = "",siteCode = "",tranIdCrn = "";
String sql ="",userId = "",confirmed = "",errCode = "",errorString = "", String sql ="",userId = "",confirmed = "",errCode = "",errorString = "",
tranIdRecAdj = "",chgTerm = "",saleOrder = "",retString = ""; tranIdRecAdj = "",chgTerm = "",saleOrder = "",retString = "";
String tranIdRec = "",currCode = "",custCode = "",acctCode = "",cctrCode = "",finEntity = "", String tranIdRec = "",currCode = "",custCode = "",acctCode = "",cctrCode = "",finEntity = "",
bankCode = "",tranSer = "",refserPay = ""; bankCode = "",tranSer = "",refserPay = "";
double exchRate = 0,totAmt = 0,adjAmt = 0; double exchRate = 0,totAmt = 0,adjAmt = 0;
Timestamp refDate = null,dueDate = null; Timestamp refDate = null,dueDate = null;
int count = 0,miscCnt = 0,adjCnt = 0,rowCnt = 0; int count = 0,miscCnt = 0,adjCnt = 0,rowCnt = 0;
...@@ -315,13 +315,13 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -315,13 +315,13 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
siteCode = sReturnDetailsMap.get("SITE_CODE"); siteCode = sReturnDetailsMap.get("SITE_CODE");
tranIdCrn = sReturnDetailsMap.get("TRAN_ID__CRN"); tranIdCrn = sReturnDetailsMap.get("TRAN_ID__CRN");
xtraParams = sReturnDetailsMap.get("XTRA_PARAM"); xtraParams = sReturnDetailsMap.get("XTRA_PARAM");
currDate = new Timestamp(System.currentTimeMillis()); currDate = new Timestamp(System.currentTimeMillis());
vdt=new ValidatorEJB(); vdt=new ValidatorEJB();
Calendar currentDate = Calendar.getInstance(); Calendar currentDate = Calendar.getInstance();
SimpleDateFormat simpleDateFormatObj = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat simpleDateFormatObj = new SimpleDateFormat(genericUtility.getApplDateFormat());
String tranDate = simpleDateFormatObj.format(currentDate.getTime()); String tranDate = simpleDateFormatObj.format(currentDate.getTime());
System.out.println("invoiceId------->>["+invoiceId+"]"); System.out.println("invoiceId------->>["+invoiceId+"]");
sql = "SELECT COUNT(*) FROM MISC_PAYABLES WHERE REF_NO = ?"; sql = "SELECT COUNT(*) FROM MISC_PAYABLES WHERE REF_NO = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -393,8 +393,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -393,8 +393,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
// select all necessary details from receivables // select all necessary details from receivables
sql ="SELECT TRAN_SER,TRAN_ID,REF_DATE,CURR_CODE,EXCH_RATE,CUST_CODE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY," sql ="SELECT TRAN_SER,TRAN_ID,REF_DATE,CURR_CODE,EXCH_RATE,CUST_CODE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY,"
+ "TOT_AMT,ADJ_AMT,BANK_CODE FROM RECEIVABLES WHERE REF_NO = ?"; + "TOT_AMT,ADJ_AMT,BANK_CODE FROM RECEIVABLES WHERE REF_NO = ?";
//+ "( SELECT TRAN_ID FROM DRCR_RCP WHERE INVOICE_ID = ?) "; //+ "( SELECT TRAN_ID FROM DRCR_RCP WHERE INVOICE_ID = ?) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIdCrn); pstmt.setString(1, tranIdCrn);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -437,7 +437,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -437,7 +437,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
} }
sql = "UPDATE RECEIVABLES SET ADJ_AMT = TOT_AMT, STAT_DATE = ?,STATUS = ? " sql = "UPDATE RECEIVABLES SET ADJ_AMT = TOT_AMT, STAT_DATE = ?,STATUS = ? "
+ "WHERE REF_NO = ? "; + "WHERE REF_NO = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, currDate); pstmt.setTimestamp(1, currDate);
pstmt.setString(2,"A"); pstmt.setString(2,"A");
...@@ -479,9 +479,9 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -479,9 +479,9 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
// Insert into misc_payables // Insert into misc_payables
sql = "INSERT INTO MISC_PAYABLES (TRAN_ID,TRAN_SER,TRAN_DATE,REF_NO,REF_DATE,CURR_CODE,EXCH_RATE," sql = "INSERT INTO MISC_PAYABLES (TRAN_ID,TRAN_SER,TRAN_DATE,REF_NO,REF_DATE,CURR_CODE,EXCH_RATE,"
+ "SUNDRY_CODE,SUNDRY_TYPE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY,SITE_CODE," + "SUNDRY_CODE,SUNDRY_TYPE,ACCT_CODE,CCTR_CODE,DUE_DATE,FIN_ENTITY,SITE_CODE,"
+ "TOT_AMT,ADJ_AMT,STATUS,STATUS_DATE,BANK_CODE) " + "TOT_AMT,ADJ_AMT,STATUS,STATUS_DATE,BANK_CODE) "
+ "VALUES (?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,? )"; + "VALUES (?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,? )";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
pstmt.setString(2,tranSer);//refserPay pstmt.setString(2,tranSer);//refserPay
...@@ -517,7 +517,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -517,7 +517,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
System.out.println("generateTranTd tranid------->>["+tranId+"]"); System.out.println("generateTranTd tranid------->>["+tranId+"]");
sql = "INSERT INTO RECEIVABLES_ADJ( TRAN_ID,REF_SER,REF_NO,TOT_AMT,ADJ_AMT,REF_SER_ADJ,REF_NO_ADJ," sql = "INSERT INTO RECEIVABLES_ADJ( TRAN_ID,REF_SER,REF_NO,TOT_AMT,ADJ_AMT,REF_SER_ADJ,REF_NO_ADJ,"
+ "NET_AMT,TRAN_ID__RCV ) values (?,?,?,?,?,?,?,?,?)"; + "NET_AMT,TRAN_ID__RCV ) values (?,?,?,?,?,?,?,?,?)";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIdRecAdj); pstmt.setString(1, tranIdRecAdj);
...@@ -540,7 +540,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -540,7 +540,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
System.out.println("custCode------->>["+custCode+"]"); System.out.println("custCode------->>["+custCode+"]");
System.out.println(" miscCnt--->>["+miscCnt+"]adjCnt -->>["+adjCnt+"]"); System.out.println(" miscCnt--->>["+miscCnt+"]adjCnt -->>["+adjCnt+"]");
if(adjCnt > 0 && miscCnt > 0) if(adjCnt > 0 && miscCnt > 0)
...@@ -590,12 +590,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -590,12 +590,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;
String sql = "",refNon = "",billNo = "",currCode = "",sundryCode = "",acctCode = "",cctrCode = "",rcpMode = "", String sql = "",refNon = "",billNo = "",currCode = "",sundryCode = "",acctCode = "",cctrCode = "",rcpMode = "",
returnStr = "",siteCode = "",finEntity = "",sundryType = "",bankCode = "",payMode = "Q",saleOrder = "", returnStr = "",siteCode = "",finEntity = "",sundryType = "",bankCode = "",payMode = "Q",saleOrder = "",
tranIdMisc = "",tranSer = "",sundryName = "",refNoInvoice = "",chgUser = "",chgTerm ="",refNo = "", tranIdMisc = "",tranSer = "",sundryName = "",refNoInvoice = "",chgUser = "",chgTerm ="",refNo = "",
retString = "",despId = "",tokenInfo = "",vpsTxId = ""; retString = "",despId = "",tokenInfo = "",vpsTxId = "";
String tranId = "",invoiceId = "",xtraParams = "",tranIdCrn = ""; String tranId = "",invoiceId = "",xtraParams = "",tranIdCrn = "";
String acctCodeBal= "",cctrCodeBal= "",acctCodeBc= "",cctrCodeBc= "",acctCodeCf= "",acctCodeCfAp= "",modName = "", String acctCodeBal= "",cctrCodeBal= "",acctCodeBc= "",cctrCodeBc= "",acctCodeCf= "",acctCodeCfAp= "",modName = "",
cctrCodeCf = "",cctrCodeCfAp = "",currCodeBc = "",wfStatus = "",bankName = "",xmlOutString = "",currCodeS=""; cctrCodeCf = "",cctrCodeCfAp = "",currCodeBc = "",wfStatus = "",bankName = "",xmlOutString = "",currCodeS="";
double exchRate = 0,advAmt = 0,holdAmt = 0,adjAmt = 0,totAmt = 0,payAmt = 0,netPayable = 0,excRateBc = 0,mexrate = 0; double exchRate = 0,advAmt = 0,holdAmt = 0,adjAmt = 0,totAmt = 0,payAmt = 0,netPayable = 0,excRateBc = 0,mexrate = 0;
java.sql.Timestamp refDate = null,tranDate = null,billDate = null,dueDate = null; java.sql.Timestamp refDate = null,tranDate = null,billDate = null,dueDate = null;
StringBuffer xmlString = null; StringBuffer xmlString = null;
...@@ -615,12 +615,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -615,12 +615,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
String currDateStr = sdfAppl.format(currDate); String currDateStr = sdfAppl.format(currDate);
sql = "SELECT REF_NO,TRAN_DATE,REF_DATE,BILL_NO,BILL_DATE,CURR_CODE,EXCH_RATE,SUNDRY_CODE," sql = "SELECT REF_NO,TRAN_DATE,REF_DATE,BILL_NO,BILL_DATE,CURR_CODE,EXCH_RATE,SUNDRY_CODE,"
+ "ACCT_CODE,CCTR_CODE,DUE_DATE,SITE_CODE,FIN_ENTITY,TOT_AMT,SUNDRY_TYPE,BANK_CODE,PAY_MODE," + "ACCT_CODE,CCTR_CODE,DUE_DATE,SITE_CODE,FIN_ENTITY,TOT_AMT,SUNDRY_TYPE,BANK_CODE,PAY_MODE,"
+ "ADV_AMT,TRAN_ID,TRAN_SER,ADJ_AMT,HOLD_AMT," + "ADV_AMT,TRAN_ID,TRAN_SER,ADJ_AMT,HOLD_AMT,"
+ "TOT_AMT - (CASE WHEN ADJ_AMT IS NULL THEN 0 ELSE ADJ_AMT END) - (CASE WHEN HOLD_AMT IS NULL THEN 0 ELSE HOLD_AMT END) AS PAY_AMT," + "TOT_AMT - (CASE WHEN ADJ_AMT IS NULL THEN 0 ELSE ADJ_AMT END) - (CASE WHEN HOLD_AMT IS NULL THEN 0 ELSE HOLD_AMT END) AS PAY_AMT,"
+ "FN_SUNDRY_NAME(SUNDRY_TYPE,SUNDRY_CODE,'') AS SUNDRY_NAME," + "FN_SUNDRY_NAME(SUNDRY_TYPE,SUNDRY_CODE,'') AS SUNDRY_NAME,"
+ "TOT_AMT - (CASE WHEN ADJ_AMT IS NULL THEN 0 ELSE ADJ_AMT END) - (CASE WHEN HOLD_AMT IS NULL THEN 0 ELSE HOLD_AMT END) AS NET_PAYABLE " + "TOT_AMT - (CASE WHEN ADJ_AMT IS NULL THEN 0 ELSE ADJ_AMT END) - (CASE WHEN HOLD_AMT IS NULL THEN 0 ELSE HOLD_AMT END) AS NET_PAYABLE "
+ "FROM MISC_PAYABLES WHERE REF_NO = ?"; + "FROM MISC_PAYABLES WHERE REF_NO = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranIdCrn); pstmt.setString(1, tranIdCrn);
...@@ -670,7 +670,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -670,7 +670,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
sql = "SELECT TOKEN_INFO FROM DESPATCH WHERE DESP_ID = ?"; sql = "SELECT TOKEN_INFO FROM DESPATCH WHERE DESP_ID = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, despId); pstmt.setString(1, despId);
...@@ -684,7 +684,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -684,7 +684,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("saleOrder--->>["+saleOrder+"] tokenInfo---->>["+tokenInfo+"]"); System.out.println("saleOrder--->>["+saleOrder+"] tokenInfo---->>["+tokenInfo+"]");
if(tokenInfo != null && tokenInfo.length() > 0) if(tokenInfo != null && tokenInfo.length() > 0)
{ {
Document dom1 = genericUtility.parseString(tokenInfo); Document dom1 = genericUtility.parseString(tokenInfo);
...@@ -700,7 +700,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -700,7 +700,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
payMode = "R"; payMode = "R";
String tranType = "A"; String tranType = "A";
System.out.println("tranSer--->>["+tranSer+"] payMode---->>["+payMode+"]"); System.out.println("tranSer--->>["+tranSer+"] payMode---->>["+payMode+"]");
System.out.println("saleOrder====>>["+saleOrder+"]"); System.out.println("saleOrder====>>["+saleOrder+"]");
sql = "SELECT RCP_MODE,CURR_CODE FROM SORDER WHERE SALE_ORDER = ?"; sql = "SELECT RCP_MODE,CURR_CODE FROM SORDER WHERE SALE_ORDER = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -743,8 +743,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -743,8 +743,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
if(bankCode == null || bankCode.length() == 0) if(bankCode == null || bankCode.length() == 0)
{ {
sql = "SELECT BANK_CODE FROM SITE WHERE SITE_CODE = ?"; sql = "SELECT BANK_CODE FROM SITE WHERE SITE_CODE = ?";
...@@ -778,12 +778,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -778,12 +778,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
sql="select acct_code__bal, cctr_code__bal, acct_code__bc, cctr_code__bc," + sql="select acct_code__bal, cctr_code__bal, acct_code__bc, cctr_code__bc," +
" acct_code__cf, acct_code__cf_ap, cctr_code__cf, cctr_code__cf_ap " + " acct_code__cf, acct_code__cf_ap, cctr_code__cf, cctr_code__cf_ap " +
"from bank where bank_code = ?"; "from bank where bank_code = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,bankCode); pstmt.setString(1,bankCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -807,7 +807,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -807,7 +807,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
System.out.println("Site Code>>>>>>>>>>"+siteCode); System.out.println("Site Code>>>>>>>>>>"+siteCode);
sql="select curr_code from site, finent " + sql="select curr_code from site, finent " +
"where site.fin_entity = finent.fin_entity and site_code =?"; "where site.fin_entity = finent.fin_entity and site_code =?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1,siteCode); pstmt.setString(1,siteCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -839,7 +839,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -839,7 +839,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
System.out.println("refNoInvoice--->>["+refNoInvoice+"]"); System.out.println("refNoInvoice--->>["+refNoInvoice+"]");
mexrate=fin.getDailyExchRateSellBuy(currCode, "", siteCode, currDateStr, "B", conn); mexrate=fin.getDailyExchRateSellBuy(currCode, "", siteCode, currDateStr, "B", conn);
System.out.println("ExcRate from getDailyExchRateSellBuy========="+mexrate); System.out.println("ExcRate from getDailyExchRateSellBuy========="+mexrate);
xmlString = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); xmlString = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
xmlString.append("<DocumentRoot><description>Datawindow Root</description><group0><description>Group0 escription</description>"); xmlString.append("<DocumentRoot><description>Datawindow Root</description><group0><description>Group0 escription</description>");
xmlString.append("<Header0>"); xmlString.append("<Header0>");
...@@ -899,7 +899,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -899,7 +899,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
xmlString.append("<chg_user><![CDATA[" + chgUser + "]]></chg_user>"); xmlString.append("<chg_user><![CDATA[" + chgUser + "]]></chg_user>");
xmlString.append("<chg_term><![CDATA[" + chgTerm + "]]></chg_term>"); xmlString.append("<chg_term><![CDATA[" + chgTerm + "]]></chg_term>");
xmlString.append("<chg_date><![CDATA[" + currDateStr + "]]></chg_date>"); xmlString.append("<chg_date><![CDATA[" + currDateStr + "]]></chg_date>");
xmlString.append("</Detail1>"); xmlString.append("</Detail1>");
String lineNo = " 1"; String lineNo = " 1";
String stanCode=checkNull(getStanDraw(sundryType, sundryCode, conn)); String stanCode=checkNull(getStanDraw(sundryType, sundryCode, conn));
...@@ -946,7 +946,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -946,7 +946,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
retString=saveData(siteCode, xmlOutString, conn); retString=saveData(siteCode, xmlOutString, conn);
System.out.println("Before retString------>>["+retString+"]"); System.out.println("Before retString------>>["+retString+"]");
// Commented by Sneha on 02/07/2015, Request ID: D15DKAT001 // Commented by Sneha on 02/07/2015, Request ID: D15DKAT001
/* /*
if(retString != null && retString.indexOf("Success") > -1) if(retString != null && retString.indexOf("Success") > -1)
...@@ -957,7 +957,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -957,7 +957,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
{ {
return retString; return retString;
} }
*/ */
// End by Sneha on 02/07/2015, Request ID: D15DKAT001 // End by Sneha on 02/07/2015, Request ID: D15DKAT001
return retString; return retString;
} }
...@@ -1064,28 +1064,28 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1064,28 +1064,28 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
} }
private String saveSaleOrderData (String tranId ,String siteCode,String xtraParams,Connection conn) throws ITMException,Exception private String saveSaleOrderData (String tranId ,String siteCode,String xtraParams,Connection conn) throws ITMException,Exception
{ {
String sql ="",saleOrder = "",applDate = "",dbDate = "",saleOrderNew = "",chgUser = "",chgTerm = "",saleOrderOld = ""; String sql ="",saleOrder = "",applDate = "",dbDate = "",saleOrderNew = "",chgUser = "",chgTerm = "",saleOrderOld = "";
ResultSet rs = null,rs1 = null; ResultSet rs = null,rs1 = null;
PreparedStatement pstmt = null,pstmt1 = null; PreparedStatement pstmt = null,pstmt1 = null;
applDate = genericUtility.getApplDateFormat(); applDate = genericUtility.getApplDateFormat();
dbDate = genericUtility.getDBDateFormat(); dbDate = genericUtility.getDBDateFormat();
String custCode = "",buyerName = "",notifyTo = "",itemSer = "",custPord = "",salesPers = "",taxEnv = "",priceList = "", String custCode = "",buyerName = "",notifyTo = "",itemSer = "",custPord = "",salesPers = "",taxEnv = "",priceList = "",
crTerm = "",remarks = "",dlvAdd1 = "",dlvAdd2 = "",dlvAdd3 = "",dlvCity = "",stateCodeDlv = "",counCodeDlv = "", crTerm = "",remarks = "",dlvAdd1 = "",dlvAdd2 = "",dlvAdd3 = "",dlvCity = "",stateCodeDlv = "",counCodeDlv = "",
tranCode = "",dlvTerm = "",empCodeOrd = "",transMode = "",rcpMode = "",dlvTo = "",currCode = "",dlvPin = "", tranCode = "",dlvTerm = "",empCodeOrd = "",transMode = "",rcpMode = "",dlvTo = "",currCode = "",dlvPin = "",
acctCodeSal = "",tel1Dlv = "",tel2Dlv = "",tel3Dlv = "",faxDlv = "",siteCodeShip = "",pordMode = "",udfStr1 = "", acctCodeSal = "",tel1Dlv = "",tel2Dlv = "",tel3Dlv = "",faxDlv = "",siteCodeShip = "",pordMode = "",udfStr1 = "",
orderType = "",stanCode = "",deptCode = ""; orderType = "",stanCode = "",deptCode = "";
String lineNoSord = "",siteCodeD = "",itemFlag = "",taxEnvD = "",itemDescr = "",unitRate = "",packCode = "", String lineNoSord = "",siteCodeD = "",itemFlag = "",taxEnvD = "",itemDescr = "",unitRate = "",packCode = "",
unitStd = "",itemSerD = "",holdFlag = "",itemCodeOrd = "",unit = "",itemCode = ""; unitStd = "",itemSerD = "",holdFlag = "",itemCodeOrd = "",unit = "",itemCode = "";
double quantity = 0,rate = 0,discount = 0,taxAmtD = 0,netAmt = 0,convQtyStduom = 0,quantityFc = 0,quantityStduom = 0, double quantity = 0,rate = 0,discount = 0,taxAmtD = 0,netAmt = 0,convQtyStduom = 0,quantityFc = 0,quantityStduom = 0,
convRtuomStduom = 0,rateStdUom = 0,rateStd = 0,rateClg = 0,netTotAmt,totOrdValue = 0; convRtuomStduom = 0,rateStdUom = 0,rateStd = 0,rateClg = 0,netTotAmt,totOrdValue = 0;
double exchRate = 0,ordAmt = 0,taxAmt = 0,totAmt = 0,frtAmt = 0; double exchRate = 0,ordAmt = 0,taxAmt = 0,totAmt = 0,frtAmt = 0;
java.sql.Timestamp orderDate = null,pordDate = null,taxDate = null,currDate = null; java.sql.Timestamp orderDate = null,pordDate = null,taxDate = null,currDate = null;
chgUser = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode")); chgUser = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId")); chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
try try
{ {
currDate = getCurrtDate(); currDate = getCurrtDate();
...@@ -1106,29 +1106,29 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1106,29 +1106,29 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
saleOrder = saleOrder == null ? "" : saleOrder.trim(); saleOrder = saleOrder == null ? "" : saleOrder.trim();
if(saleOrder.length() > 0) if(saleOrder.length() > 0)
{ {
saleOrderNew = generateTranId( "w_sorder", siteCode, conn ); saleOrderNew = generateTranId( "w_sorder", siteCode, conn );
System.out.println("saleOrderNew ---------->>["+saleOrderNew+"]"); System.out.println("saleOrderNew ---------->>["+saleOrderNew+"]");
sql = "select sale_order,order_date,cust_code,buyer_name,notify_to,item_ser,cust_pord,pord_date,sales_pers,tax_env,tax_date,"//11 sql = "select sale_order,order_date,cust_code,buyer_name,notify_to,item_ser,cust_pord,pord_date,sales_pers,tax_env,tax_date,"//11
+ "price_list,cr_term,site_code,curr_code,exch_rate,due_date,remarks,dlv_add1,dlv_add2,dlv_add3,dlv_city,state_code__dlv,"//23 + "price_list,cr_term,site_code,curr_code,exch_rate,due_date,remarks,dlv_add1,dlv_add2,dlv_add3,dlv_city,state_code__dlv,"//23
+ "count_code__dlv,dlv_pin,stan_code,tran_code,ord_amt,tax_amt,tot_amt,dlv_term,frt_amt,emp_code__ord,trans_mode,"//34 + "count_code__dlv,dlv_pin,stan_code,tran_code,ord_amt,tax_amt,tot_amt,dlv_term,frt_amt,emp_code__ord,trans_mode,"//34
+ "rcp_mode,dlv_to,acct_code__sal,tel1__dlv,tel2__dlv,tel3__dlv,fax__dlv,site_code__ship,pord_mode,udf__str1," //44 + "rcp_mode,dlv_to,acct_code__sal,tel1__dlv,tel2__dlv,tel3__dlv,fax__dlv,site_code__ship,pord_mode,udf__str1," //44
+ "order_type,cust_code__dlv,cust_code__bil,tax_opt,pl_date,confirmed,part_qty,status,status_date," //53 + "order_type,cust_code__dlv,cust_code__bil,tax_opt,pl_date,confirmed,part_qty,status,status_date," //53
+ "consume_fc,curr_code__frt,curr_code__comm,curr_code__ins,frt_term,order_mode,exch_rate__ins,exch_rate__frt," //61 + "consume_fc,curr_code__frt,curr_code__comm,curr_code__ins,frt_term,order_mode,exch_rate__ins,exch_rate__frt," //61
+ "cctr_code__sal,label_type,outside_inspection,exch_rate__comm,hazard_yn,price_list__clg,terr_code,order_status," //69 + "cctr_code__sal,label_type,outside_inspection,exch_rate__comm,hazard_yn,price_list__clg,terr_code,order_status," //69
+ "available_yn,single_lot,ship_status,chg_date,chg_user,chg_term,udf__str2,comm_perc,alloc_flag,inv_amt," + "available_yn,single_lot,ship_status,chg_date,chg_user,chg_term,udf__str2,comm_perc,alloc_flag,inv_amt,"
+ "adv_perc,comm_perc_1,comm_perc_2,udf__num1,udf__num2,ins_amt,max_order_value,chq_name,chq_amount," //88 + "adv_perc,comm_perc_1,comm_perc_2,udf__num1,udf__num2,ins_amt,max_order_value,chq_name,chq_amount," //88
+ "notify_term,ord_billback_amt,ord_offinv_amt,line_billback_amt,line_offinv_amt,pending_order,user_remarks," + "notify_term,ord_billback_amt,ord_offinv_amt,line_billback_amt,line_offinv_amt,pending_order,user_remarks,"
+ "net_tot_amt,tot_ord_value,dept_code " //98 + "net_tot_amt,tot_ord_value,dept_code " //98
+ "from sorder where sale_order = ?"; + "from sorder where sale_order = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder); pstmt.setString(1, saleOrder);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
...@@ -1138,27 +1138,27 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1138,27 +1138,27 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
buyerName = checkNull(rs.getString("buyer_name")); buyerName = checkNull(rs.getString("buyer_name"));
notifyTo = checkNull(rs.getString("notify_to")); notifyTo = checkNull(rs.getString("notify_to"));
itemSer = checkNull(rs.getString("item_ser")); itemSer = checkNull(rs.getString("item_ser"));
custPord = checkNull(rs.getString("cust_pord")); custPord = checkNull(rs.getString("cust_pord"));
//pordDate = rs.getTimestamp("pord_date"); // //pordDate = rs.getTimestamp("pord_date"); //
salesPers = checkNull(rs.getString("sales_pers")); salesPers = checkNull(rs.getString("sales_pers"));
taxEnv = checkNull(rs.getString("tax_env")); taxEnv = checkNull(rs.getString("tax_env"));
taxDate = rs.getTimestamp("tax_date");// taxDate = rs.getTimestamp("tax_date");//
priceList = checkNull(rs.getString("price_list")); priceList = checkNull(rs.getString("price_list"));
crTerm = checkNull(rs.getString("cr_term")); crTerm = checkNull(rs.getString("cr_term"));
siteCode = checkNull(rs.getString("site_code")); siteCode = checkNull(rs.getString("site_code"));
currCode = checkNull(rs.getString("curr_code")); currCode = checkNull(rs.getString("curr_code"));
exchRate = rs.getDouble("exch_rate"); exchRate = rs.getDouble("exch_rate");
//dueDate = checkNull(rs.getString("due_date")); //dueDate = checkNull(rs.getString("due_date"));
remarks = checkNull(rs.getString("remarks")); remarks = checkNull(rs.getString("remarks"));
dlvAdd1 = checkNull(rs.getString("dlv_add1")); dlvAdd1 = checkNull(rs.getString("dlv_add1"));
dlvAdd2 = checkNull(rs.getString("dlv_add2")); dlvAdd2 = checkNull(rs.getString("dlv_add2"));
dlvAdd3 = checkNull(rs.getString("dlv_add3")); dlvAdd3 = checkNull(rs.getString("dlv_add3"));
dlvCity = checkNull(rs.getString("dlv_city")); dlvCity = checkNull(rs.getString("dlv_city"));
stateCodeDlv = checkNull(rs.getString("state_code__dlv")); stateCodeDlv = checkNull(rs.getString("state_code__dlv"));
counCodeDlv = checkNull(rs.getString("count_code__dlv")); counCodeDlv = checkNull(rs.getString("count_code__dlv"));
dlvPin = checkNull(rs.getString("dlv_pin")); dlvPin = checkNull(rs.getString("dlv_pin"));
...@@ -1166,14 +1166,14 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1166,14 +1166,14 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
tranCode = checkNull(rs.getString("tran_code")); tranCode = checkNull(rs.getString("tran_code"));
ordAmt = rs.getDouble("ord_amt"); ordAmt = rs.getDouble("ord_amt");
taxAmt = rs.getDouble("tax_amt"); taxAmt = rs.getDouble("tax_amt");
totAmt = rs.getDouble("tot_amt"); totAmt = rs.getDouble("tot_amt");
dlvTerm = checkNull(rs.getString("dlv_term")); dlvTerm = checkNull(rs.getString("dlv_term"));
frtAmt = rs.getDouble("frt_amt"); frtAmt = rs.getDouble("frt_amt");
empCodeOrd = checkNull(rs.getString("emp_code__ord")); empCodeOrd = checkNull(rs.getString("emp_code__ord"));
transMode = checkNull(rs.getString("trans_mode")); transMode = checkNull(rs.getString("trans_mode"));
rcpMode = checkNull(rs.getString("rcp_mode")); rcpMode = checkNull(rs.getString("rcp_mode"));
dlvTo = checkNull(rs.getString("dlv_to")); dlvTo = checkNull(rs.getString("dlv_to"));
acctCodeSal = checkNull(rs.getString("acct_code__sal")); acctCodeSal = checkNull(rs.getString("acct_code__sal"));
tel1Dlv = checkNull(rs.getString("tel1__dlv")); tel1Dlv = checkNull(rs.getString("tel1__dlv"));
...@@ -1187,32 +1187,32 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1187,32 +1187,32 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
netTotAmt = rs.getDouble("net_tot_amt"); netTotAmt = rs.getDouble("net_tot_amt");
totOrdValue = rs.getDouble("tot_ord_value"); totOrdValue = rs.getDouble("tot_ord_value");
deptCode = checkNull(rs.getString("dept_code")); deptCode = checkNull(rs.getString("dept_code"));
sql = "insert into sorder (sale_order,order_date,cust_code,buyer_name,notify_to,item_ser,cust_pord,pord_date,sales_pers,tax_env,tax_date,"//11 sql = "insert into sorder (sale_order,order_date,cust_code,buyer_name,notify_to,item_ser,cust_pord,pord_date,sales_pers,tax_env,tax_date,"//11
+ "price_list,cr_term,site_code,curr_code,exch_rate,due_date,remarks,dlv_add1,dlv_add2,dlv_add3,dlv_city,state_code__dlv,"//23 + "price_list,cr_term,site_code,curr_code,exch_rate,due_date,remarks,dlv_add1,dlv_add2,dlv_add3,dlv_city,state_code__dlv,"//23
+ "count_code__dlv,dlv_pin,stan_code,tran_code,ord_amt,tax_amt,tot_amt,dlv_term,frt_amt,emp_code__ord,trans_mode,"//34 + "count_code__dlv,dlv_pin,stan_code,tran_code,ord_amt,tax_amt,tot_amt,dlv_term,frt_amt,emp_code__ord,trans_mode,"//34
+ "rcp_mode,dlv_to,acct_code__sal,tel1__dlv,tel2__dlv,tel3__dlv,fax__dlv,site_code__ship,pord_mode,udf__str1," //44 + "rcp_mode,dlv_to,acct_code__sal,tel1__dlv,tel2__dlv,tel3__dlv,fax__dlv,site_code__ship,pord_mode,udf__str1," //44
+ "order_type,cust_code__dlv,cust_code__bil,tax_opt,pl_date,confirmed,part_qty,status,status_date," //53 + "order_type,cust_code__dlv,cust_code__bil,tax_opt,pl_date,confirmed,part_qty,status,status_date," //53
+ "consume_fc,curr_code__frt,curr_code__comm,curr_code__ins,frt_term,order_mode,exch_rate__ins,exch_rate__frt," //61 + "consume_fc,curr_code__frt,curr_code__comm,curr_code__ins,frt_term,order_mode,exch_rate__ins,exch_rate__frt," //61
+ "cctr_code__sal,label_type,outside_inspection,exch_rate__comm,hazard_yn,price_list__clg,terr_code,order_status," //69 + "cctr_code__sal,label_type,outside_inspection,exch_rate__comm,hazard_yn,price_list__clg,terr_code,order_status," //69
+ "available_yn,single_lot,ship_status,chg_date,chg_user,chg_term,udf__str2,comm_perc,alloc_flag,inv_amt," + "available_yn,single_lot,ship_status,chg_date,chg_user,chg_term,udf__str2,comm_perc,alloc_flag,inv_amt,"
+ "adv_perc,comm_perc_1,comm_perc_2,udf__num1,udf__num2,ins_amt,max_order_value,chq_name,chq_amount," //88 + "adv_perc,comm_perc_1,comm_perc_2,udf__num1,udf__num2,ins_amt,max_order_value,chq_name,chq_amount," //88
+ "notify_term,ord_billback_amt,ord_offinv_amt,line_billback_amt,line_offinv_amt,pending_order," + "notify_term,ord_billback_amt,ord_offinv_amt,line_billback_amt,line_offinv_amt,pending_order,"
+ "net_tot_amt,tot_ord_value,dept_code) " //97 + "net_tot_amt,tot_ord_value,dept_code) " //97
+ "values (?,?,?,?,?,?,?,?,?,?," + "values (?,?,?,?,?,?,?,?,?,?,"
+ "?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,"
+ "?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,"
+ "?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,"
+ "?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,"
+ "?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,"
+ "?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,"
+"?,?,?,?,?,?,?,?,?,?," +"?,?,?,?,?,?,?,?,?,?,"
+"?,?,?,?,?,?,?,?,?,?, " +"?,?,?,?,?,?,?,?,?,?, "
+ "?,?,?,?,?,?,?)"; + "?,?,?,?,?,?,?)";
System.out.println("SQl123@----->>["+sql+"]"); System.out.println("SQl123@----->>["+sql+"]");
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -1221,7 +1221,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1221,7 +1221,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.setString(3,custCode); pstmt.setString(3,custCode);
pstmt.setString(4,buyerName); pstmt.setString(4,buyerName);
pstmt.setString(5,notifyTo); pstmt.setString(5,notifyTo);
pstmt.setString(6,itemSer); pstmt.setString(6,itemSer);
if(custPord != null && custPord.length() > 0) if(custPord != null && custPord.length() > 0)
{ {
...@@ -1235,7 +1235,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1235,7 +1235,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.setString(9,salesPers); pstmt.setString(9,salesPers);
pstmt.setString(10,taxEnv); pstmt.setString(10,taxEnv);
pstmt.setTimestamp(11, currDate); pstmt.setTimestamp(11, currDate);
pstmt.setString(12,priceList); pstmt.setString(12,priceList);
pstmt.setString(13,crTerm); pstmt.setString(13,crTerm);
pstmt.setString(14,siteCode); pstmt.setString(14,siteCode);
...@@ -1243,7 +1243,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1243,7 +1243,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.setDouble(16, exchRate); pstmt.setDouble(16, exchRate);
pstmt.setTimestamp(17, currDate); pstmt.setTimestamp(17, currDate);
pstmt.setString(18,remarks); pstmt.setString(18,remarks);
pstmt.setString(19,dlvAdd1); pstmt.setString(19,dlvAdd1);
pstmt.setString(20,dlvAdd2); pstmt.setString(20,dlvAdd2);
pstmt.setString(21,dlvAdd3); pstmt.setString(21,dlvAdd3);
...@@ -1251,33 +1251,33 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1251,33 +1251,33 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.setString(23,stateCodeDlv); pstmt.setString(23,stateCodeDlv);
pstmt.setString(24,counCodeDlv); pstmt.setString(24,counCodeDlv);
pstmt.setString(25,dlvPin); pstmt.setString(25,dlvPin);
pstmt.setString(26,stanCode); pstmt.setString(26,stanCode);
pstmt.setString(27,tranCode); pstmt.setString(27,tranCode);
pstmt.setDouble(28,ordAmt); pstmt.setDouble(28,ordAmt);
pstmt.setDouble(29,taxAmt); pstmt.setDouble(29,taxAmt);
pstmt.setDouble(30,totAmt); pstmt.setDouble(30,totAmt);
pstmt.setString(31,dlvTerm); pstmt.setString(31,dlvTerm);
pstmt.setDouble(32,frtAmt); pstmt.setDouble(32,frtAmt);
pstmt.setString(33,empCodeOrd); pstmt.setString(33,empCodeOrd);
pstmt.setString(34,transMode); pstmt.setString(34,transMode);
pstmt.setString(35,null); pstmt.setString(35,null);
pstmt.setString(36,dlvTo); pstmt.setString(36,dlvTo);
pstmt.setString(37,acctCodeSal); pstmt.setString(37,acctCodeSal);
pstmt.setString(38,tel1Dlv); pstmt.setString(38,tel1Dlv);
pstmt.setString(39,tel2Dlv); pstmt.setString(39,tel2Dlv);
pstmt.setString(40,tel3Dlv); pstmt.setString(40,tel3Dlv);
pstmt.setString(41,faxDlv); pstmt.setString(41,faxDlv);
pstmt.setString(42,siteCodeShip); pstmt.setString(42,siteCodeShip);
pstmt.setString(43,pordMode); pstmt.setString(43,pordMode);
pstmt.setString(44,udfStr1); //Old Sale order pstmt.setString(44,udfStr1); //Old Sale order
//other data //other data
pstmt.setString(45,"RP");//order_type pstmt.setString(45,"RP");//order_type
pstmt.setString(46,custCode);//cust_code__dlv pstmt.setString(46,custCode);//cust_code__dlv
pstmt.setString(47,custCode);//cust_code__bil pstmt.setString(47,custCode);//cust_code__bil
...@@ -1301,10 +1301,10 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1301,10 +1301,10 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.setString(64,"Y");//outside_inspection pstmt.setString(64,"Y");//outside_inspection
pstmt.setString(65,"0");//exch_rate__comm pstmt.setString(65,"0");//exch_rate__comm
pstmt.setString(66,"N");//hazard_yn pstmt.setString(66,"N");//hazard_yn
pstmt.setString(67,priceList);//price_list__clg pstmt.setString(67,priceList);//price_list__clg
pstmt.setString(68," ");//terr_code pstmt.setString(68," ");//terr_code
pstmt.setString(69,"O");//order_status pstmt.setString(69,"O");//order_status
...@@ -1328,7 +1328,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1328,7 +1328,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.setInt(83,0);//udf__num1 pstmt.setInt(83,0);//udf__num1
pstmt.setInt(84,0);//udf__num2 pstmt.setInt(84,0);//udf__num2
pstmt.setInt(85,0);//ins_amt pstmt.setInt(85,0);//ins_amt
pstmt.setInt(86,0);//max_order_value pstmt.setInt(86,0);//max_order_value
pstmt.setString(87,"DUMMY");//chq_name pstmt.setString(87,"DUMMY");//chq_name
...@@ -1339,15 +1339,15 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1339,15 +1339,15 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.setInt(92,0);//line_billback_amt pstmt.setInt(92,0);//line_billback_amt
pstmt.setInt(93,0);//line_offinv_amt pstmt.setInt(93,0);//line_offinv_amt
pstmt.setString(94,"N");//pending_order pstmt.setString(94,"N");//pending_order
pstmt.setDouble(95,totAmt); pstmt.setDouble(95,totAmt);
pstmt.setDouble(96,totOrdValue); pstmt.setDouble(96,totOrdValue);
pstmt.setString(97,deptCode);//dept_code pstmt.setString(97,deptCode);//dept_code
} }
int rowsHdr = pstmt.executeUpdate(); int rowsHdr = pstmt.executeUpdate();
System.out.println("sorder rowsHdr------->>"+rowsHdr); System.out.println("sorder rowsHdr------->>"+rowsHdr);
if(rs != null) if(rs != null)
...@@ -1360,15 +1360,15 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1360,15 +1360,15 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
} }
if(rowsHdr > 0) if(rowsHdr > 0)
{ {
double netTotAmtD = 0,ordValue=0; double netTotAmtD = 0,ordValue=0;
sql = "select line_no,site_code,item_flg,quantity,dsp_date,rate,discount,tax_amt,tax_env,net_amt,item_descr," sql = "select line_no,site_code,item_flg,quantity,dsp_date,rate,discount,tax_amt,tax_env,net_amt,item_descr,"
+ "item_code__ord,item_ser,hold_flag,unit,item_code,chg_date,chg_user,chg_term,conv__qty_stduom," + "item_code__ord,item_ser,hold_flag,unit,item_code,chg_date,chg_user,chg_term,conv__qty_stduom,"
+ "unit__rate,pack_code,quantity__fc,unit__std,quantity__stduom," + "unit__rate,pack_code,quantity__fc,unit__std,quantity__stduom,"
+ "conv__rtuom_stduom,status,status_date,no_art,rate__clg,rate__std,rate__stduom," //7 + "conv__rtuom_stduom,status,status_date,no_art,rate__clg,rate__std,rate__stduom," //7
+ "ord_value,min_shelf_life,max_shelf_life,comm_perc_1,comm_perc_on_1,comm_perc_on_2," //6 + "ord_value,min_shelf_life,max_shelf_life,comm_perc_1,comm_perc_on_1,comm_perc_on_2," //6
+ "comm_perc_3,comm_perc_on_3 ,item_ser__prom,over_ship_perc,sales_pers_comm_1," //5 + "comm_perc_3,comm_perc_on_3 ,item_ser__prom,over_ship_perc,sales_pers_comm_1," //5
...@@ -1386,12 +1386,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1386,12 +1386,12 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
itemFlag = checkNull(rs.getString("item_flg")); itemFlag = checkNull(rs.getString("item_flg"));
quantity = rs.getDouble("quantity"); quantity = rs.getDouble("quantity");
//dspSDate = rs/getTimestamp("dsp_date"); //dspSDate = rs/getTimestamp("dsp_date");
rate = rs.getDouble("rate"); rate = rs.getDouble("rate");
rateClg = rs.getDouble("rate__clg"); rateClg = rs.getDouble("rate__clg");
rateStd = rs.getDouble("rate__std"); rateStd = rs.getDouble("rate__std");
rateStdUom = rs.getDouble("rate__stduom"); rateStdUom = rs.getDouble("rate__stduom");
discount = rs.getDouble("discount"); discount = rs.getDouble("discount");
taxAmtD = rs.getDouble("tax_amt"); taxAmtD = rs.getDouble("tax_amt");
taxEnvD = checkNull(rs.getString("tax_env")); taxEnvD = checkNull(rs.getString("tax_env"));
...@@ -1408,67 +1408,67 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1408,67 +1408,67 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
packCode = checkNull(rs.getString("pack_code")); packCode = checkNull(rs.getString("pack_code"));
quantityFc = rs.getDouble("quantity__fc"); quantityFc = rs.getDouble("quantity__fc");
unitStd = checkNull(rs.getString("unit__std")); unitStd = checkNull(rs.getString("unit__std"));
quantityStduom = rs.getDouble("quantity__stduom"); quantityStduom = rs.getDouble("quantity__stduom");
convRtuomStduom = rs.getDouble("conv__rtuom_stduom"); convRtuomStduom = rs.getDouble("conv__rtuom_stduom");
netTotAmtD = rs.getDouble("net_tot_amt"); netTotAmtD = rs.getDouble("net_tot_amt");
ordValue = rs.getDouble("ord_value"); ordValue = rs.getDouble("ord_value");
sql="insert into sorddet (sale_order,line_no,site_code,item_flg,quantity,dsp_date,rate,discount,tax_amt,tax_env,net_amt," //11 sql="insert into sorddet (sale_order,line_no,site_code,item_flg,quantity,dsp_date,rate,discount,tax_amt,tax_env,net_amt," //11
+ "item_descr,item_code__ord,item_ser,hold_flag,unit,item_code,chg_date,chg_user,chg_term, " //20 + "item_descr,item_code__ord,item_ser,hold_flag,unit,item_code,chg_date,chg_user,chg_term, " //20
+"conv__qty_stduom,unit__rate,pack_code,quantity__fc,unit__std,quantity__stduom," //26 +"conv__qty_stduom,unit__rate,pack_code,quantity__fc,unit__std,quantity__stduom," //26
+ "conv__rtuom_stduom,status,status_date,no_art,rate__clg,rate__std,rate__stduom," //33 + "conv__rtuom_stduom,status,status_date,no_art,rate__clg,rate__std,rate__stduom," //33
+ "ord_value,min_shelf_life,max_shelf_life,comm_perc_1,comm_perc_on_1,comm_perc_on_2," //6 + "ord_value,min_shelf_life,max_shelf_life,comm_perc_1,comm_perc_on_1,comm_perc_on_2," //6
+ "comm_perc_3,comm_perc_on_3 ,item_ser__prom,over_ship_perc,sales_pers_comm_1," //5 + "comm_perc_3,comm_perc_on_3 ,item_ser__prom,over_ship_perc,sales_pers_comm_1," //5
+ "sales_pers_comm_2,sales_pers_comm_3,loc_type,nature," //7 + "sales_pers_comm_2,sales_pers_comm_3,loc_type,nature," //7
+ "billback_amt,offinv_amt,appl_seg,net_tot_amt ) " //2 + "billback_amt,offinv_amt,appl_seg,net_tot_amt ) " //2
+ "values(?,?,?,?,?,?,?,?,?,?," + "values(?,?,?,?,?,?,?,?,?,?,"
+ "?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,"
+"?,?,?,?,?,?,?,?,?,?," +"?,?,?,?,?,?,?,?,?,?,"
+"?,?,?,?,?,?,?,?,?,?," +"?,?,?,?,?,?,?,?,?,?,"
+"?,?,?,?,?,?,?,?,?,?,?,?)"; //52 +"?,?,?,?,?,?,?,?,?,?,?,?)"; //52
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, saleOrderNew); pstmt1.setString(1, saleOrderNew);
pstmt1.setString(2, lineNoSord); pstmt1.setString(2, lineNoSord);
pstmt1.setString(3, siteCodeD); pstmt1.setString(3, siteCodeD);
pstmt1.setString(4, itemFlag); pstmt1.setString(4, itemFlag);
pstmt1.setDouble(5, quantity); pstmt1.setDouble(5, quantity);
pstmt1.setTimestamp(6, currDate); //dsp_date pstmt1.setTimestamp(6, currDate); //dsp_date
pstmt1.setDouble(7, rate); pstmt1.setDouble(7, rate);
pstmt1.setDouble(8, discount); pstmt1.setDouble(8, discount);
pstmt1.setDouble(9, taxAmtD); pstmt1.setDouble(9, taxAmtD);
pstmt1.setString(10, taxEnvD); pstmt1.setString(10, taxEnvD);
pstmt1.setDouble(11, netAmt); pstmt1.setDouble(11, netAmt);
pstmt1.setString(12, itemDescr); pstmt1.setString(12, itemDescr);
pstmt1.setString(13, itemCodeOrd); pstmt1.setString(13, itemCodeOrd);
pstmt1.setString(14, itemSer); pstmt1.setString(14, itemSer);
pstmt1.setString(15, holdFlag); pstmt1.setString(15, holdFlag);
pstmt1.setString(16, unit); pstmt1.setString(16, unit);
pstmt1.setString(17, itemCode); pstmt1.setString(17, itemCode);
pstmt1.setTimestamp(18, currDate); //chgDate pstmt1.setTimestamp(18, currDate); //chgDate
pstmt1.setString(19, chgUser); pstmt1.setString(19, chgUser);
pstmt1.setString(20, chgTerm); pstmt1.setString(20, chgTerm);
pstmt1.setDouble(21, convQtyStduom); pstmt1.setDouble(21, convQtyStduom);
pstmt1.setString(22, unitRate); pstmt1.setString(22, unitRate);
pstmt1.setString(23, packCode); pstmt1.setString(23, packCode);
pstmt1.setDouble(24, quantityFc); pstmt1.setDouble(24, quantityFc);
pstmt1.setString(25, unitStd); pstmt1.setString(25, unitStd);
pstmt1.setDouble(26, quantityStduom); pstmt1.setDouble(26, quantityStduom);
pstmt1.setDouble(27, convRtuomStduom); pstmt1.setDouble(27, convRtuomStduom);
pstmt1.setString(28,"N");//status pstmt1.setString(28,"N");//status
pstmt1.setTimestamp(29,currDate);//status_date pstmt1.setTimestamp(29,currDate);//status_date
pstmt1.setString(30,"1");//no_art pstmt1.setString(30,"1");//no_art
...@@ -1493,15 +1493,15 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1493,15 +1493,15 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt1.setInt(45,0);//sales_pers_comm_2 pstmt1.setInt(45,0);//sales_pers_comm_2
pstmt1.setInt(46,0);//sales_pers_comm_3 pstmt1.setInt(46,0);//sales_pers_comm_3
pstmt1.setString(47,"N");//loc_type pstmt1.setString(47,"N");//loc_type
pstmt1.setString(48,"C");//nature pstmt1.setString(48,"C");//nature
pstmt1.setInt(49,0);//billback_amt pstmt1.setInt(49,0);//billback_amt
pstmt1.setInt(50,0);//offinv_amt pstmt1.setInt(50,0);//offinv_amt
pstmt1.setString(51,"0");//appl_seg pstmt1.setString(51,"0");//appl_seg
pstmt1.setDouble(52,netTotAmtD); pstmt1.setDouble(52,netTotAmtD);
int rows=pstmt1.executeUpdate(); int rows=pstmt1.executeUpdate();
System.out.println("rows in detail ----["+rows+"]"); System.out.println("rows in detail ----["+rows+"]");
if(pstmt1 != null) if(pstmt1 != null)
...@@ -1513,11 +1513,11 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1513,11 +1513,11 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
{ {
return "Success"; return "Success";
} }
} }
} }
} //end sale order condition } //end sale order condition
...@@ -1547,40 +1547,41 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1547,40 +1547,41 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
} }
return "Error"; return "Error";
} }
private String saveSaleOrderDataNew (Map <String,String>sreturnDetailMap,Connection conn) throws ITMException,Exception private String saveSaleOrderDataNew (Map <String,String>sreturnDetailMap,Connection conn) throws ITMException,Exception
{ {
System.out.println("-----------in saveSaleOrderDataNew-----------------------"); System.out.println("-----------in saveSaleOrderDataNew-----------------------");
String sql ="",saleOrder = "",applDate = "",dbDate = "",saleOrderNew = "",chgUser = "",chgTerm = "",saleOrderOld = ""; String sql ="",saleOrder = "",applDate = "",dbDate = "",saleOrderNew = "",chgUser = "",chgTerm = "",saleOrderOld = "";
ResultSet rs = null,rs1 = null; ResultSet rs = null,rs1 = null;
PreparedStatement pstmt = null,pstmt1 = null; PreparedStatement pstmt = null,pstmt1 = null;
applDate = genericUtility.getApplDateFormat(); applDate = genericUtility.getApplDateFormat();
dbDate = genericUtility.getDBDateFormat(); dbDate = genericUtility.getDBDateFormat();
String tranId = "",siteCode = "",xtraParams = ""; String tranId = "",siteCode = "",xtraParams = "", invoiceId = "";
String custCode = "",buyerName = "",notifyTo = "",itemSer = "",custPord = "",salesPers = "",taxEnv = "",priceList = "", String custCode = "",buyerName = "",notifyTo = "",itemSer = "",custPord = "",salesPers = "",taxEnv = "",priceList = "",
crTerm = "",remarks = "",dlvAdd1 = "",dlvAdd2 = "",dlvAdd3 = "",dlvCity = "",stateCodeDlv = "",counCodeDlv = "", crTerm = "",remarks = "",dlvAdd1 = "",dlvAdd2 = "",dlvAdd3 = "",dlvCity = "",stateCodeDlv = "",counCodeDlv = "",
tranCode = "",dlvTerm = "",empCodeOrd = "",transMode = "",rcpMode = "",dlvTo = "",currCode = "",dlvPin = "", tranCode = "",dlvTerm = "",empCodeOrd = "",transMode = "",rcpMode = "",dlvTo = "",currCode = "",dlvPin = "",
acctCodeSal = "",tel1Dlv = "",tel2Dlv = "",tel3Dlv = "",faxDlv = "",siteCodeShip = "",pordMode = "",udfStr1 = "", acctCodeSal = "",tel1Dlv = "",tel2Dlv = "",tel3Dlv = "",faxDlv = "",siteCodeShip = "",pordMode = "",udfStr1 = "",
orderType = "",stanCode = "",deptCode = "",custSpecNo = "",specRef = ""; orderType = "",stanCode = "",deptCode = "",custSpecNo = "",specRef = "";
String lineNoSord = "",siteCodeD = "",itemFlag = "",taxEnvD = "",itemDescr = "",unitRate = "",packCode = "", String lineNoSord = "",siteCodeD = "",itemFlag = "",taxEnvD = "",itemDescr = "",unitRate = "",packCode = "",
unitStd = "",itemSerD = "",holdFlag = "",itemCodeOrd = "",unit = "",itemCode = ""; unitStd = "",itemSerD = "",holdFlag = "",itemCodeOrd = "",unit = "",itemCode = "";
String chqName = "",currCodeIns = "",currCodeFrt = ""; String chqName = "",currCodeIns = "",currCodeFrt = "";
double chqAmount = 0,exchRateIns = 0; double chqAmount = 0,exchRateIns = 0;
double quantity = 0,rate = 0,discount = 0,taxAmtD = 0,netAmt = 0,convQtyStduom = 0,quantityFc = 0,quantityStduom = 0, double quantity = 0,rate = 0,discount = 0,taxAmtD = 0,netAmt = 0,convQtyStduom = 0,quantityFc = 0,quantityStduom = 0,
convRtuomStduom = 0,rateStdUom = 0,rateStd = 0,rateClg = 0,netTotAmt = 0,totOrdValue = 0; convRtuomStduom = 0,rateStdUom = 0,rateStd = 0,rateClg = 0,netTotAmt = 0,totOrdValue = 0;
double exchRate = 0,ordAmt = 0,taxAmt = 0,totAmt = 0,frtAmt = 0; double exchRate = 0,ordAmt = 0,taxAmt = 0,totAmt = 0,frtAmt = 0;
java.sql.Timestamp orderDate = null,pordDate = null,taxDate = null,currDate = null; java.sql.Timestamp orderDate = null,pordDate = null,taxDate = null,currDate = null;
StringBuffer xmlBuffer = new StringBuffer(); StringBuffer xmlBuffer = new StringBuffer();
tranId = sreturnDetailMap.get("TRAN_ID"); tranId = sreturnDetailMap.get("TRAN_ID");
siteCode = sreturnDetailMap.get("SITE_CODE"); siteCode = sreturnDetailMap.get("SITE_CODE");
invoiceId = sreturnDetailMap.get("INVOICE_ID");
xtraParams = sreturnDetailMap.get("XTRA_PARAM"); xtraParams = sreturnDetailMap.get("XTRA_PARAM");
chgUser = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode")); chgUser = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginCode"));
chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId")); chgTerm = checkNull(genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
try try
{ {
currDate = getCurrtDate(); currDate = getCurrtDate();
...@@ -1601,25 +1602,25 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1601,25 +1602,25 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
saleOrder = saleOrder == null ? "" : saleOrder.trim(); saleOrder = saleOrder == null ? "" : saleOrder.trim();
if(saleOrder.length() > 0) if(saleOrder.length() > 0)
{ {
saleOrderNew = generateTranId( "w_sorder", siteCode, conn ); saleOrderNew = generateTranId( "w_sorder", siteCode, conn );
System.out.println("saleOrderNew ---------->>["+saleOrderNew+"]"); System.out.println("saleOrderNew ---------->>["+saleOrderNew+"]");
sql = "select sale_order,order_date,cust_code,buyer_name,notify_to,item_ser,cust_pord,pord_date,sales_pers,tax_env,tax_date,"//11 sql = "select sale_order,order_date,cust_code,buyer_name,notify_to,item_ser,cust_pord,pord_date,sales_pers,tax_env,tax_date,"//11
+ "price_list,cr_term,site_code,curr_code,exch_rate,due_date,remarks,dlv_add1,dlv_add2,dlv_add3,dlv_city,state_code__dlv,"//23 + "price_list,cr_term,site_code,curr_code,exch_rate,due_date,remarks,dlv_add1,dlv_add2,dlv_add3,dlv_city,state_code__dlv,"//23
+ "count_code__dlv,dlv_pin,stan_code,tran_code,ord_amt,tax_amt,tot_amt,dlv_term,frt_amt,emp_code__ord,trans_mode,"//34 + "count_code__dlv,dlv_pin,stan_code,tran_code,ord_amt,tax_amt,tot_amt,dlv_term,frt_amt,emp_code__ord,trans_mode,"//34
+ "rcp_mode,dlv_to,acct_code__sal,tel1__dlv,tel2__dlv,tel3__dlv,fax__dlv,site_code__ship,pord_mode,udf__str1," //44 + "rcp_mode,dlv_to,acct_code__sal,tel1__dlv,tel2__dlv,tel3__dlv,fax__dlv,site_code__ship,pord_mode,udf__str1," //44
+ "order_type,cust_code__dlv,cust_code__bil,tax_opt,pl_date,confirmed,part_qty,status,status_date," //53 + "order_type,cust_code__dlv,cust_code__bil,tax_opt,pl_date,confirmed,part_qty,status,status_date," //53
+ "consume_fc,curr_code__frt,curr_code__comm,curr_code__ins,frt_term,order_mode,exch_rate__ins,exch_rate__frt," //61 + "consume_fc,curr_code__frt,curr_code__comm,curr_code__ins,frt_term,order_mode,exch_rate__ins,exch_rate__frt," //61
+ "cctr_code__sal,label_type,outside_inspection,exch_rate__comm,hazard_yn,price_list__clg,terr_code,order_status," //69 + "cctr_code__sal,label_type,outside_inspection,exch_rate__comm,hazard_yn,price_list__clg,terr_code,order_status," //69
+ "available_yn,single_lot,ship_status,chg_date,chg_user,chg_term,udf__str2,comm_perc,alloc_flag,inv_amt," + "available_yn,single_lot,ship_status,chg_date,chg_user,chg_term,udf__str2,comm_perc,alloc_flag,inv_amt,"
+ "adv_perc,comm_perc_1,comm_perc_2,udf__num1,udf__num2,ins_amt,max_order_value,chq_name,chq_amount," //88 + "adv_perc,comm_perc_1,comm_perc_2,udf__num1,udf__num2,ins_amt,max_order_value,chq_name,chq_amount," //88
+ "notify_term,ord_billback_amt,ord_offinv_amt,line_billback_amt,line_offinv_amt,pending_order,user_remarks," + "notify_term,ord_billback_amt,ord_offinv_amt,line_billback_amt,line_offinv_amt,pending_order,user_remarks,"
+ "net_tot_amt,tot_ord_value,dept_code " //98 + "net_tot_amt,tot_ord_value,dept_code " //98
+ "from sorder where sale_order = ?"; + "from sorder where sale_order = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder); pstmt.setString(1, saleOrder);
...@@ -1639,7 +1640,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1639,7 +1640,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
salesPers = checkNull(rs.getString("sales_pers")); salesPers = checkNull(rs.getString("sales_pers"));
taxEnv = checkNull(rs.getString("tax_env")); taxEnv = checkNull(rs.getString("tax_env"));
taxDate = rs.getTimestamp("tax_date");// taxDate = rs.getTimestamp("tax_date");//
priceList = checkNull(rs.getString("price_list")); priceList = checkNull(rs.getString("price_list"));
crTerm = checkNull(rs.getString("cr_term")); crTerm = checkNull(rs.getString("cr_term"));
siteCode = checkNull(rs.getString("site_code")); siteCode = checkNull(rs.getString("site_code"));
...@@ -1750,7 +1751,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1750,7 +1751,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
//xmlBuffer.append("<chg_user>").append("<![CDATA[").append(currDate).append("]]></chg_user>\r\n"); //xmlBuffer.append("<chg_user>").append("<![CDATA[").append(currDate).append("]]></chg_user>\r\n");
//xmlBuffer.append("<chg_term>").append("<![CDATA[").append(currDate).append("]]></chg_term>\r\n"); //xmlBuffer.append("<chg_term>").append("<![CDATA[").append(currDate).append("]]></chg_term>\r\n");
xmlBuffer.append("<udf__str1>").append("<![CDATA[").append(saleOrderOld).append("]]></udf__str1>\r\n"); xmlBuffer.append("<udf__str1>").append("<![CDATA[").append(saleOrderOld).append("]]></udf__str1>\r\n");
//xmlBuffer.append("<udf__str2>").append("<![CDATA[").append(currDate).append("]]></udf__str2>\r\n"); //xmlBuffer.append("<udf__str2>").append("<![CDATA[").append(currDate).append("]]></udf__str2>\r\n");
xmlBuffer.append("<dlv_term>").append("<![CDATA[").append("NA").append("]]></dlv_term>\r\n"); xmlBuffer.append("<dlv_term>").append("<![CDATA[").append("NA").append("]]></dlv_term>\r\n");
...@@ -1780,8 +1781,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1780,8 +1781,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
xmlBuffer.append("<tel1__dlv>").append("<![CDATA[").append(tel1Dlv).append("]]></tel1__dlv>\r\n"); xmlBuffer.append("<tel1__dlv>").append("<![CDATA[").append(tel1Dlv).append("]]></tel1__dlv>\r\n");
xmlBuffer.append("<tel2__dlv>").append("<![CDATA[").append(tel2Dlv).append("]]></tel2__dlv>\r\n"); xmlBuffer.append("<tel2__dlv>").append("<![CDATA[").append(tel2Dlv).append("]]></tel2__dlv>\r\n");
xmlBuffer.append("<fax__dlv>").append("<![CDATA[").append(faxDlv).append("]]></fax__dlv>\r\n"); xmlBuffer.append("<fax__dlv>").append("<![CDATA[").append(faxDlv).append("]]></fax__dlv>\r\n");
//xmlBuffer.append("<email_addr>").append("<![CDATA[").append(email).append("]]></email_addr>\r\n"); //xmlBuffer.append("<email_addr>").append("<![CDATA[").append(email).append("]]></email_addr>\r\n");
xmlBuffer.append("<tot_ord_value>").append("<![CDATA[").append(totOrdValue).append("]]></tot_ord_value>\r\n"); xmlBuffer.append("<tot_ord_value>").append("<![CDATA[").append(totOrdValue).append("]]></tot_ord_value>\r\n");
xmlBuffer.append("<site_code__ship>").append("<![CDATA[").append(siteCodeShip).append("]]></site_code__ship>\r\n"); xmlBuffer.append("<site_code__ship>").append("<![CDATA[").append(siteCodeShip).append("]]></site_code__ship>\r\n");
...@@ -1821,7 +1822,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1821,7 +1822,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
double netTotAmtD = 0,ordValue=0; double netTotAmtD = 0,ordValue=0;
int domId = 0; int domId = 0;
sql = "select line_no,site_code,item_flg,quantity,dsp_date,rate,discount,tax_amt,tax_env,net_amt,item_descr," /*sql = "select line_no,site_code,item_flg,quantity,dsp_date,rate,discount,tax_amt,tax_env,net_amt,item_descr,"
+ "item_code__ord,item_ser,hold_flag,unit,item_code,chg_date,chg_user,chg_term,conv__qty_stduom," + "item_code__ord,item_ser,hold_flag,unit,item_code,chg_date,chg_user,chg_term,conv__qty_stduom,"
+ "unit__rate,pack_code,quantity__fc,unit__std,quantity__stduom," + "unit__rate,pack_code,quantity__fc,unit__std,quantity__stduom,"
+ "conv__rtuom_stduom,status,status_date,no_art,rate__clg,rate__std,rate__stduom," //7 + "conv__rtuom_stduom,status,status_date,no_art,rate__clg,rate__std,rate__stduom," //7
...@@ -1829,9 +1830,23 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1829,9 +1830,23 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
+ "ord_value,min_shelf_life,max_shelf_life,comm_perc_1,comm_perc_on_1,comm_perc_on_2," //6 + "ord_value,min_shelf_life,max_shelf_life,comm_perc_1,comm_perc_on_1,comm_perc_on_2," //6
+ "comm_perc_3,comm_perc_on_3 ,item_ser__prom,over_ship_perc,sales_pers_comm_1," //5 + "comm_perc_3,comm_perc_on_3 ,item_ser__prom,over_ship_perc,sales_pers_comm_1," //5
+ "sales_pers_comm_2,sales_pers_comm_3,loc_type,nature,net_tot_amt," //7 + "sales_pers_comm_2,sales_pers_comm_3,loc_type,nature,net_tot_amt," //7
+ "billback_amt,offinv_amt,cust_spec__no,spec_ref from sorddet where sale_order = ?"; + "billback_amt,offinv_amt,cust_spec__no,spec_ref from sorddet where sale_order = ?";*/
sql = "SELECT S.LINE_NO,S.SITE_CODE,S.ITEM_FLG,S.QUANTITY,S.DSP_DATE,S.RATE,S.DISCOUNT,S.TAX_AMT,S.TAX_ENV,S.NET_AMT,S.ITEM_DESCR, "
+ "S.ITEM_CODE__ORD,S.ITEM_SER,S.HOLD_FLAG,S.UNIT,S.ITEM_CODE,S.CHG_DATE,S.CHG_USER,S.CHG_TERM,S.CONV__QTY_STDUOM, "
+ "S.UNIT__RATE,S.PACK_CODE,S.QUANTITY__FC,S.UNIT__STD,S.QUANTITY__STDUOM, "
+ "S.CONV__RTUOM_STDUOM,S.STATUS,S.STATUS_DATE,S.NO_ART,S.RATE__CLG,S.RATE__STD,S.RATE__STDUOM, "
+ "S.ORD_VALUE,S.MIN_SHELF_LIFE,S.MAX_SHELF_LIFE,S.COMM_PERC_1,S.COMM_PERC_ON_1,S.COMM_PERC_ON_2, "
+ "S.COMM_PERC_3,S.COMM_PERC_ON_3 ,S.ITEM_SER__PROM,S.OVER_SHIP_PERC,S.SALES_PERS_COMM_1, "
+ "S.SALES_PERS_COMM_2,S.SALES_PERS_COMM_3,S.LOC_TYPE,S.NATURE,S.NET_TOT_AMT, "
+ "S.BILLBACK_AMT,S.OFFINV_AMT,S.CUST_SPEC__NO,S.SPEC_REF "
+ "FROM SORDDET S, INVOICE_TRACE I, SRETURNDET SR "
+ "WHERE S.LINE_NO = I.SORD_LINE_NO AND SR.LINE_NO__INV = I.LINE_NO AND "
+ "S.SALE_ORDER = ? AND SR.TRAN_ID = ? AND I.INVOICE_ID = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder); pstmt.setString(1, saleOrder);
pstmt.setString(2, tranId);
pstmt.setString(3, invoiceId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
while(rs.next()) while(rs.next())
{ {
...@@ -1875,61 +1890,61 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1875,61 +1890,61 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
netTotAmtD = rs.getDouble("net_tot_amt"); netTotAmtD = rs.getDouble("net_tot_amt");
ordValue = rs.getDouble("ord_value"); ordValue = rs.getDouble("ord_value");
xmlBuffer.append("<Detail2 objContext =\"2\"").append(" objName=\"upload_sorder\" domID= \"1\" dbID=\"\">"); xmlBuffer.append("<Detail2 objContext =\"2\"").append(" objName=\"upload_sorder\" domID= \"1\" dbID=\"\">");
xmlBuffer.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>"); xmlBuffer.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
xmlBuffer.append("<sale_order><![CDATA[").append(saleOrderNew).append("]]></sale_order>"); xmlBuffer.append("<sale_order><![CDATA[").append(saleOrderNew).append("]]></sale_order>");
xmlBuffer.append("<line_no><![CDATA[").append(lineNoSord).append("]]></line_no>"); xmlBuffer.append("<line_no><![CDATA[").append(lineNoSord).append("]]></line_no>");
xmlBuffer.append("<site_code><![CDATA[").append(siteCodeD).append("]]></site_code>"); xmlBuffer.append("<site_code><![CDATA[").append(siteCodeD).append("]]></site_code>");
xmlBuffer.append("<item_flg><![CDATA[").append("I").append("]]></item_flg>"); xmlBuffer.append("<item_flg><![CDATA[").append("I").append("]]></item_flg>");
xmlBuffer.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>"); xmlBuffer.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>");
xmlBuffer.append("<dsp_date><![CDATA[").append(currDateStr).append("]]></dsp_date>"); xmlBuffer.append("<dsp_date><![CDATA[").append(currDateStr).append("]]></dsp_date>");
xmlBuffer.append("<rate><![CDATA[").append(rate).append("]]></rate>"); xmlBuffer.append("<rate><![CDATA[").append(rate).append("]]></rate>");
xmlBuffer.append("<discount><![CDATA[").append(discount).append("]]></discount>"); xmlBuffer.append("<discount><![CDATA[").append(discount).append("]]></discount>");
//xmlBuffer.append("<tax_amt><![CDATA[").append(saleOrderNew).append("]]></tax_amt>"); //xmlBuffer.append("<tax_amt><![CDATA[").append(saleOrderNew).append("]]></tax_amt>");
xmlBuffer.append("<tax_env><![CDATA[").append(taxEnvD).append("]]></tax_env>"); xmlBuffer.append("<tax_env><![CDATA[").append(taxEnvD).append("]]></tax_env>");
xmlBuffer.append("<net_amt><![CDATA[").append(netAmt).append("]]></net_amt>"); xmlBuffer.append("<net_amt><![CDATA[").append(netAmt).append("]]></net_amt>");
xmlBuffer.append("<item_code__ord><![CDATA[").append(itemCodeOrd).append("]]></item_code__ord>"); xmlBuffer.append("<item_code__ord><![CDATA[").append(itemCodeOrd).append("]]></item_code__ord>");
xmlBuffer.append("<item_descr><![CDATA[").append(itemDescr).append("]]></item_descr>"); xmlBuffer.append("<item_descr><![CDATA[").append(itemDescr).append("]]></item_descr>");
// //
xmlBuffer.append("<conv__qty_stduom><![CDATA[").append(convQtyStduom).append("]]></conv__qty_stduom>"); xmlBuffer.append("<conv__qty_stduom><![CDATA[").append(convQtyStduom).append("]]></conv__qty_stduom>");
xmlBuffer.append("<conv__rtuom_stduom><![CDATA[").append(convRtuomStduom).append("]]></conv__rtuom_stduom>"); xmlBuffer.append("<conv__rtuom_stduom><![CDATA[").append(convRtuomStduom).append("]]></conv__rtuom_stduom>");
xmlBuffer.append("<unit__rate><![CDATA[").append(unitRate).append("]]></unit__rate>"); xmlBuffer.append("<unit__rate><![CDATA[").append(unitRate).append("]]></unit__rate>");
xmlBuffer.append("<unit__std><![CDATA[").append(unitStd).append("]]></unit__std>"); xmlBuffer.append("<unit__std><![CDATA[").append(unitStd).append("]]></unit__std>");
xmlBuffer.append("<quantity__stduom><![CDATA[").append(quantityStduom).append("]]></quantity__stduom>"); xmlBuffer.append("<quantity__stduom><![CDATA[").append(quantityStduom).append("]]></quantity__stduom>");
xmlBuffer.append("<rate__clg><![CDATA[").append(rateClg).append("]]></rate__clg>"); xmlBuffer.append("<rate__clg><![CDATA[").append(rateClg).append("]]></rate__clg>");
xmlBuffer.append("<rate__std><![CDATA[").append(rateStd).append("]]></rate__std>"); xmlBuffer.append("<rate__std><![CDATA[").append(rateStd).append("]]></rate__std>");
xmlBuffer.append("<rate__stduom><![CDATA[").append(rateStdUom).append("]]></rate__stduom>"); xmlBuffer.append("<rate__stduom><![CDATA[").append(rateStdUom).append("]]></rate__stduom>");
xmlBuffer.append("<item_descr><![CDATA[").append(itemDescr).append("]]></item_descr>"); xmlBuffer.append("<item_descr><![CDATA[").append(itemDescr).append("]]></item_descr>");
//xmlBuffer.append("<item_descr><![CDATA[").append(saleOrderNew).append("]]></item_descr>"); //xmlBuffer.append("<item_descr><![CDATA[").append(saleOrderNew).append("]]></item_descr>");
xmlBuffer.append("<item_ser><![CDATA[").append(itemSerD).append("]]></item_ser>"); xmlBuffer.append("<item_ser><![CDATA[").append(itemSerD).append("]]></item_ser>");
xmlBuffer.append("<hold_flag><![CDATA[").append("N").append("]]></hold_flag>"); xmlBuffer.append("<hold_flag><![CDATA[").append("N").append("]]></hold_flag>");
xmlBuffer.append("<appl_seg><![CDATA[").append("0").append("]]></appl_seg>"); xmlBuffer.append("<appl_seg><![CDATA[").append("0").append("]]></appl_seg>");
//xmlBuffer.append("<cust_spec__no><![CDATA[").append(custSpecNo).append("]]></cust_spec__no>"); //xmlBuffer.append("<cust_spec__no><![CDATA[").append(custSpecNo).append("]]></cust_spec__no>");
//xmlBuffer.append("<price_list_disc><![CDATA[").append(saleOrderNew).append("]]></price_list_disc>"); //xmlBuffer.append("<price_list_disc><![CDATA[").append(saleOrderNew).append("]]></price_list_disc>");
xmlBuffer.append("<loc_type><![CDATA[").append("N").append("]]></loc_type>"); xmlBuffer.append("<loc_type><![CDATA[").append("N").append("]]></loc_type>");
xmlBuffer.append("<nature><![CDATA[").append("C").append("]]></nature>"); xmlBuffer.append("<nature><![CDATA[").append("C").append("]]></nature>");
xmlBuffer.append("<no_art><![CDATA[").append("1").append("]]></no_art>"); xmlBuffer.append("<no_art><![CDATA[").append("1").append("]]></no_art>");
xmlBuffer.append("<unit><![CDATA[").append(unit).append("]]></unit>"); xmlBuffer.append("<unit><![CDATA[").append(unit).append("]]></unit>");
xmlBuffer.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>"); xmlBuffer.append("<item_code><![CDATA[").append(itemCode).append("]]></item_code>");
xmlBuffer.append("<spec_ref><![CDATA[").append(specRef).append("]]></spec_ref>"); xmlBuffer.append("<spec_ref><![CDATA[").append(specRef).append("]]></spec_ref>");
xmlBuffer.append("</Detail2>"); xmlBuffer.append("</Detail2>");
} }
xmlBuffer.append("</Header0>"); xmlBuffer.append("</Header0>");
xmlBuffer.append("</group0>"); xmlBuffer.append("</group0>");
xmlBuffer.append("</DocumentRoot>"); xmlBuffer.append("</DocumentRoot>");
if(xmlBuffer!=null && xmlBuffer.length() > 0) if(xmlBuffer!=null && xmlBuffer.length() > 0)
{ {
System.out.println("Before save Data------->>["+xmlBuffer.toString()+"]"); System.out.println("Before save Data------->>["+xmlBuffer.toString()+"]");
...@@ -1975,8 +1990,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -1975,8 +1990,8 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
} }
return "Error"; return "Error";
} }
private String generateTranId(String windowName,String siteCode, Connection conn )throws ITMException,Exception private String generateTranId(String windowName,String siteCode, Connection conn )throws ITMException,Exception
{ {
...@@ -2053,7 +2068,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -2053,7 +2068,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
} }
return tranId; return tranId;
} }
private String checkNull(String input) private String checkNull(String input)
{ {
...@@ -2330,7 +2345,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -2330,7 +2345,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
return payables; return payables;
} }
private String saveData(String siteCode, String xmlString, Connection conn) throws ITMException, Exception private String saveData(String siteCode, String xmlString, Connection conn) throws ITMException, Exception
{ {
...@@ -2375,14 +2390,14 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -2375,14 +2390,14 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
String newKeystring = "",tranSer1 = "",keyString = "",keyCol = ""; String newKeystring = "",tranSer1 = "",keyString = "",keyCol = "";
CommonConstants commonConstants = new CommonConstants(); CommonConstants commonConstants = new CommonConstants();
try try
{ {
sql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ?"; sql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, windowName); pstmt.setString(1, windowName);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
System.out.println("keyString :"+sql); System.out.println("keyString :"+sql);
if (rs.next()) if (rs.next())
{ {
keyString = rs.getString(1); keyString = rs.getString(1);
...@@ -2407,7 +2422,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -2407,7 +2422,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
rs = null; rs = null;
pstmt.close(); pstmt.close();
pstmt = null; pstmt = null;
System.out.println("keyString :"+keyString); System.out.println("keyString :"+keyString);
System.out.println("keyCol :"+keyCol); System.out.println("keyCol :"+keyCol);
System.out.println("tranSer1 :"+tranSer1); System.out.println("tranSer1 :"+tranSer1);
...@@ -2438,7 +2453,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf ...@@ -2438,7 +2453,7 @@ public class SalesReturnConf extends ActionHandlerEJB implements SalesReturnConf
e.printStackTrace(); e.printStackTrace();
throw new ITMException(e); throw new ITMException(e);
} }
return tranId; return tranId;
} }
private java.sql.Timestamp getCurrtDate() throws RemoteException,ITMException private java.sql.Timestamp getCurrtDate() throws RemoteException,ITMException
......
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