diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java index d61357484..b4fa45f0b 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherContractTerminate.java @@ -149,6 +149,10 @@ public class CreateVoucherContractTerminate { if("PZ2018081700000132".equals(VOUCHERNO) || "PZ2018072100000047".equals(VOUCHERNO) || "PZ2018081700000138".equals(VOUCHERNO) || "PZ2018072100000046".equals(VOUCHERNO) || "PZ2018081700000122".equals(VOUCHERNO)) { param.put("BUSINESSTYPE", "0604");// 主营类型 } + // 收到名义货价 + if("PZ2018081700000134".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0605");// 主营类型 + } param.put("CASHFLOW", "");// 现金流项目 } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java index 039eebe1e..95eefb140 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherCustCautionMoneyIncome.java @@ -102,7 +102,7 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { param.put("BUSINESSTYPE", BUSINESSTYPE); param.put("ACC_NUMBER", ACC_NUM); - if ("1".equals(BUSINESSTYPE)) { + /*if ("1".equals(BUSINESSTYPE)) { param.put("LEASFORMASSET", "04"); // 融资租赁资产 param.put("DEPT", "02"); // 部门 if ("03".equals(CUSTOMERTYPE)) { // 如果是个人业务 @@ -110,6 +110,12 @@ public class CreateVoucherCustCautionMoneyIncome extends BaseBussiness { } else if ("01".equals(CUSTOMERTYPE)) { param.put("LEASINCOMEFORM", "01"); // B端 } + }*/ + + if("PZ2018072100000026".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0602");// 主营类型 + }else if("PZ2018072100000031".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0605");// 主营类型 } // param.put("FUNDTYPE", ""); // 主营类型 param.put("BUSINESSTYPE", "06"); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java index 539b7ef08..bfdb1a957 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java @@ -111,10 +111,18 @@ public class CreateVoucherRedRentIncome { if("PZ2018072100000037".equals(VOUCHERNO)) { param.put("BUSINESSTYPE", "0604");// 主营类型 } - // 收到的违约金 + // 收到的逾期利息 if("PZ2018072100000038".equals(VOUCHERNO)) { param.put("BUSINESSTYPE", "0603");// 主营类型 } + // 收到的违约金 + if("PZ2018072100000039".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0602");// 主营类型 + } + // 收到名义货价 + if("PZ2018072100000043".equals(VOUCHERNO)) { + param.put("BUSINESSTYPE", "0605");// 主营类型 + } param.put("CASHFLOW", "");// 现金流项目 }