Commit e0c79f5d authored by caluka's avatar caluka

Post order Process issues resolved for QC testing


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103573 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 35b3b581
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -921,7 +921,8 @@ public class PostOrderActivity { ...@@ -921,7 +921,8 @@ public class PostOrderActivity {
sitelocCode=locCode; sitelocCode=locCode;
} }
stkOpt = mfgCommon.chkStkOpt(itemCode,siteCodeCh,conn); //stkOpt = mfgCommon.chkStkOpt(itemCode,siteCodeCh,conn);
stkOpt = mfgCommon.chkStkOpt(siteCodeCh,itemCode,conn);
lnno++; lnno++;
lineNo=String.valueOf(lnno); lineNo=String.valueOf(lnno);
...@@ -2814,7 +2815,7 @@ pstmt1.setDouble(6,netAmt-(-1*(drAmt-netAmt))); ...@@ -2814,7 +2815,7 @@ pstmt1.setDouble(6,netAmt-(-1*(drAmt-netAmt)));
String rndStr="",rndOff="",rndToStr="",acct="",cctr=""; String rndStr="",rndOff="",rndToStr="",acct="",cctr="";
String tempSplitCode=""; String tempSplitCode="";
String splitCode=""; String splitCode="";
String drcrTranid="",insertsql=""; String drcrTranid="",insertsql="",exciseDrAcct="",exciseDrAcctcd="",exciseDrCctrCd="";
double rndto=0.0; double rndto=0.0;
double exchRate=0.0; double exchRate=0.0;
double taxAmt=0.0,totAmount=0.0; double taxAmt=0.0,totAmount=0.0;
...@@ -2895,6 +2896,23 @@ pstmt1.setDouble(6,netAmt-(-1*(drAmt-netAmt))); ...@@ -2895,6 +2896,23 @@ pstmt1.setDouble(6,netAmt-(-1*(drAmt-netAmt)));
excise=checkNull(distCommon.getDisparams("999999", "EXC_TAX_CODE_MODVAT", conn)).trim(); excise=checkNull(distCommon.getDisparams("999999", "EXC_TAX_CODE_MODVAT", conn)).trim();
cess=checkNull(distCommon.getDisparams("999999", "CESS_TAX_CODE_MODVAT", conn)).trim(); cess=checkNull(distCommon.getDisparams("999999", "CESS_TAX_CODE_MODVAT", conn)).trim();
hsEdu=checkNull(distCommon.getDisparams("999999", "HS_EDU_CESS_TAXCODE", conn)).trim(); hsEdu=checkNull(distCommon.getDisparams("999999", "HS_EDU_CESS_TAXCODE", conn)).trim();
// below finparm define for excise act code req id -F16FUNI001 - dt- 27-sep-2016
exciseDrAcct=checkNull(finCommon.getFinparams("999999", "EXCISE_DR_ACCT", conn)).trim();
if ((!"NULLFOUND".equalsIgnoreCase(exciseDrAcct) && exciseDrAcct != null && exciseDrAcct.trim().length() > 0) )
{
if(exciseDrAcct.trim().length() >0)
{
String[] arrStr1 =exciseDrAcct.split(";");
if(arrStr1.length>0)
{
exciseDrAcctcd =arrStr1[0];
}
if(arrStr1.length>1)
{
exciseDrCctrCd =arrStr1[1];
}
}
}
//Excise Tax Code, selected from despatch //Excise Tax Code, selected from despatch
if ((!"NULLFOUND".equalsIgnoreCase(excise) && excise != null && excise.trim().length() > 0) ) if ((!"NULLFOUND".equalsIgnoreCase(excise) && excise != null && excise.trim().length() > 0) )
{ {
...@@ -3074,6 +3092,15 @@ pstmt1.setDouble(6,netAmt-(-1*(drAmt-netAmt))); ...@@ -3074,6 +3092,15 @@ pstmt1.setDouble(6,netAmt-(-1*(drAmt-netAmt)));
isHeaderPrepared=true; isHeaderPrepared=true;
drcrTranid=generateTranId("w_drcrrcp_dr",siteCode,conn); drcrTranid=generateTranId("w_drcrrcp_dr",siteCode,conn);
// below finparm define for excise act code req id -F16FUNI001 - dt- 27-sep-2016
if(exciseDrAcctcd !=null && checkNull(exciseDrAcctcd).trim().length()>0)
{
acctCodeAr=exciseDrAcctcd;
}
if(exciseDrAcctcd !=null && checkNull(exciseDrAcctcd).trim().length()>0)
{
cctrCodeAr=exciseDrCctrCd;
}
insertsql = " INSERT INTO DRCR_RCP ( tran_id, tran_date, site_code, fin_entity, tran_type," + insertsql = " INSERT INTO DRCR_RCP ( tran_id, tran_date, site_code, fin_entity, tran_type," +
" tran_ser, drcr_flag, cust_code, item_ser, invoice_id ,acct_code ,cctr_code ,eff_date ," + " tran_ser, drcr_flag, cust_code, item_ser, invoice_id ,acct_code ,cctr_code ,eff_date ," +
"due_date ,curr_code ,exch_rate ,anal_code ,cr_term ,emp_code__aprv ,chg_date ,chg_user," + "due_date ,curr_code ,exch_rate ,anal_code ,cr_term ,emp_code__aprv ,chg_date ,chg_user," +
...@@ -3841,7 +3868,8 @@ pstmt1.setDouble(6,netAmt-(-1*(drAmt-netAmt))); ...@@ -3841,7 +3868,8 @@ pstmt1.setDouble(6,netAmt-(-1*(drAmt-netAmt)));
} }
}// FOR LOOP [2] --END-- }// FOR LOOP [2] --END--
lsDocValue = lsDocValue.substring(2, lsDocValue.length()); System.out.println("lsDocValue>>>>>>["+lsDocValue+"]");
lsDocValue = lsDocValue.substring(1, lsDocValue.length());
if ("I".equalsIgnoreCase(tranType)) if ("I".equalsIgnoreCase(tranType))
{ {
......
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