anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

凭证通用方法变更--客商辅助核算

Browse Source
This commit is contained in:
xiezhiwen 2019-02-14 09:24:02 +08:00
parent 4fa0e9dde5
commit e51ad058f1
66 changed files with 108 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
WebContent/META-INF/context.xml
View File

@ -1,12 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context>
<!-- <Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource"
maxActive="30" maxIdle="2" maxWait="10000" username="apzl" password="apzl@2018"
driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false"
/> -->
<Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource"
maxActive="30" maxIdle="2" maxWait="10000" username="apzl" password="apzl@2018"
driverClassName="com.mysql.jdbc.Driver"
url="jdbc:mysql://47.93.34.101:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false" />
url="jdbc:mysql://47.94.109.18:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false" />
<!-- <Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource"
maxActive="30" maxIdle="2" maxWait="10000" username="apzl" password="apzl@2018"
driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://47.94.109.18:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false"
driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://60.205.189.63:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false"
/> -->
<!-- <Resource name="jdbc/als" auth="Container" type="javax.sql.DataSource"
maxActive="30" maxIdle="2" maxWait="10000" username="apzl" password="123"
driverClassName="com.mysql.jdbc.Driver" url="jdbc:mysql://172.16.21.174:3306/apzl?rewriteBatchedStatements=true&amp;useUnicode=true&amp;characterEncoding=GBK&amp;autoReconnectForPools=true&amp;autoReconnect=true&amp;useSSL=false"
/> -->
</Context>

1
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java
View File

@ -118,7 +118,6 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness {
param.put("BUSINESSTYPE", "0605");// Ö÷ÓªÀàÐÍ
}
// param.put("FUNDTYPE", ""); // Ö÷ÓªÀàÐÍ
param.put("BUSINESSTYPE", "06");
param.put("FlowUnid", FlowUnid);
map.clear();
map.put("PROJ_TYPE", leas_form);

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDepositDeductionToMoney.java
View File

@ -43,7 +43,7 @@ public class CreateVoucherDepositDeductionToMoney extends BaseBussiness {
String sql = "";
param.clear();
map.put("FlowUnid", FlowUnid);
sql = "SELECT IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,IFNULL(ROUND(LRIT.PENALTY /getTax(LCI.LEAS_FORM,'±¾½ð',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LRIT.PENALTY - ROUND(LRIT.PENALTY /getTax(LCI.LEAS_FORM,'±¾½ð',LCCT.START_DATE),2)),0) AS MONEYTAX,'0.00' AS DEDITMONEY_NOTAX,IFNULL(LRIT.CORPUS,0) AS CORPUS,IFNULL(LRIT.INTEREST,0) AS INTEREST,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LCCT.CONTRACT_ID LEFT JOIN (SELECT LRIT.CORPUS,LRIT.INTEREST,LRIT.PENALTY,LRIT.FLOWUNID FROM LC_RENT_INCOME_TEMP LRIT WHERE LRIT.SETTLE_METHOD='settlemethod7')LRIT ON LRIT.CONTRACT_ID=LCI.ID LEFT JOIN (SELECT LFIT.FACT_MONEY FROM LC_FUND_INCOME_TEMP LFIT WHERE LFIT.FEE_TYPE = 'feetype16' AND LFIT.SETTLE_METHOD = 'settlemethod7' )LFIT ON LFIT.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID WHERE LRIT.FLOWUNID = :FLOWUNID ";
sql = "SELECT IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,IFNULL(ROUND(LRIT.PENALTY / getTax (LCI.LEAS_FORM,'±¾½ð',LCCT.START_DATE),2),0) AS MONEYNOTAX,IFNULL((LRIT.PENALTY - ROUND(LRIT.PENALTY / getTax (LCI.LEAS_FORM,'±¾½ð',LCCT.START_DATE),2)),0) AS MONEYTAX,'0.00' AS DEDITMONEY_NOTAX,IFNULL(LRIT.CORPUS, 0) AS CORPUS,IFNULL(LRIT.INTEREST, 0) AS INTEREST,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(), '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LCCT.CONTRACT_ID LEFT JOIN (SELECT SUM(LRIT.CORPUS) CORPUS,SUM(LRIT.INTEREST) INTEREST,SUM(LRIT.PENALTY) PENALTY,LRIT.FLOWUNID,LRIT.CONTRACT_ID FROM LC_RENT_INCOME_TEMP LRIT WHERE LRIT.SETTLE_METHOD = 'settlemethod7' GROUP BY lrit.FLOWUNID,LRIT.CONTRACT_ID) LRIT ON LRIT.CONTRACT_ID = LCI.ID LEFT JOIN (SELECT SUM(LFIT.FACT_MONEY) FACT_MONEY,lfit.contract_id FROM LC_FUND_INCOME_TEMP LFIT WHERE LFIT.FEE_TYPE = 'feetype16' AND LFIT.SETTLE_METHOD = 'settlemethod7' GROUP BY lfit.contract_id) LFIT ON LFIT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN lb_union_lessee lul ON lul.contract_id = lci.id LEFT JOIN customer_info cif ON cif.customerid = lul.customer_id LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LRIT.FLOWUNID = :FLOWUNID ";
// 查询sql, 将结果集封装到list集合中
List<Map<String, String>> dataList = DataOperatorUtil.getDataBySql(Sqlca, sql, map);
CreateVoucherServiceImpl vs = new CreateVoucherServiceImpl();

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPay.java
View File

@ -10,7 +10,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class AccountsPay implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("FACT_MONEY"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayFirst.java
View File

@ -11,7 +11,7 @@ public class AccountsPayFirst implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("FACT_MONEY"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/AccountsPayable.java
View File

@ -11,7 +11,7 @@ public class AccountsPayable implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("FACT_MONEY"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/BankOrCash.java
View File

@ -12,7 +12,7 @@ public class BankOrCash implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
//났운-看마운(f10)+뭔零江(f20)+괏麴(f21)+GPS(f24)+陋干陋殃(f23)
BigDecimal total = new BigDecimal(param.get("f10"));
total=total.add(new BigDecimal(param.get("f20")));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseEquipMoneySubFirstMoney.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
*/
public class CleanLeaseEquipMoneySubFirstMoney implements VoucherJavaParamService {
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
// ³µ¿î
String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoney.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
*/
public class CleanLeaseMoney implements VoucherJavaParamService {
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
// ³µ¿î
String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CleanLeaseMoneyAddOtherNoGps.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
*/
public class CleanLeaseMoneyAddOtherNoGps implements VoucherJavaParamService {
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
BigDecimal factmoney=null;
// ³µ¿î

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoan.java
View File

@ -11,7 +11,7 @@ public class CommLoan implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
return returnValue;

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanCautionMoney.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class CommLoanCautionMoney implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("CAUTION_MONEY"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanEquipSubFirstNoTax.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class CommLoanEquipSubFirstNoTax implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("FUNDTYPE","01");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFactMoneyToMoney.java
View File

@ -10,7 +10,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class CommLoanFactMoneyToMoney implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("FUNDTYPE","01");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFinancingSubOthersMoney.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class CommLoanFinancingSubOthersMoney implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("FINANCING_SUB_OTHERS"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddFinancingMoney.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class CommLoanFirstAddFinancingMoney implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("FIRST_ADD_FINANCING"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanFirstAddHandlingMoney.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class CommLoanFirstAddHandlingMoney implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("FIRST_ADD_HANDLING"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/CommLoanInterestAddHandlingMoney.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class CommLoanInterestAddHandlingMoney implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("INTEREST_ADD_HANDLING"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractCorpusMoney.java
View File

@ -13,7 +13,7 @@ public class ContractCorpusMoney implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("CORPUS"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractEquipToJust.java
View File

@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
*/
public class ContractEquipToJust implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("FUNDTYPE","01");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterest.java
View File

@ -12,7 +12,7 @@ public class ContractInterest implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("INTEREST"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestNoTax.java
View File

@ -11,7 +11,7 @@ public class ContractInterestNoTax implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("INTERESTNOTAX"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractInterestTax.java
View File

@ -14,7 +14,7 @@ public class ContractInterestTax implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("TAX"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractMoneyToRent.java
View File

@ -14,7 +14,7 @@ public class ContractMoneyToRent implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("RENTMONEY"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyNoTax.java
View File

@ -15,7 +15,7 @@ public class ContractOtherMoneyNoTax implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("OTHERNOTAX"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractOtherMoneyToTax.java
View File

@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractOtherMoneyToTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("FUNDTYPE","01");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/ContractToDeditMoneyNoTax.java
View File

@ -10,7 +10,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class ContractToDeditMoneyNoTax implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("DEDITMONEY_NOTAX"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/FundGPSFee.java
View File

@ -11,7 +11,7 @@ public class FundGPSFee implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// GPS

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFee.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
*/
public class OtherFee implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
// ±£ÏÕ·Ñ
String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeAddGps.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
*/
public class OtherFeeAddGps implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM");
String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFeeMoneyToLoan.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
*/
public class OtherFeeMoneyToLoan implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM");
String PURCHASE_TAX=param.get("PURCHASE_TAX")==null?"0.00":param.get("PURCHASE_TAX");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/OtherFees.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
*/
public class OtherFees implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
// ±£ÏÕ·Ñ
String INSURANCE_PREMIUM=param.get("INSURANCE_PREMIUM")==null?"0.00":param.get("INSURANCE_PREMIUM");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeLeaseMoney.java
View File

@ -15,7 +15,7 @@ public class SynthesizeLeaseMoney implements VoucherJavaParamService{
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT");
String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherLoan/SynthesizeMoneyToJust.java
View File

@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class SynthesizeMoneyToJust implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
String EQUIP_AMT=param.get("EQUIP_AMT")==null?"0.00":param.get("EQUIP_AMT");
String FIRST_PAYMENT=param.get("FIRST_PAYMENT")==null?"0.00":param.get("FIRST_PAYMENT");

3
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToCautionMoney.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToCautionMoney implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// »ñÈ¡±£Ö¤½ð
@ -19,4 +19,5 @@ public class ContractGetMoneyToCautionMoney implements VoucherJavaParamService{
returnValue.put("MONEY",GUARANTY);
return returnValue;
}
}

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquip.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToEquip implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取设备款

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOther.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToEquipAddInsuranceAddOther implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取设备款

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToEquipAddInsuranceAddOtherSubFirst implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取设备款

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipAddOthers.java
View File

@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToEquipAddOthers implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 设备款+其他金额

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipNoTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToEquipNoTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取设备款

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipSubFirst.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToEquipSubFirst implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
String EQUIP_SUBFIRST=param.get("EQUIP_SUBFIRST")==null?"0.00":param.get("EQUIP_SUBFIRST");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToEquipTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToEquipTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取设备款

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPayment.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToFirstPayment implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 삿혤看마운

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentNoTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToFirstPaymentNoTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 首付款(不含税)

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToFirstPaymentTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToFirstPaymentTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 看마운(江쏜)

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingCharge.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToHandlingCharge implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取手续费

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeNoTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToHandlingChargeNoTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取手续费(不含税)

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToHandlingChargeTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToHandlingChargeTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取手续费(税金)

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToINTEREST.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToINTEREST implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("FUNDTYPE","02");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOther.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToInsuranceAddOther implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取设备款INSURANCE_OTHER

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherNoTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToInsuranceAddOtherNoTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// 获取设备款

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToInsuranceAddOtherTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToInsuranceAddOtherTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// ±£ÏÕ+ÆäËû(Ë°½ð)

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoney.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToMoney implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("MONEY",param.get("FACT_MONEY"));

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyNoTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToMoneyNoTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("FUNDTYPE","02");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToMoneyTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToMoneyTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
returnValue.put("FUNDTYPE","02");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOther.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToOther implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// »ñÈ¡ÆäËü½ðî

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherNoTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToOtherNoTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// »ñÈ¡ÆäËü½ðî

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOtherTax.java
View File

@ -11,7 +11,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToOtherTax implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
// »ñÈ¡ÆäËü½ðî

2
src_core/com/tenwa/voucher/CreateVoucherProcess/VoucherGetMoneyForTradition/ContractGetMoneyToOthersMath.java
View File

@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
* @author xiezhiwen
*/
public class ContractGetMoneyToOthersMath implements VoucherJavaParamService{
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx, Map<String, String> param,Map<String, String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);
String OTHERS_MATH=param.get("OTHERS_MATH")==null?"0.00":param.get("OTHERS_MATH");

2
src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryBusinessType.java
View File

@ -12,7 +12,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
*/
public class auxiliaryBusinessType implements VoucherJavaParamService {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String,String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
String BUSINESSTYPE=param.get("BUSINESSTYPE");
returnValue.put("BUSINESSTYPE",BUSINESSTYPE);

2
src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryCashFlow.java
View File

@ -13,7 +13,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class auxiliaryCashFlow implements VoucherJavaParamService {
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String,String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
String CASHFLOW=param.get("CASHFLOW");
returnValue.put("CASHFLOW",CASHFLOW);

2
src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractAcc.java
View File

@ -14,7 +14,7 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class auxiliaryContractAcc implements VoucherJavaParamService {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String,String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
String ACC_NUMBER=param.get("ACC_NUMBER");
returnValue.put("ACC_NUMBER",ACC_NUMBER);

32
src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractCustomer.java
View File

@ -9,13 +9,33 @@ import com.tenwa.voucher.service.VoucherJavaParamService;
public class auxiliaryContractCustomer implements VoucherJavaParamService {
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
public Map<String, String> getJavaParam(JBOTransaction tx,Map<String, String> param,Map<String,String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
String DISTRIBUTOR_ID=param.get("DISTRIBUTOR_ID");
String DISTRIBUTOR_NAME=param.get("DISTRIBUTOR_NAME");
returnValue.put("DISTRIBUTOR_ID",DISTRIBUTOR_ID);
returnValue.put("DISTRIBUTOR_NAME",DISTRIBUTOR_NAME);
// 定义全局客商编码和名称
String CUSTID="";
String CUSTNAME="";
// 获取CreateVoucherServiceImpl类中定义的客商编码
String s1 = subData.get("CUSTID");
// s1为空, 取值param中的编码
if(s1 ==null || "".equals(s1)) {
CUSTID=param.get("CUSTID");
// 如果不为空, 说明已经有了, 取值s1
}else {
CUSTID=s1;
}
// 获取CreateVoucherServiceImpl类中定义的客商名称
String s2 = subData.get("CUSTNAME");
// s1为空, 取值param中的名称
if(s2 ==null || "".equals(s2)) {
CUSTNAME=param.get("CUSTNAME");
// 如果不为空, 说明已经有了, 取值s1
}else {
CUSTNAME=s2;
}
returnValue.put("CUSTID",CUSTID);
returnValue.put("CUSTNAME",CUSTNAME);
return returnValue;
}
}

2
src_core/com/tenwa/voucher/CreateVoucherProcess/auxiliaryInfo/auxiliaryContractNumber.java
View File

@ -11,7 +11,7 @@ public class auxiliaryContractNumber implements VoucherJavaParamService {
@Override
public Map<String, String> getJavaParam(JBOTransaction tx,
Map<String, String> param) throws BusinessException {
Map<String, String> param,Map<String,String> subData) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
String CONTRACT_NUMBER=param.get("CONTRACT_NUMBER");
returnValue.put("CONTRACT_NUMBER",CONTRACT_NUMBER);

2
src_core/com/tenwa/voucher/service/VoucherJavaParamService.java
View File

@ -7,5 +7,5 @@ import com.tenwa.comm.exception.BusinessException;
public interface VoucherJavaParamService {
public Map<String,String> getJavaParam(JBOTransaction tx,Map<String,String> param)throws BusinessException;
public Map<String,String> getJavaParam(JBOTransaction tx,Map<String,String> param,Map<String,String> subData)throws BusinessException;
}

18
src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
View File

@ -323,7 +323,7 @@ public class CreateVoucherServiceImpl {
ps=null;
}
if(ps!=null){
dataTemp=ps.getJavaParam(tx, param);
dataTemp=ps.getJavaParam(tx, param,subData);
}else{
dataTemp=psi.getParamSql(tx, param,bo.getAttribute("VALUE_MODE").getString(), null);
}
@ -361,10 +361,10 @@ public class CreateVoucherServiceImpl {
subData.put("CUSTNAME","业务系统待查客户");//虚拟账户
}else if("PZ2018072100000038".equals(VOUCHERNO) || "PZ2018072100000039".equals(VOUCHERNO) || "PZ2018072100000043".equals(VOUCHERNO)) {
subData.put("CUSTNAME","业务系统待查客户");//虚拟账户
}else {
}/*else {
subData.put("CUSTID",dataTemp.get("CUSTID"));//客商id
subData.put("CUSTNAME",dataTemp.get("CUSTNAME"));//客商名称
}
}*/
}else{
subData.put("F7","0");//借方金额
subData.put("F8",dataTemp.get("MONEY"));//贷方金额
@ -373,10 +373,11 @@ public class CreateVoucherServiceImpl {
if("PZ2018081600000120".equals(VOUCHERNO)){
subData.put("CUSTID","APZL00000000DC");
subData.put("CUSTNAME","业务系统待查客户");
}else {
}
/*else {
subData.put("CUSTID",dataTemp.get("CUSTID"));//客商id
subData.put("CUSTNAME",dataTemp.get("CUSTNAME"));//客商名称
}
}*/
}
if(dataTemp.containsKey("FACT_DATE")){
subData.put("F15", dataTemp.get("FACT_DATE"));//业务日期
@ -388,11 +389,10 @@ public class CreateVoucherServiceImpl {
}
if(sub.getAttribute("AUXILIARY_TYPE").getString().length()>0){
subData.putAll(this.getAuxiliaryData(tx, param, sub.getAttribute("AUXILIARY_TYPE").getString()));
subData.putAll(this.getAuxiliaryData(tx, param,subData,sub.getAttribute("AUXILIARY_TYPE").getString()));
}
// 获取直租/回租类型
String LEAS_FORM = param.get("LEAS_FORM");
// 起租, 购置融资租赁资产带经销商编码
if("PZ2018070900000002".equals(VOUCHERNO)) {
if("3".equals(SORT_NUMBER)) {
@ -445,7 +445,7 @@ public class CreateVoucherServiceImpl {
return list;
}
@SuppressWarnings("unchecked")
public Map<String,String> getAuxiliaryData(JBOTransaction tx,Map<String,String> param,String auxids) throws Exception{
public Map<String,String> getAuxiliaryData(JBOTransaction tx,Map<String,String> param,Map<String,String> subData,String auxids) throws Exception{
Map<String,String> data=new HashMap<String, String>();
VoucherParamServiceImpl psi=new VoucherParamServiceImpl();
@ -461,7 +461,7 @@ public class CreateVoucherServiceImpl {
ps=null;
}
if(ps!=null){
data.putAll(ps.getJavaParam(tx, param));
data.putAll(ps.getJavaParam(tx, param,subData));
}else{
data.putAll(psi.getParamSql(tx, param,con.getAttribute("VALUE_MODE").getString(), con.getAttribute("VALUE_LIST").getString()));
}