Skip to content

B
business-java
Commit 16f63ec2 authored by sshinde's avatar sshinde
Browse files
Options

call logic for asset installation 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93645 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 00097747
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 105 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ 16f63ec2
...@@ -1204,7 +1204,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -1204,7 +1204,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
// suppLockList // suppLockList
// itemLockList // itemLockList
// lockCodeWiseMap // lockCodeWiseMap
tempLockGroup = null; tempLockGroup = null;
sql = "select lock_group " sql = "select lock_group "
+ " from supplieritem " + " from supplieritem "
...@@ -1543,6 +1542,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -1543,6 +1542,9 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
stkUpdMap.put("no_art",Double.toString(noArt)); stkUpdMap.put("no_art",Double.toString(noArt));
stkUpdMap.put("site_code",siteRcp); stkUpdMap.put("site_code",siteRcp);
stkUpdMap.put("loc_code",locCode); stkUpdMap.put("loc_code",locCode);
System.out.println("Lot No="+lotNo);
stkUpdMap.put("lot_no",lotNo); stkUpdMap.put("lot_no",lotNo);
stkUpdMap.put("lot_sl",lotSl); stkUpdMap.put("lot_sl",lotSl);
stkUpdMap.put("unit",unit); stkUpdMap.put("unit",unit);
...@@ -4366,7 +4368,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4366,7 +4368,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1.setString(1,purcOrderTemp); pstmt1.setString(1,purcOrderTemp);
pstmt1.setString(2,lnoOrdTemp); pstmt1.setString(2,lnoOrdTemp);
rs1=pstmt1.executeQuery(); rs1=pstmt1.executeQuery();
if(rs1.next()) if(rs1.next())
{ {
lotNo=rs1.getString("lot_no__passign"); lotNo=rs1.getString("lot_no__passign");
...@@ -6001,61 +6002,17 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6001,61 +6002,17 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
public String createAssetInstall(String tranId, String qcOrderNo,Connection conn, String xtraParams) throws RemoteException, ITMException public String createAssetInstall(String tranId, String qcOrderNo,Connection conn, String xtraParams) throws RemoteException, ITMException
{ {
PreparedStatement pstmt = null,pstmt1=null, pstmtHdr=null,pstmtDet=null; PreparedStatement pstmt = null,pstmt1=null, pstmtHdr=null,pstmtDet=null;
ResultSet rs= null,rs1=null; ResultSet rs= null,rs1=null;
String retString = ""; String retString = "", key = "",keyStr = "", siteCode = "", tranSer = "",itemSer = "", suppCode = "";
String key = ""; String keyStr = ""; String currCode = "", acctCode = "", cctrCode = "", grpCode = "", itemCode = "", remarks = "", assetCode = "";
String siteCode = ""; String lineNo = "", locCode = "", lotNo = "", lotSl = "",suppName = "", token = "", string = "", varValue = "";
String tranSer = ""; String sql = "",sqlHdr="",sqlDet=""; String cctrCodeDr = ""; String alocCode = ""; String excTaxCodeAsset = ""; String excTaxCode = ""; String excTaxCodeSep="";
String itemSer = ""; String assetInstallTax = "", assetInstallTaxSep="", acctCodeAp = "", cwipSubGroup = "", sgroupCode = "", subGroup = "";
String suppCode = ""; String tranType = "", purcOrder = "", lineNoOrd = "", projCode = "", billNo = "", dcNo = "",invoiceNo = "";
String currCode = ""; String locCodeAprv = "",qcLocCode = "", qcItemCode = "", qcLotNoNew = "", qcLotNo = "", commVarValue = "", octroiVarValue = "";
String acctCode = ""; String octroiVarValueSep="", commVarValueSep="",generatedTranId="",loginEmpCode="";
String cctrCode = "";
String grpCode = "";
String itemCode = "";
String remarks = "";
String assetCode = "";
String lineNo = "";
String locCode = "";
String lotNo = "";
String lotSl = "";
String suppName = "";
String token = "";
String string = "";
String varValue = "";
String sql = "",sqlHdr="",sqlDet="";
String cctrCodeDr = "";
String alocCode = "";
String excTaxCodeAsset = "";
String excTaxCode = "";
String excTaxCodeSep="";
String assetInstallTax = "";
String assetInstallTaxSep="";
String acctCodeAp = "";
String cwipSubGroup = "";
String sgroupCode = "";
String subGroup = "";
String tranType = "";
String purcOrder = "";
String lineNoOrd = "";
String projCode = "";
String billNo = "";
String dcNo = "";
String invoiceNo = "";
String locCodeAprv = "";
String qcLocCode = "";
String qcItemCode = "";
String qcLotNoNew = "";
String qcLotNo = "";
String commVarValue = "";
String octroiVarValue = "";
String octroiVarValueSep="";
String commVarValueSep="";
String generatedTranId="";
String loginEmpCode="";
double othChg = 0.0, exchRate = 0.0, rate = 0.0,netAmt = 0.0,taxRecoAmt = 0.0; double othChg = 0.0, exchRate = 0.0, rate = 0.0,netAmt = 0.0,taxRecoAmt = 0.0;
double disc = 0.0, quantity = 0.0, passed = 0.0,totQuantity = 0.0; double disc = 0.0, quantity = 0.0, passed = 0.0,totQuantity = 0.0;
...@@ -6066,18 +6023,15 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6066,18 +6023,15 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
String arrStr[]=null; String arrStr[]=null;
Timestamp tranDate = null, billDate = null,dcDate = null, invoiceDate = null; Timestamp tranDate = null, billDate = null,dcDate = null, invoiceDate = null;
int len=0,count=0; int len=0,count=0;
try try
{ {
FinCommon finCommon = new FinCommon(); FinCommon finCommon = new FinCommon();
DistCommon distCommon = new DistCommon(); DistCommon distCommon = new DistCommon();
ITMDBAccessEJB itmDbAccess = new ITMDBAccessEJB(); ITMDBAccessEJB itmDbAccess = new ITMDBAccessEJB();
GenericUtility genericUtility = GenericUtility.getInstance(); GenericUtility genericUtility = GenericUtility.getInstance();
//java.sql.Date date = new java.sql.Date(new java.util.Date().getTime()); loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
DateFormat dtFormat = new SimpleDateFormat(genericUtility.getApplDateTimeFormat()); DateFormat dtFormat = new SimpleDateFormat(genericUtility.getApplDateTimeFormat());
String today = dtFormat.format(new java.util.Date()); String today = dtFormat.format(new java.util.Date());
...@@ -6085,7 +6039,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6085,7 +6039,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
{ {
qcOrderNo = ""; qcOrderNo = "";
} }
System.out.println("In createAssetInstall Function ");
sql = "SELECT TRAN_DATE, SITE_CODE, TRAN_SER, ITEM_SER, SUPP_CODE, CURR_CODE, OTHER_CHARGES, REMARKS, CASE WHEN EXCH_RATE IS NULL THEN 0 ELSE EXCH_RATE END AS EXCH_RATE, DC_NO, DC_DATE, INVOICE_NO, INVOICE_DATE FROM PORCP WHERE TRAN_ID = ? "; sql = "SELECT TRAN_DATE, SITE_CODE, TRAN_SER, ITEM_SER, SUPP_CODE, CURR_CODE, OTHER_CHARGES, REMARKS, CASE WHEN EXCH_RATE IS NULL THEN 0 ELSE EXCH_RATE END AS EXCH_RATE, DC_NO, DC_DATE, INVOICE_NO, INVOICE_DATE FROM PORCP WHERE TRAN_ID = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
...@@ -6109,6 +6063,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6109,6 +6063,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} }
else else
{ {
pstmt.close();
pstmt = null;
rs.close();
rs = null;
retString = itmDbAccess.getErrorString("", "VTPORCP1", ""); retString = itmDbAccess.getErrorString("", "VTPORCP1", "");
return retString; return retString;
} }
...@@ -6123,8 +6081,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6123,8 +6081,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
excTaxCodeSep =""; excTaxCodeSep ="";
arrStr =excTaxCode.split(","); arrStr =excTaxCode.split(",");
len =arrStr.length; len =arrStr.length;
for(int i =0;i<len;i++) for(int i =0;i<len;i++)
{ {
if(i==(len-1)) if(i==(len-1))
{ {
...@@ -6141,6 +6099,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6141,6 +6099,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} }
assetInstallTax = distCommon.getDisparams("999999", "ASSET_REGISTER_INSTALL_TAXCODE", conn); assetInstallTax = distCommon.getDisparams("999999", "ASSET_REGISTER_INSTALL_TAXCODE", conn);
if (assetInstallTax != null && assetInstallTax.trim().length() > 0 && !("NULLFOUND").equalsIgnoreCase(assetInstallTax)) if (assetInstallTax != null && assetInstallTax.trim().length() > 0 && !("NULLFOUND").equalsIgnoreCase(assetInstallTax))
{ {
assetInstallTaxSep=""; assetInstallTaxSep="";
...@@ -6160,6 +6119,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6160,6 +6119,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
{ {
assetInstallTaxSep = ""; assetInstallTaxSep = "";
} }
octroiVarValue = distCommon.getDisparams("999999", "ASSET_REGISTER_OCTROI_TAXCODE", conn); octroiVarValue = distCommon.getDisparams("999999", "ASSET_REGISTER_OCTROI_TAXCODE", conn);
if (octroiVarValue != null && octroiVarValue.trim().length() > 0 && !("NULLFOUND").equalsIgnoreCase(octroiVarValue)) if (octroiVarValue != null && octroiVarValue.trim().length() > 0 && !("NULLFOUND").equalsIgnoreCase(octroiVarValue))
{ {
...@@ -6189,7 +6149,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6189,7 +6149,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
len =arrStr.length; len =arrStr.length;
for(int i =0;i<len;i++) for(int i =0;i<len;i++)
{ {
if(1==(len-1)) if(i==(len-1))
{ {
commVarValueSep =commVarValueSep+"'"+arrStr[i]+"'"; commVarValueSep =commVarValueSep+"'"+arrStr[i]+"'";
} }
...@@ -6310,15 +6270,14 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6310,15 +6270,14 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
taxExciseAmt = 0.0; taxExciseRecoAmt = 0.0; rcprecoAmt = 0.0; taxExciseAmt = 0.0; taxExciseRecoAmt = 0.0; rcprecoAmt = 0.0;
rcptaxAmt = 0.0; exciseAmt = 0.0; taxAmt = 0.0; excrecoAmt = 0.0; rcptaxAmt = 0.0; exciseAmt = 0.0; taxAmt = 0.0; excrecoAmt = 0.0;
discAmt = 0.0; taxInstallChgs = 0.0; taxAmount = 0.0; discAmt = 0.0; taxInstallChgs = 0.0; taxAmount = 0.0;
originalValue = 0.0; originalValue = 0.0; taxRecoAmt = 0.0;
taxRecoAmt = 0.0;
if (qcOrderNo != null && qcOrderNo.trim().length() > 0) if (qcOrderNo != null && qcOrderNo.trim().length() > 0)
{ {
sql = "SELECT LOC_CODE__APRV, LOC_CODE, ITEM_CODE, (CASE WHEN QTY_PASSED IS NULL THEN 0 ELSE QTY_PASSED END) AS QTY_PASSED,LOT_NO__NEW, LOT_NO FROM QC_ORDER WHERE QORDER_NO = ? "; sql = "SELECT LOC_CODE__APRV, LOC_CODE, ITEM_CODE, (CASE WHEN QTY_PASSED IS NULL THEN 0 ELSE QTY_PASSED END) AS QTY_PASSED,LOT_NO__NEW, LOT_NO FROM QC_ORDER WHERE QORDER_NO = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, qcOrderNo); pstmt1.setString(1, qcOrderNo);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
locCodeAprv = checkNull(rs1.getString("LOC_CODE__APRV")); locCodeAprv = checkNull(rs1.getString("LOC_CODE__APRV"));
...@@ -6346,7 +6305,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6346,7 +6305,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1.setString(1, purcOrder); pstmt1.setString(1, purcOrder);
pstmt1.setString(2, lineNoOrd); pstmt1.setString(2, lineNoOrd);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
projCode = checkNull(rs1.getString("PROJ_CODE")); projCode = checkNull(rs1.getString("PROJ_CODE"));
...@@ -6368,7 +6327,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6368,7 +6327,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
sql = "SELECT GRP_CODE FROM ITEM WHERE ITEM_CODE = ? "; sql = "SELECT GRP_CODE FROM ITEM WHERE ITEM_CODE = ? ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, itemCode); pstmt1.setString(1, itemCode);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
grpCode = checkNull(rs1.getString("GRP_CODE")); grpCode = checkNull(rs1.getString("GRP_CODE"));
...@@ -6378,25 +6337,26 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6378,25 +6337,26 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
assetCode = this.generateTranId("W_ASSET_REGISTER", siteCode, today, conn); assetCode = this.generateTranId("w_asset_register", siteCode, today, conn);
if(("ERROR").equals(assetCode) || assetCode==null || assetCode.trim().length()==0) System.out.println("Asset code is ="+assetCode);
if( assetCode==null || ("ERROR").equals(assetCode) || assetCode.trim().length()==0)
{ {
retString=itmDbAccess.getErrorString("", "VTASSETCD",""); retString=itmDbAccess.getErrorString("", "VTASSETCD","");
return retString; return retString;
} }
generatedTranId = this.generateTranId("W_ASSET_INSTALL", siteCode, today, conn); generatedTranId = this.generateTranId("w_asset_install", siteCode, today, conn);
System.out.println("GeneratedTranId is ="+generatedTranId );
sql = "SELECT ALOC_CODE FROM ASSET_LOCATION WHERE SITE_CODE = ? "; sql = "SELECT ALOC_CODE FROM ASSET_LOCATION WHERE SITE_CODE = ? ";
pstmt1= conn.prepareStatement(sql); pstmt1= conn.prepareStatement(sql);
pstmt1.setString(1, siteCode); pstmt1.setString(1, siteCode);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
alocCode = checkNull(rs1.getString("ALOC_CODE")); alocCode = checkNull(rs1.getString("ALOC_CODE"));
} else }
else
{ {
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
...@@ -6417,7 +6377,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6417,7 +6377,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1.setString(1, tranId); pstmt1.setString(1, tranId);
pstmt1.setString(2, lineNo); pstmt1.setString(2, lineNo);
pstmt1.setString(3, assetInstallTaxSep); pstmt1.setString(3, assetInstallTaxSep);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
taxInstallChgs = rs1.getDouble(1); taxInstallChgs = rs1.getDouble(1);
...@@ -6435,7 +6395,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6435,7 +6395,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1.setString(1, tranId); pstmt1.setString(1, tranId);
pstmt1.setString(2, lineNo); pstmt1.setString(2, lineNo);
pstmt1.setString(3, octroiVarValueSep); pstmt1.setString(3, octroiVarValueSep);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
octroiChgs = rs1.getDouble(1); octroiChgs = rs1.getDouble(1);
...@@ -6453,7 +6413,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6453,7 +6413,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1.setString(1, tranId); pstmt1.setString(1, tranId);
pstmt1.setString(2, lineNo); pstmt1.setString(2, lineNo);
pstmt1.setString(3, commVarValueSep); pstmt1.setString(3, commVarValueSep);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
commChgs = rs1.getDouble(1); commChgs = rs1.getDouble(1);
...@@ -6471,10 +6431,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6471,10 +6431,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
} }
sql = "SELECT SUM(CASE WHEN RECO_AMOUNT IS NULL THEN 0 ELSE RECO_AMOUNT END) AS RECO_AMOUNT, SUM(CASE WHEN TAX_AMT IS NULL THEN 0 ELSE TAX_AMT END) AS TAX_AMT FROM TAXTRAN WHERE TRAN_CODE = 'P-RCP' AND TRAN_ID = ? AND LINE_NO = ?"; sql = "SELECT SUM(CASE WHEN RECO_AMOUNT IS NULL THEN 0 ELSE RECO_AMOUNT END) AS RECO_AMOUNT, SUM(CASE WHEN TAX_AMT IS NULL THEN 0 ELSE TAX_AMT END) AS TAX_AMT FROM TAXTRAN WHERE TRAN_CODE = 'P-RCP' AND TRAN_ID = ? AND LINE_NO = ?";
pstmt1 = conn.prepareStatement(sql); pstmt1 =conn.prepareStatement(sql);
pstmt1.setString(1, tranId); pstmt1.setString(1, tranId);
pstmt1.setString(2, lineNo); pstmt1.setString(2, lineNo);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
taxRecoAmt = rs1.getDouble("RECO_AMOUNT"); taxRecoAmt = rs1.getDouble("RECO_AMOUNT");
...@@ -6489,11 +6449,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6489,11 +6449,11 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
{ {
sql = "SELECT SUM(CASE WHEN RECO_AMOUNT IS NULL THEN 0 ELSE RECO_AMOUNT END), SUM(CASE WHEN TAX_AMT IS NULL THEN 0 ELSE TAX_AMT END) FROM TAXTRAN WHERE TRAN_CODE = 'P-RCP' AND TRAN_ID = ? AND LINE_NO = ? AND TAX_CODE IN(?) "; sql = "SELECT SUM(CASE WHEN RECO_AMOUNT IS NULL THEN 0 ELSE RECO_AMOUNT END), SUM(CASE WHEN TAX_AMT IS NULL THEN 0 ELSE TAX_AMT END) FROM TAXTRAN WHERE TRAN_CODE = 'P-RCP' AND TRAN_ID = ? AND LINE_NO = ? AND TAX_CODE IN(?) ";
pstmt1 = conn.prepareStatement(sql); pstmt1 =conn.prepareStatement(sql);
pstmt1.setString(1, tranId); pstmt1.setString(1, tranId);
pstmt1.setString(2, lineNo); pstmt1.setString(2, lineNo);
pstmt1.setString(3, excTaxCodeSep); pstmt1.setString(3, excTaxCodeSep);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
taxExciseRecoAmt = rs1.getDouble("RECO_AMOUNT"); taxExciseRecoAmt = rs1.getDouble("RECO_AMOUNT");
...@@ -6508,31 +6468,26 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6508,31 +6468,26 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
if (excTaxCodeAsset != null && excTaxCodeAsset.trim().length() > 0) if (excTaxCodeAsset != null && excTaxCodeAsset.trim().length() > 0)
{ {
sql = "SELECT SUM(CASE WHEN RECO_AMOUNT IS NULL THEN 0 ELSE RECO_AMOUNT END), SUM(CASE WHEN TAX_AMT IS NULL THEN 0 ELSE TAX_AMT END) FROM TAXTRAN WHERE TRAN_CODE = 'P-RCP' AND TRAN_ID = ? AND LINE_NO = ? AND TAX_CODE IN (?)"; sql = "SELECT SUM(CASE WHEN RECO_AMOUNT IS NULL THEN 0 ELSE RECO_AMOUNT END), SUM(CASE WHEN TAX_AMT IS NULL THEN 0 ELSE TAX_AMT END) FROM TAXTRAN WHERE TRAN_CODE = 'P-RCP' AND TRAN_ID = ? AND LINE_NO = ? AND TAX_CODE IN (?)";
pstmt = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt1.setString(1, tranId);
pstmt.setString(2, lineNo); pstmt1.setString(2, lineNo);
pstmt.setString(3, excTaxCodeAsset); pstmt1.setString(3, excTaxCodeAsset);
rs1 = pstmt.executeQuery(); rs1 = pstmt1.executeQuery();
if (rs1.next()) if (rs1.next())
{ {
rcprecoAmt = rs1.getDouble("RECO_AMOUNT"); rcprecoAmt = rs1.getDouble("RECO_AMOUNT");
rcptaxAmt = rs1.getDouble("TAX_AMT"); rcptaxAmt = rs1.getDouble("TAX_AMT");
} }
pstmt1.close(); pstmt1.close();
pstmt1= null; pstmt1= null;
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
} }
taxAmount = (taxAmt - taxRecoAmt - taxInstallChgs - octroiChgs - commChgs); taxAmount = (taxAmt - taxRecoAmt - taxInstallChgs - octroiChgs - commChgs);
exciseAmt = (taxExciseAmt - taxExciseRecoAmt) + (rcptaxAmt - rcprecoAmt); exciseAmt = (taxExciseAmt - taxExciseRecoAmt) + (rcptaxAmt - rcprecoAmt);
excrecoAmt= taxExciseRecoAmt + rcprecoAmt; excrecoAmt= taxExciseRecoAmt + rcprecoAmt;
discAmt = (rate * quantity * disc) / 100; discAmt = (rate * quantity * disc) / 100;
originalValue = (rate * quantity) + taxAmount-discAmt; originalValue = (rate * quantity) + taxAmount-discAmt;
pstmtHdr.setString(1, generatedTranId); pstmtHdr.setString(1, generatedTranId);
pstmtHdr.setTimestamp(2, this.getCurrtDate()); pstmtHdr.setTimestamp(2, this.getCurrtDate());
...@@ -6571,7 +6526,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6571,7 +6526,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtHdr.addBatch(); pstmtHdr.addBatch();
pstmtHdr.clearParameters(); pstmtHdr.clearParameters();
pstmtDet.setString(1, generatedTranId); pstmtDet.setString(1, generatedTranId);
pstmtDet.setString(2, "1"); pstmtDet.setString(2, "1");
...@@ -6611,21 +6565,16 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6611,21 +6565,16 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
return retString; return retString;
} }
pstmt.close();
pstmt = null;
rs.close();
rs = null;
pstmtHdr.executeBatch(); pstmtHdr.executeBatch();
pstmtDet.executeBatch(); pstmtDet.executeBatch();
pstmtHdr.clearBatch(); pstmtHdr.clearBatch();
pstmtDet.clearBatch(); pstmtDet.clearBatch();
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if (rs != null)
{
rs.close();
rs = null;
}
} catch (Exception e) } catch (Exception e)
{ {
System.out.println("PoRcpConf : createAssetInstall(String tranId, String orderNo,String logEmpCode, Connection conn) :" + e.getMessage()); System.out.println("PoRcpConf : createAssetInstall(String tranId, String orderNo,String logEmpCode, Connection conn) :" + e.getMessage());
...@@ -6660,7 +6609,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6660,7 +6609,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtDet = null; pstmtDet = null;
} }
if (pstmt != null) if (pstmtHdr != null)
{ {
pstmtHdr.close(); pstmtHdr.close();
pstmtHdr = null; pstmtHdr = null;
...@@ -6682,7 +6631,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6682,7 +6631,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
throw new ITMException(e); throw new ITMException(e);
} }
} }
System.out.println("Returning Result::" + retString); System.out.println("Returning Result in createAssetInstall::" + retString);
return retString; return retString;
} }
......
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