From 617668d5c84a972abbdc97df2c258308d92f3ee8 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Tue, 2 Jun 2020 13:54:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E7=9B=B8=E5=85=B3=EF=BC=8C?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E6=B1=BD=E8=BD=A6=E5=9B=9E=E7=A7=9F?= =?UTF-8?q?=E6=94=B6=E5=88=B0=E5=AE=A2=E6=88=B7=E4=BF=9D=E8=AF=81=E9=87=91?= =?UTF-8?q?=E7=BA=A2=E5=86=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateVoucherMethodSettle/RedIncomeVoucher.java | 1 + .../CreateVoucherProcess/CreateVoucherRedRentIncome.java | 3 +++ .../tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java | 2 +- src_sql/鎶曚骇SQL/V20200521/xzw_20200521.sql | 7 +++++++ 4 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src_sql/鎶曚骇SQL/V20200521/xzw_20200521.sql diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java index 96f82d1a3..9c3984e2d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java @@ -22,6 +22,7 @@ public class RedIncomeVoucher extends BaseBussiness { cvri.CreateVoucher(FlowUnid, "PZ2018072100000039",userid);//网银回款反冲-收到的违约金/罚款 cvri.CreateVoucher(FlowUnid, "PZ2018072100000037",userid);//网银回款反冲-收到的租金 cvri.CreateVoucher(FlowUnid, "PZ2018072100000043",userid);//网银回款反冲-收到名义货价 + cvri.CreateVoucher(FlowUnid, "PZ2018072100000034",userid);//网银回款反冲-收到客户保证金 /** * 汽车直租 diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java index 3d61fe7b6..d8dd91ea2 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRedRentIncome.java @@ -69,6 +69,9 @@ public class CreateVoucherRedRentIncome { // 收到的名义货架 }else if("PZ2018072100000043".equals(VOUCHERNO) || "PZ2019070100000025".equals(VOUCHERNO)) { sql="SELECT ROUND((getTax(lci.LEAS_FORM,'留购价',LCCT.START_DATE)-1)*100,0) AS TAX_NUM,IFNULL(LFIT.FACT_MONEY,0) AS MONEY,ROUND(IFNULL(LFIT.FACT_MONEY,0)/getTax(LCI.LEAS_FORM,'留购价',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LFIT.FACT_MONEY,0)-ROUND(IFNULL(LFIT.FACT_MONEY,0)/getTax(LCI.LEAS_FORM,'留购价',LCCT.START_DATE),2)) AS MONEYTAX,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,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID=LFIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND FEE_TYPE='feetype4' AND IFNULL(LFIT.FACT_MONEY, 0)<0 AND LFIT.FLOWUNID=:FLOWUNID "; + // 收到客户保证金 + }else if("PZ2018072100000034".equals(VOUCHERNO)) { + sql="SELECT IFNULL(LFIT.FACT_MONEY, 0) AS MONEY,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,'02' AS LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_FUND_INCOME_TEMP LFIT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LFIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.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 LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN = 'Y' AND FEE_TYPE = 'feetype2' AND IFNULL(LFIT.FACT_MONEY, 0) < 0 AND LFIT.FLOWUNID = :FLOWUNID"; } List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map); diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 7f3a5243f..3f09d6bd4 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -416,7 +416,7 @@ public class CreateVoucherServiceImpl { if("PZ2018072100000026".equals(VOUCHERNO) || "PZ2018072100000031".equals(VOUCHERNO) || "PZ2018072100000028".equals(VOUCHERNO) || "PZ2018072100000041".equals(VOUCHERNO) || "PZ2019070100000015".equals(VOUCHERNO) || "PZ2019070100000019".equals(VOUCHERNO) || "PZ2019070100000018".equals(VOUCHERNO) || "PZ2019070100000024".equals(VOUCHERNO) || "PZ2020041000000003".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC");//虚拟客户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 - }else if("PZ2018081700000134".equals(VOUCHERNO) || "PZ2018081700000138".equals(VOUCHERNO) || "PZ2018072100000047".equals(VOUCHERNO) || "PZ2018081700000132".equals(VOUCHERNO) || "PZ2018081700000130".equals(VOUCHERNO) || "PZ2018081700000128".equals(VOUCHERNO)){ + }else if("PZ2018081700000134".equals(VOUCHERNO) || "PZ2018081700000138".equals(VOUCHERNO) || "PZ2018072100000047".equals(VOUCHERNO) || "PZ2018081700000132".equals(VOUCHERNO) || "PZ2018081700000130".equals(VOUCHERNO) || "PZ2018081700000128".equals(VOUCHERNO) || "PZ2018072100000034".equals(VOUCHERNO)){ subData.put("CUSTID","APZL00000000DC");//虚拟客户 subData.put("CUSTNAME","汽车C端待查客户");//虚拟客户 }else if("PZ2018072100000039".equals(VOUCHERNO) || "PZ2019070100000021".equals(VOUCHERNO) || "PZ2018072100000043".equals(VOUCHERNO) || "PZ2019070100000025".equals(VOUCHERNO) || "PZ2019121600000162".equals(VOUCHERNO) || "PZ2019121600000163".equals(VOUCHERNO) || "PZ2019121700000164".equals(VOUCHERNO)) { diff --git a/src_sql/鎶曚骇SQL/V20200521/xzw_20200521.sql b/src_sql/鎶曚骇SQL/V20200521/xzw_20200521.sql new file mode 100644 index 000000000..ca00b786e --- /dev/null +++ b/src_sql/鎶曚骇SQL/V20200521/xzw_20200521.sql @@ -0,0 +1,7 @@ +--回款反冲-收到客户保证金凭证信息配置 +DELETE FROM LV_VOUCHER_CONFIG WHERE ID='91e1e0233dc940edb2517e4c14c6d34a'; +insert into `LV_VOUCHER_CONFIG` (`ID`, `MODULAR_NUMBER`, `OWNED_COMPANY`, `PROJ_TYPE`, `INIT_CLASS`, `VOUCHER_TYPE`, `VOUCHER_NO`, `FIR_KEY`) values('91e1e0233dc940edb2517e4c14c6d34a','回款反冲-收到客户保证金','cae44920253511e9bb6c00163e0ad612','02','','1','PZ2018072100000034',NULL); +-- 凭证借贷配置 +DELETE FROM LV_VOUCHER_LOAN WHERE VOUCHER_ID='91e1e0233dc940edb2517e4c14c6d34a'; +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('d59a02258d7341ed951ef6f6b97356bd','1','8b7761a7250511e9bb6c00163e0ad612','1','1','反冲-收到客户保证金','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanFactMoneyToMoney','91e1e0233dc940edb2517e4c14c6d34a'); +insert into `LV_VOUCHER_LOAN` (`ID`, `SORT_NUMBER`, `LOAN_SUBJECT`, `LOAN_DIRECTION`, `IS_CUSTOM_ABSTRACT`, `VALUE_ABSTRACT`, `IS_CUSTOM_VALUE`, `VALUE_MODE`, `VOUCHER_ID`) values('d731666e0b3246ecb27b7eb59e86ba8f','2','8b775c68250511e9bb6c00163e0ad612','2','1','反冲-收到客户保证金','1','com.tenwa.voucher.CreateVoucherProcess.CreateVoucherLoan.CommLoanFactMoneyToMoney','91e1e0233dc940edb2517e4c14c6d34a'); \ No newline at end of file