凭证相关

This commit is contained in:
xiezhiwen 2018-08-11 17:20:47 +08:00
parent 18635a120e
commit 1f93531044
8 changed files with 13 additions and 11 deletions

View File

@ -62,7 +62,11 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
if(mon>0){
ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString();
FACT_DATE =dataList.get(i).get("FACT_DATE").toString();
leas_form="02";
if("PZ2018080400000098".equals(VOUCHERNO)) {
leas_form="01";
}else {
leas_form="02";
}
DISTRIBUTOR_ID=dataList.get(i).get("DISTRIBUTOR_NO");
DISTRIBUTOR_NAME=dataList.get(i).get("DISTRIBUTOR_NAME");

View File

@ -51,7 +51,7 @@ public class CreateVoucherInsuranceSettlement{
if("PZ2018080600000114".equals(voucherNo)){
sql="SELECT lic.claims_money AS MONEY,ROUND(nvl(LrIT.penalty / 1.06, 0),2) AS MONEYNOTAX,ROUND(nvl(LrIT.penalty,0),2) - ROUND(nvl(LrIT.penalty / 1.06, 0),2) AS MONEYTAX,ROUND(nvl(LrIT.RENT,0),2) AS RENTMONEY,DATE_FORMAT(claims_start_date, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date, '%Y/%m/%d') AS FACT_DATE,lii.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic INNER JOIN LB_INSURANCE_INFO lii ON lic.INSURANCE_ID = lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID = LCI.ID LEFT JOIN LC_rent_INCOME_temp LrIT ON LrIT.`CONTRACT_ID`=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID = LCI.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 DATE_FORMAT(lic.inputtime, '%Y/%m') = DATE_FORMAT(SYSDATE(), '%Y/%m')";
}else{
sql="SELECT lic.claims_money AS MONEY,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS FACT_DATE,lii.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic inner join LB_INSURANCE_INFO lii on lic.INSURANCE_ID=lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.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 DATE_FORMAT(lic.inputtime,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')";
sql="SELECT lic.claims_money AS MONEY,'0' AS MONEYNOTAX,'0' AS MONEYTAX,'0' AS RENTMONEY,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(claims_start_date,'%Y/%m/%d') AS FACT_DATE,lii.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,LEC.ID AS CARID,LEC.MODEL,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LB_INSURANCE_CLAIM lic inner join LB_INSURANCE_INFO lii on lic.INSURANCE_ID=lii.INSURANCE_ID LEFT JOIN LB_CONTRACT_INFO LCI ON lii.CONTRACT_ID=LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO=LCI.DISTRIBUTOR_ID LEFT JOIN LB_EQUIPMENT_CAR LEC ON LEC.CONTRACT_ID=LCI.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 DATE_FORMAT(lic.inputtime,'%Y/%m/%d')=DATE_FORMAT(SYSDATE(),'%Y/%m/%d')";
}
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);

View File

@ -10,8 +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) throws BusinessException {
Map<String,String>returnValue=new HashMap<String,String>();
returnValue.putAll(param);

View File

@ -37,7 +37,7 @@ public class ContractOnhireVoucher extends BaseBussiness {
cvcr.CreateVoucher(FlowUnid, "PZ2018071100000010");//给经销商放款-车款及其他绑定款项--回租
cvcr.CreateVoucher(FlowUnid, "PZ2018080300000074");//给经销商放款-车款及其他绑定款项--直租
cvcr.CreateVoucher(FlowUnid, "PZ2018080600000116");//给经销商放款-代收代付部分--直租
// cvcr.CreateVoucher(FlowUnid, "PZ2018080600000116");//给经销商放款-代收代付部分--直租
CreateVoucherHandlingMoney cvhl=new CreateVoucherHandlingMoney();
cvhl.CreateVoucher(FlowUnid, "PZ2018071000000007");//给经销商放款冲抵确认手续费收入一次性确认收入--回租
@ -47,7 +47,6 @@ public class ContractOnhireVoucher extends BaseBussiness {
cvhl.CreateVoucher(FlowUnid, "PZ2018080300000073");//给经销商放款冲抵确认收到手续费按月分摊收入--直租
//CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome();
return "true";
}
}

View File

@ -28,8 +28,8 @@ public class ContractTerminate extends BaseBussiness {
cvct.CreateVoucher(FlowUnid, "PZ2018072100000046");//未实现的利息的税金--回租
cvct.CreateVoucher(FlowUnid, "PZ2018080400000100");//未实现的利息的税金--直租
CreateVoucherCustomerRentOrFee cvcr = new CreateVoucherCustomerRentOrFee();
cvcr.CreateVoucher(FlowUnid, "PZ2018080600000117");//收到代收代付款--直租
//CreateVoucherCustomerRentOrFee cvcr = new CreateVoucherCustomerRentOrFee();
//cvcr.CreateVoucher(FlowUnid, "PZ2018080600000117");//收到代收代付款--直租
return "true";
}

View File

@ -10,7 +10,6 @@ public class DistributorCautionMoneyVoucher extends BaseBussiness {
public Object run(Transaction Sqlca) throws Exception {
this.initBussinessParam(Sqlca);
String FlowUnid=this.getAttribute("FlowUnid").toString();
CreateVoucherDistCautionMoneyRe cvdc=new CreateVoucherDistCautionMoneyRe();
cvdc.CreateVoucher(FlowUnid, "PZ2018071100000011");//Í˻ؾ­ÏúÉ̱£Ö¤½ð --»Ø×â
cvdc.CreateVoucher(FlowUnid, "PZ2018080400000076");//Í˻ؾ­ÏúÉ̱£Ö¤½ð --Ö±×â

View File

@ -48,8 +48,8 @@ public class RedIncomeVoucher extends BaseBussiness {
cvis.CreateVoucher("PZ2018080400000096");//收到理赔保险费 --直租
CreateVoucherCustomerRentOrFee cvcr = new CreateVoucherCustomerRentOrFee();
cvcr.CreateVoucher(FlowUnid, "PZ2018080400000077");//收到代收代付款--直租
//CreateVoucherCustomerRentOrFee cvcr = new CreateVoucherCustomerRentOrFee();
//cvcr.CreateVoucher(FlowUnid, "PZ2018080400000077");//收到代收代付款--直租
CreateVoucherDistCautionMoneyRe cvdc=new CreateVoucherDistCautionMoneyRe();

View File

@ -315,6 +315,7 @@ public class CreateVoucherServiceImpl {
subData.put("CONTRACT_ID", dataTemp.get("CONTRACT_ID"));
}
param.put("FUNDTYPE", dataTemp.get("FUNDTYPE"));
System.out.println(dataTemp.get("FUNDTYPE"));
if(sub.getAttribute("AUXILIARY_TYPE").getString().length()>0){
subData.putAll(this.getAuxiliaryData(tx, param, sub.getAttribute("AUXILIARY_TYPE").getString()));
}