Skip to content

B
business-java
Commit b163683f authored by ngadkari's avatar ngadkari
Browse files
Options

Request ID-D17KGTP015 Change in existing stock transfer order and New screen... 

Request ID-D17KGTP015 Change in existing stock transfer order and New screen for consumption and capitalization of material

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@181704 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fc04327b
Show whitespace changes
Inline Side-by-side
Showing with 149 additions and 10 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ b163683f
...@@ -19,6 +19,7 @@ import java.text.*; ...@@ -19,6 +19,7 @@ import java.text.*;
import ibase.webitm.ejb.dis.DistCommon; import ibase.webitm.ejb.dis.DistCommon;
import ibase.webitm.ejb.fin.*; import ibase.webitm.ejb.fin.*;
import ibase.webitm.ejb.fin.AssetInstall;
import ibase.webitm.utility.TransIDGenerator; import ibase.webitm.utility.TransIDGenerator;
import ibase.webitm.ejb.ITMDBAccessEJB; import ibase.webitm.ejb.ITMDBAccessEJB;
import ibase.webitm.ejb.dis.*; import ibase.webitm.ejb.dis.*;
...@@ -6945,6 +6946,15 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6945,6 +6946,15 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
int len = 0, count = 0; int len = 0, count = 0;
int cnt = 0, cnt1 = 0; int cnt = 0, cnt1 = 0;
//added by Nandkumar Gadkari on 08/03/18-- Start
StringBuffer xmlBuff = null;
SimpleDateFormat sdf = null;
ArrayList<String> assetInstallList = null;
double instChgsBc= 0.0 , originalValueBc= 0.0, taxRecoAmtexc=0.0;
String returnString="";
int lNo = 0;
//added by Nandkumar Gadkari on 08/03/18 ------- end
try try
{ {
FinCommon finCommon = new FinCommon(); FinCommon finCommon = new FinCommon();
...@@ -6955,6 +6965,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6955,6 +6965,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
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());
AssetInstall assetInstall= new AssetInstall();// object Created by Nandkumar Gadkari on 08/03/18
if ((qcOrderNo == null) || (qcOrderNo.trim().length() == 0)) if ((qcOrderNo == null) || (qcOrderNo.trim().length() == 0))
{ {
...@@ -7118,17 +7129,19 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -7118,17 +7129,19 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
* { rs.close(); rs = null; } * { rs.close(); rs = null; }
*/ */
sqlHdr = "INSERT INTO ASSET_INSTALL(TRAN_ID,TRAN_DATE, SITE_CODE, ASSET_CODE, ASSET_CODE__PAR, ALOC_CODE, ASSET_TYPE, DESCR,INST_DATE, USE_DATE, REMARKS, EMP_CODE, ITEM_CODE, GRP_CODE, CURR_CODE, EXCH_RATE, CHG_USER, CHG_DATE, CHG_TERM, ASSET_SALE_TYPE, CONFIRMED, TRAN_TYPE, PROJ_CODE, TRAN_ID__RCP,CCTR_CODE,EXCH_RATE__INST,INSTALL_CHGS,OCTROI_CHGS,COMM_CHGS,INST_CHGS__BC,ACCT_CODE__INST,CCTR_CODE__INST,EXCRECO_AMT,ORIGINAL_VALUE,ORIGINAL_VALUE__BC,asset_class,useful_life) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; //commented by Nandkumar Gadkari on 08/03/18
/*sqlHdr = "INSERT INTO ASSET_INSTALL(TRAN_ID,TRAN_DATE, SITE_CODE, ASSET_CODE, ASSET_CODE__PAR, ALOC_CODE, ASSET_TYPE, DESCR,INST_DATE, USE_DATE, REMARKS, EMP_CODE, ITEM_CODE, GRP_CODE, CURR_CODE, EXCH_RATE, CHG_USER, CHG_DATE, CHG_TERM, ASSET_SALE_TYPE, CONFIRMED, TRAN_TYPE, PROJ_CODE, TRAN_ID__RCP,CCTR_CODE,EXCH_RATE__INST,INSTALL_CHGS,OCTROI_CHGS,COMM_CHGS,INST_CHGS__BC,ACCT_CODE__INST,CCTR_CODE__INST,EXCRECO_AMT,ORIGINAL_VALUE,ORIGINAL_VALUE__BC,asset_class,useful_life) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtHdr = conn.prepareStatement(sqlHdr); pstmtHdr = conn.prepareStatement(sqlHdr);
sqlDet = "INSERT INTO ASSET_INSTALLDET(TRAN_ID, LINE_NO, TRAN_ID__RCP, LINE_NO__RCP, ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL,QUANTITY, RATE, SUPP_CODE, SUPP_NAME, RCP_DATE, BILL_NO, BILL_DATE, CURR_CODE, EXCH_RATE, GRP_CODE, ASSET_CODE, TAX_AMT, TAX_RECO_AMT, EXCISE_AMT, EXCRECO_AMT, ORIGINAL_VALUE ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; sqlDet = "INSERT INTO ASSET_INSTALLDET(TRAN_ID, LINE_NO, TRAN_ID__RCP, LINE_NO__RCP, ITEM_CODE, LOC_CODE, LOT_NO, LOT_SL,QUANTITY, RATE, SUPP_CODE, SUPP_NAME, RCP_DATE, BILL_NO, BILL_DATE, CURR_CODE, EXCH_RATE, GRP_CODE, ASSET_CODE, TAX_AMT, TAX_RECO_AMT, EXCISE_AMT, EXCRECO_AMT, ORIGINAL_VALUE ) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtDet = conn.prepareStatement(sqlDet); pstmtDet = conn.prepareStatement(sqlDet);*/
//commented end by nandkumar Gadkari on 08/03/18
sql = "SELECT LINE_NO, ITEM_CODE, QUANTITY, RATE, NET_AMT, LOC_CODE, LOT_NO, LOT_SL, DISCOUNT, CCTR_CODE__DR, PURC_ORDER, LINE_NO__ORD FROM PORCPDET WHERE TRAN_ID = ?"; sql = "SELECT LINE_NO, ITEM_CODE, QUANTITY, RATE, NET_AMT, LOC_CODE, LOT_NO, LOT_SL, DISCOUNT, CCTR_CODE__DR, PURC_ORDER, LINE_NO__ORD FROM PORCPDET WHERE TRAN_ID = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
totQuantity = 0.0; totQuantity = 0.0;
assetInstallList = new ArrayList<String>(); //Added by Nandkumar Gadkari on 08/03/18
while (rs.next()) while (rs.next())
{ {
count++; count++;
...@@ -7473,7 +7486,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -7473,7 +7486,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
discAmt = (rate * quantity * disc) / 100; discAmt = (rate * quantity * disc) / 100;
originalValue = (rate * quantity) + taxAmount - discAmt; originalValue = (rate * quantity) + taxAmount - discAmt;
pstmtHdr.setString(1, generatedTranId); //commented by Nandkumar Gadkari on 08/03/18
/*pstmtHdr.setString(1, generatedTranId);
pstmtHdr.setTimestamp(2, this.getCurrtDate()); pstmtHdr.setTimestamp(2, this.getCurrtDate());
pstmtHdr.setString(3, siteCode); pstmtHdr.setString(3, siteCode);
pstmtHdr.setString(4, assetCode); pstmtHdr.setString(4, assetCode);
...@@ -7541,8 +7555,132 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -7541,8 +7555,132 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmtDet.setDouble(24, originalValue); pstmtDet.setDouble(24, originalValue);
pstmtDet.addBatch(); pstmtDet.addBatch();
pstmtDet.clearParameters(); pstmtDet.clearParameters();*/
} //commented end by Nandkumar Gadkari on 08/03/18
//added end by Nandkumar Gadkari on 08/03/18 --start---Asset installation to be made independent of purchase receipt confirmation.
if( xmlBuff == null )
{
xmlBuff = new StringBuffer();
}
xmlBuff.append("<?xml version='1.0' encoding='ISO-8859-1'?>\n");
xmlBuff.append("<DocumentRoot>");
xmlBuff.append("<description>").append("Datawindow Root").append("</description>");
xmlBuff.append("<group0>");
xmlBuff.append("<description>").append("Group0 description").append("</description>");
xmlBuff.append("<Header0>");
xmlBuff.append("<objName><![CDATA[").append("asset_install").append("]]></objName>");
xmlBuff.append("<pageContext><![CDATA[").append("1").append("]]></pageContext>");
xmlBuff.append("<objContext><![CDATA[").append("1").append("]]></objContext>");
xmlBuff.append("<editFlag><![CDATA[").append("A").append("]]></editFlag>");
xmlBuff.append("<focusedColumn><![CDATA[").append("").append("]]></focusedColumn>");
xmlBuff.append("<action><![CDATA[").append("SAVE").append("]]></action>");
xmlBuff.append("<elementName><![CDATA[").append("").append("]]></elementName>");
xmlBuff.append("<keyValue><![CDATA[").append("1").append("]]></keyValue>");
xmlBuff.append("<taxKeyValue><![CDATA[").append("").append("]]></taxKeyValue>");
xmlBuff.append("<saveLevel><![CDATA[").append("1").append("]]></saveLevel>");
xmlBuff.append("<forcedSave><![CDATA[").append(true).append("]]></forcedSave>");
xmlBuff.append("<taxInFocus><![CDATA[").append(false).append("]]></taxInFocus>");
xmlBuff.append("<description>").append("Header0 members").append("</description>");
xmlBuff.append("<Detail1 dbID=\"\" domID=\"1\" objName=\"asset_install\" objContext=\"1\">");
xmlBuff.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>");
xmlBuff.append("<tran_id/>");
sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
xmlBuff.append("<tran_date><![CDATA["+ sdf.format(new java.util.Date()).toString() +"]]></tran_date>");
xmlBuff.append("<site_code><![CDATA["+ siteCode +"]]></site_code>");
xmlBuff.append("<asset_code><![CDATA["+ assetCode +"]]></asset_code>");
xmlBuff.append("<asset_code__par><![CDATA["+ assetCode +"]]></asset_code__par>");
xmlBuff.append("<aloc_code><![CDATA["+ alocCode +"]]></aloc_code>");
xmlBuff.append("<asset_type><![CDATA["+ "D" +"]]></asset_type>");
xmlBuff.append("<descr><![CDATA["+ remarks +"]]></descr>");
xmlBuff.append("<inst_date><![CDATA["+ sdf.format(tranDate) +"]]></inst_date>");
xmlBuff.append("<use_date><![CDATA["+ sdf.format(tranDate) +"]]></use_date>");
xmlBuff.append("<remarks><![CDATA["+ remarks +"]]></remarks>");
xmlBuff.append("<emp_code><![CDATA["+ loginEmpCode +"]]></emp_code>");
xmlBuff.append("<item_code><![CDATA["+ itemCode +"]]></item_code>");
xmlBuff.append("<grp_code><![CDATA["+ grpCode +"]]></grp_code>");
xmlBuff.append("<curr_code><![CDATA["+ currCode +"]]></curr_code>");
xmlBuff.append("<exch_rate><![CDATA["+ exchRate +"]]></exch_rate>");
xmlBuff.append("<curr_code__inst><![CDATA["+ currCode +"]]></curr_code__inst>");
xmlBuff.append("<chg_user><![CDATA["+ this.userId +"]]></chg_user>");
xmlBuff.append("<chg_date><![CDATA["+ sdf.format(new java.util.Date()).toString() +"]]></chg_date>");
xmlBuff.append("<chg_term><![CDATA["+ this.termId +"]]></chg_term>");
xmlBuff.append("<asset_sale_type><![CDATA["+ "N" +"]]></asset_sale_type>");
xmlBuff.append("<confirmed><![CDATA["+ "N" +"]]></confirmed>");
xmlBuff.append("<tran_type><![CDATA["+ tranType +"]]></tran_type>");
xmlBuff.append("<proj_code><![CDATA["+ projCode +"]]></proj_code>");
xmlBuff.append("<tran_id__rcp><![CDATA["+ tranId +"]]></tran_id__rcp>");
xmlBuff.append("<cctr_code><![CDATA["+ cctrCodeDr +"]]></cctr_code>");
xmlBuff.append("<exch_rate__inst><![CDATA["+ exchRate +"]]></exch_rate__inst>");
xmlBuff.append("<install_chgs><![CDATA["+ taxInstallChgs +"]]></install_chgs>");
xmlBuff.append("<octroi_chgs><![CDATA["+ octroiChgs +"]]></octroi_chgs>");
xmlBuff.append("<comm_chgs><![CDATA["+ commChgs +"]]></comm_chgs>");
instChgsBc= taxInstallChgs * exchRate;
xmlBuff.append("<inst_chgs__bc><![CDATA["+ instChgsBc +"]]></inst_chgs__bc>");
xmlBuff.append("<acct_code__inst><![CDATA["+ acctCode +"]]></acct_code__inst>");
xmlBuff.append("<cctr_code__inst><![CDATA["+ cctrCode +"]]></cctr_code__inst>");
xmlBuff.append("<excreco_amt><![CDATA["+ excrecoAmt +"]]></excreco_amt>");
xmlBuff.append("<original_value><![CDATA["+ originalValue +"]]></original_value>");
originalValueBc=originalValue * exchRate;
xmlBuff.append("<original_value__bc><![CDATA["+ originalValueBc +"]]></original_value__bc>");
xmlBuff.append("<asset_class><![CDATA["+ assetclass +"]]></asset_class>");
xmlBuff.append("<useful_life><![CDATA["+ usefullife +"]]></useful_life>");
xmlBuff.append("</Detail1>");
xmlBuff.append("<Detail2 dbID='' domID=\"1\" objName=\"asset_install\" objContext=\"2\">");
xmlBuff.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />");
xmlBuff.append("<tran_id/>");
xmlBuff.append("<line_no><![CDATA["+ "1" +"]]></line_no>");
xmlBuff.append("<tran_id__rcp><![CDATA["+ tranId +"]]></tran_id__rcp>");
xmlBuff.append("<line_no__rcp><![CDATA["+ lineNo +"]]></line_no__rcp>");
xmlBuff.append("<item_code><![CDATA["+ itemCode +"]]></item_code>");
xmlBuff.append("<loc_code><![CDATA["+ locCode +"]]></loc_code>");
xmlBuff.append("<lot_no><![CDATA["+ lotNo +"]]></lot_no>");
xmlBuff.append("<lot_sl><![CDATA["+ lotSl +"]]></lot_sl>");
xmlBuff.append("<quantity><![CDATA["+ quantity +"]]></quantity>");
xmlBuff.append("<rate><![CDATA["+ rate +"]]></rate>");
xmlBuff.append("<supp_code><![CDATA["+ suppCode +"]]></supp_code>");
xmlBuff.append("<supp_name><![CDATA["+ suppName +"]]></supp_name>");
xmlBuff.append("<rcp_date><![CDATA["+ sdf.format(tranDate) +"]]></rcp_date>");
xmlBuff.append("<bill_no><![CDATA["+ billNo +"]]></bill_no>");
if( billDate != null )
{
xmlBuff.append("<bill_date><![CDATA["+ sdf.format(billDate) +"]]></bill_date>");
}
xmlBuff.append("<curr_code><![CDATA["+ currCode +"]]></curr_code>");
xmlBuff.append("<exch_rate><![CDATA["+ exchRate +"]]></exch_rate>");
xmlBuff.append("<grp_code><![CDATA["+ grpCode +"]]></grp_code>");
xmlBuff.append("<asset_code><![CDATA["+ assetCode +"]]></asset_code>");
xmlBuff.append("<tax_amt><![CDATA["+ taxAmount +"]]></tax_amt>");
taxRecoAmtexc= taxRecoAmt - excrecoAmt;
xmlBuff.append("<tax_reco_amt><![CDATA["+ taxRecoAmtexc +"]]></tax_reco_amt>");
xmlBuff.append("<excise_amt><![CDATA["+ exciseAmt +"]]></excise_amt>");
xmlBuff.append("<excreco_amt><![CDATA["+ excrecoAmt +"]]></excreco_amt>");
xmlBuff.append("<original_value><![CDATA["+ originalValue +"]]></original_value>");
xmlBuff.append("</Detail2>");
xmlBuff.append("</Header0>");
xmlBuff.append("</group0>");
xmlBuff.append("</DocumentRoot>");
if( xmlBuff != null && (xmlBuff.toString()).length() > 0 )
{
assetInstallList.add(xmlBuff.toString());
xmlBuff = null;
}
}
returnString= assetInstall.assetInstallData(tranId,conn,xtraParams,assetInstallList);
if(returnString!=null)
{
return returnString;
}
System.out.println("returnString : assetInstallData:" + returnString);
// added by Nandkumar Gadkari on 08/03/18 --end--
if (count == 0) if (count == 0)
{ {
pstmt.close(); pstmt.close();
...@@ -7557,11 +7695,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -7557,11 +7695,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt = null; pstmt = null;
rs.close(); rs.close();
rs = null; rs = null;
// commented by Nandkumar Gadkari on 08/03/18 --start--
pstmtHdr.executeBatch(); /*pstmtHdr.executeBatch();
pstmtDet.executeBatch(); pstmtDet.executeBatch();
pstmtHdr.clearBatch(); pstmtHdr.clearBatch();
pstmtDet.clearBatch(); pstmtDet.clearBatch();*/
// commented by Nandkumar Gadkari on 08/03/18 --end--
} catch (Exception e) } catch (Exception e)
{ {
......
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