凭证相关
This commit is contained in:
parent
b6d0cd1438
commit
6900337194
@ -101,7 +101,7 @@ public class CreateVoucherContractOnhireChange {
|
||||
param.put("LEASINCOMEFORM", "01"); // B¶Ë
|
||||
}
|
||||
}
|
||||
//param.put("FUNDTYPE", ""); // Ö÷ÓªÀàÐÍ
|
||||
param.put("FUNDTYPE", "01"); // Ö÷ÓªÀàÐÍ
|
||||
param.put("BUSINESSTYPE", "06");
|
||||
|
||||
param.put("FlowUnid", FlowUnid);
|
||||
|
||||
@ -38,16 +38,19 @@ public class CreateVoucherContractTerminate {
|
||||
String sql="";
|
||||
param.clear();
|
||||
map.put("FlowUnid", FlowUnid);
|
||||
//回款--收到违约金
|
||||
if("PZ2018072100000026".equals(VOUCHERNO)){
|
||||
sql= "SELECT IFNULL(HANDLING_CHARGE,0) AS MONEY ,ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2) AS MONEYNOTAX,(IFNULL(HANDLING_CHARGE,0)-ROUND(IFNULL(HANDLING_CHARGE,0)/1.06,2)) AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID";
|
||||
}
|
||||
//收到的提前还款
|
||||
if("PZ2018072100000027".equals(VOUCHERNO)){
|
||||
sql= "SELECT IFNULL(CORPUS_OVERAGE,0) AS MONEY ,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,LCI.ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID";
|
||||
}
|
||||
|
||||
//提前还款-调整未实现利息收入
|
||||
if("PZ2018072100000045".equals(VOUCHERNO)){
|
||||
sql="SELECT ROUND(IFNULL(AGREED_INTEREST,0)/1.06,2) AS MONEY ,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%M/%D') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%M/%D') AS FACT_DATE,LCI.ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID";
|
||||
}
|
||||
//提前还款-调整未实现利息收入税金
|
||||
if("PZ2018072100000046".equals(VOUCHERNO)){
|
||||
sql="SELECT IFNULL(AGREED_INTEREST,0)-ROUND(IFNULL(AGREED_INTEREST,0)/1.06,2) AS MONEY ,0 AS MONEYNOTAX,0 AS MONEYTAX,DATE_FORMAT(SYSDATE(),'%Y/%M/%D') AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%M/%D') AS FACT_DATE,LCI.ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,CIF.CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_RENT_ADJUST_TEMP LFRA INNER JOIN LC_CALC_CONDITION LCC ON LCC.PAYMENT_NUMBER=LFRA.PAYMENT_NUMBER INNER JOIN LB_CONTRACT_INFO LCI ON LCC.CONTRACT_ID=LCI.ID INNER 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 LFRA.FLOWUNID=:FLOWUNID";
|
||||
}
|
||||
@ -103,7 +106,7 @@ public class CreateVoucherContractTerminate {
|
||||
param.put("LEASINCOMEFORM", "01"); // B¶Ë
|
||||
}
|
||||
}
|
||||
//param.put("FUNDTYPE", ""); // Ö÷ÓªÀàÐÍ
|
||||
param.put("FUNDTYPE", ""); // 主营类型
|
||||
param.put("BUSINESSTYPE", "06");
|
||||
|
||||
param.put("FlowUnid", FlowUnid);
|
||||
|
||||
@ -14,6 +14,8 @@ public class CommLoanFactMoneyToMoney implements VoucherJavaParamService{
|
||||
Map<String, String> param) throws BusinessException {
|
||||
Map<String,String>returnValue=new HashMap<String,String>();
|
||||
returnValue.putAll(param);
|
||||
|
||||
returnValue.put("FUNDTYPE","01");
|
||||
returnValue.put("MONEY",param.get("FACT_MONEY"));
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
@ -15,6 +15,7 @@ public class ContractInterest implements VoucherJavaParamService{
|
||||
Map<String, String> param) throws BusinessException {
|
||||
Map<String,String>returnValue=new HashMap<String,String>();
|
||||
returnValue.putAll(param);
|
||||
returnValue.put("FUNDTYPE","02");
|
||||
returnValue.put("MONEY",param.get("INTEREST"));
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
@ -14,6 +14,7 @@ public class ContractInterestTax implements VoucherJavaParamService{
|
||||
Map<String, String> param) throws BusinessException {
|
||||
Map<String,String>returnValue=new HashMap<String,String>();
|
||||
returnValue.putAll(param);
|
||||
returnValue.put("FUNDTYPE","02");
|
||||
returnValue.put("MONEY",param.get("TAX"));
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
@ -25,6 +25,7 @@ public class OtherFee implements VoucherJavaParamService{
|
||||
.add(new BigDecimal(GPS_FEE_FINANCE));
|
||||
|
||||
returnValue.putAll(param);
|
||||
returnValue.put("FUNDTYPE","01");
|
||||
returnValue.put("MONEY",factmoney.toString());
|
||||
return returnValue;
|
||||
}
|
||||
|
||||
@ -106,7 +106,7 @@ public class CreateVoucherMonthSettlement{
|
||||
param.put("LEASINCOMEFORM", "01"); // B¶Ë
|
||||
}
|
||||
}
|
||||
//param.put("FUNDTYPE", ""); // Ö÷ÓªÀàÐÍ
|
||||
param.put("FUNDTYPE", "02"); // Ö÷ÓªÀàÐÍ
|
||||
param.put("BUSINESSTYPE", "06");
|
||||
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@ import com.amarsoft.are.jbo.JBOTransaction;
|
||||
import com.tenwa.comm.exception.BusinessException;
|
||||
import com.tenwa.voucher.service.VoucherJavaParamService;
|
||||
|
||||
public class auxiliaryContractPlanList implements VoucherJavaParamService {
|
||||
public class auxiliaryBusinessType implements VoucherJavaParamService {
|
||||
|
||||
@Override
|
||||
public Map<String, String> getJavaParam(JBOTransaction tx,
|
||||
@ -13,10 +13,9 @@ public class auxiliaryContractCar implements VoucherJavaParamService {
|
||||
public Map<String, String> getJavaParam(JBOTransaction tx,
|
||||
Map<String, String> param) throws BusinessException {
|
||||
Map<String,String>returnValue=new HashMap<String,String>();
|
||||
String CARID=param.get("CARID");
|
||||
String CARMODEL=param.get("CARMODEL");
|
||||
returnValue.put("CARID",CARID);
|
||||
returnValue.put("CARMODEL",CARMODEL);
|
||||
|
||||
String LEASFORMASSET=param.get("LEASFORMASSET");
|
||||
returnValue.put("LEASFORMASSET",LEASFORMASSET);
|
||||
return returnValue;
|
||||
}
|
||||
}
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
package com.tenwa.voucher.CreateVoucherProcess.auxiliaryInfo;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.amarsoft.are.jbo.JBOTransaction;
|
||||
import com.tenwa.comm.exception.BusinessException;
|
||||
import com.tenwa.voucher.service.VoucherJavaParamService;
|
||||
|
||||
public class auxiliaryFundType implements VoucherJavaParamService {
|
||||
|
||||
@Override
|
||||
public Map<String, String> getJavaParam(JBOTransaction tx,
|
||||
Map<String, String> param) throws BusinessException {
|
||||
Map<String,String>returnValue=new HashMap<String,String>();
|
||||
String FUNDTYPE=param.get("FUNDTYPE");
|
||||
returnValue.put("FUNDTYPE",FUNDTYPE);
|
||||
return returnValue;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,20 @@
|
||||
package com.tenwa.voucher.CreateVoucherProcess.auxiliaryInfo;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import com.amarsoft.are.jbo.JBOTransaction;
|
||||
import com.tenwa.comm.exception.BusinessException;
|
||||
import com.tenwa.voucher.service.VoucherJavaParamService;
|
||||
|
||||
public class auxiliaryLeasIncomeForm implements VoucherJavaParamService {
|
||||
|
||||
@Override
|
||||
public Map<String, String> getJavaParam(JBOTransaction tx,
|
||||
Map<String, String> param) throws BusinessException {
|
||||
Map<String,String>returnValue=new HashMap<String,String>();
|
||||
String LEASINCOMEFORM=param.get("LEASINCOMEFORM");
|
||||
returnValue.put("LEASINCOMEFORM",LEASINCOMEFORM);
|
||||
return returnValue;
|
||||
}
|
||||
}
|
||||
@ -131,6 +131,9 @@ public class VoucherToV8Impl implements VoucherService {
|
||||
d.put("F66",list.get(i).get("DISTRIBUTOR_NAME"));
|
||||
d.put("F64","汽车");
|
||||
d.put("F63","业务二部");
|
||||
d.put("F73",list.get(i).get("LEASINCOMEFORM"));
|
||||
d.put("F75",list.get(i).get("FUNDTYPE"));
|
||||
d.put("F75",list.get(i).get("BUSINESSTYPE"));
|
||||
|
||||
d.put("inputuserid",user.getAttribute("userid").getString());
|
||||
d.put("v8_status",status);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user