From 1590bf16b1ae35df947453321bfc93a8b92beef1 Mon Sep 17 00:00:00 2001 From: xiezhiwen Date: Wed, 15 Aug 2018 19:20:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=AD=E8=AF=81=E6=89=80=E9=9C=80=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=A2=AB=E5=88=A0=E9=99=A4=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/etc/jbo/jbo_calc.xml | 1 + .../tenwa/comm/util/jboutil/DataOperatorUtil.java | 3 +-- .../CreateVoucherDistCautionMoneyRe.java | 4 ++-- .../CreateVoucherHandlingMoney.java | 5 ++--- .../CautionMoneyVoucher.java | 2 +- .../DistributorCautionMoneyVoucher.java | 6 ++++-- .../CreateVoucherMethodSettle/RedIncomeVoucher.java | 12 +----------- .../voucher/serviceImp/CreateVoucherServiceImpl.java | 3 +-- .../CreateVoucherRentIncomeMission.java | 5 ++--- 9 files changed, 15 insertions(+), 26 deletions(-) diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml index 6a44a4ea1..740337796 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml @@ -1175,6 +1175,7 @@ + diff --git a/src_core/com/tenwa/comm/util/jboutil/DataOperatorUtil.java b/src_core/com/tenwa/comm/util/jboutil/DataOperatorUtil.java index 3ee6855b9..67f9906e4 100644 --- a/src_core/com/tenwa/comm/util/jboutil/DataOperatorUtil.java +++ b/src_core/com/tenwa/comm/util/jboutil/DataOperatorUtil.java @@ -59,8 +59,7 @@ public class DataOperatorUtil { } toObject = bqDest.getSingleResult(true);// ĿJBOҪ² if (null == toObject) { - toObject = bmToObject.newObject(); - + toObject = bmToObject.newObject(); } } String querySql = getQuerySql(fromCondtion); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java index 1fbfc305f..7ba56230d 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java @@ -36,14 +36,14 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { String sql=""; param.clear(); map.put("FLOWUNID", FlowUnid); - if("PZ2018071100000011".equals(VOUCHERNO)){ + if("PZ2018071100000011".equals(VOUCHERNO)||"PZ2018081500000118".equals(VOUCHERNO)){ sql= "SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') " + "AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') AS FACT_DATE,DDIT.LOCAL_ACCOUNT AS ACC_NUMBER," + "DDIT.REFUND_PERSON,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO,DIF.DISTRIBUTOR_NAME FROM D_DEPOSITRETURN_INFO_TEMP" + " DDIT LEFT JOIN DISTRIBUTOR_INFO DIF ON DIF.DISTRIBUTOR_NO=DDIT.DISTRIBUTOR_ID " + "WHERE DDIT.FLOWUNID=:FLOWUNID"; } - if("PZ2018072100000032".equals(VOUCHERNO)||"PZ2018072100000044".equals(VOUCHERNO)){ + if("PZ2018072100000032".equals(VOUCHERNO)||"PZ2018081500000119".equals(VOUCHERNO)){ sql= "SELECT DDIT.CAUTION_MONEY,DATE_FORMAT(SYSDATE(),'%Y/%m/%d')" + " AS ACCOUNT_DATE,DATE_FORMAT(SYSDATE(),'%Y/%m/%d') " + "AS FACT_DATE,DDIT.payer,DIF.DISTRIBUTOR_CODING DISTRIBUTOR_NO," diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java index 43c5c8985..811a0e5b4 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java @@ -62,9 +62,8 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception { if("".equals(MONEY)||MONEY==null) MONEY="0.00"; double mon=Double.parseDouble(MONEY); if(mon>0){ - MONEYNOTAX=dataList.get(i).get("HANDLFEENOTAX").toString(); - MONEYTAX=dataList.get(i).get("HANDLTAX").toString(); - + MONEYNOTAX=dataList.get(i).get("HANDLFEENOTAX").toString(); + MONEYTAX=dataList.get(i).get("HANDLTAX").toString(); ACCOUNT_DATE=dataList.get(i).get("ACCOUNT_DATE").toString(); FACT_DATE =dataList.get(i).get("FACT_DATE").toString(); CONTRACT_ID=dataList.get(i).get("CONTRACT_ID").toString(); diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java index aa58c38d2..cf8a250ad 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java @@ -10,7 +10,7 @@ public class CautionMoneyVoucher extends BaseBussiness { this.initBussinessParam(Sqlca); String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherCustCautionMoneyIncome cvcc=new CreateVoucherCustCautionMoneyIncome(); - cvcc.CreateVoucher(FlowUnid, "PZ2018072400000059", "feetype17");//˻ر֤-- + cvcc.CreateVoucher(FlowUnid, "PZ2018072400000059", "feetype17");//˻û֤-- cvcc.CreateVoucher(FlowUnid, "PZ2018080400000075", "feetype17");//˻û֤--ֱ return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java index a60056153..581156d15 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java @@ -11,9 +11,11 @@ public class DistributorCautionMoneyVoucher extends BaseBussiness { this.initBussinessParam(Sqlca); String FlowUnid=this.getAttribute("FlowUnid").toString(); CreateVoucherDistCautionMoneyRe cvdc=new CreateVoucherDistCautionMoneyRe(); - cvdc.CreateVoucher(FlowUnid, "PZ2018071100000011");//˻ؾ̱֤ + cvdc.CreateVoucher(FlowUnid, "PZ2018071100000011");//˻ؾ̱֤-- + cvdc.CreateVoucher(FlowUnid, "PZ2018081500000118");//˻ؾ̱֤--ֱ - cvdc.CreateVoucher(FlowUnid, "PZ2018072100000032");//յ̱֤ + cvdc.CreateVoucher(FlowUnid, "PZ2018072100000032");//յ̱֤-ؿ- + cvdc.CreateVoucher(FlowUnid, "PZ2018081500000119");//յ̱֤-ؿ-ֱ return "true"; } diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java index 297c3fd6e..18a4ad296 100644 --- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java @@ -19,9 +19,7 @@ public class RedIncomeVoucher extends BaseBussiness { * ؿƾ֤ */ CreateVoucherCustCautionMoneyIncome cvci=new CreateVoucherCustCautionMoneyIncome(); - cvci.CreateVoucher(FlowUnid, "PZ2018072100000034", "feetype2");//յͻ֤-- - cvci.CreateVoucher(FlowUnid, "PZ2018080400000089", "feetype2");//յͻ֤--ֱ - + cvci.CreateVoucher(FlowUnid, "PZ2018072100000036", "feetype1");//ؿ-ȷյѣ·̯)-- cvci.CreateVoucher(FlowUnid, "PZ2018080400000090", "feetype1");//ؿ-ȷյѣ·̯)--ֱ @@ -50,14 +48,6 @@ public class RedIncomeVoucher extends BaseBussiness { CreateVoucherInsuranceSettlement cvis=new CreateVoucherInsuranceSettlement(); cvis.CreateVoucher("PZ2018080400000096");//յⱣշ --ֱ - - //CreateVoucherCustomerRentOrFee cvcr = new CreateVoucherCustomerRentOrFee(); - //cvcr.CreateVoucher(FlowUnid, "PZ2018080400000077");//յմ--ֱ - - - CreateVoucherDistCautionMoneyRe cvdc=new CreateVoucherDistCautionMoneyRe(); - cvdc.CreateVoucher(FlowUnid, "PZ2018072100000044");//յ̱֤ - return "true"; } } diff --git a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java index 26e8ea49b..15cc9fa63 100644 --- a/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java +++ b/src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java @@ -246,7 +246,6 @@ public class CreateVoucherServiceImpl { System.out.println("ȡдĿûпĿ"); throw new Exception("ȡдĿûпĿ"); } - } //ȡժҪ String abs=sub.getAttribute("ABSTRACT_TEMPLATE").getString();//ժҪ @@ -274,7 +273,6 @@ public class CreateVoucherServiceImpl { if("1".equals(bo.getAttribute("IS_CUSTOM_VALUE").getString())){//ǷԶȡֵ VoucherJavaParamService ps=null; try{ - String valuemode=bo.getAttribute("VALUE_MODE").getString(); System.out.println(valuemode); Class c=(Class)Class.forName(bo.getAttribute("VALUE_MODE").getString()); @@ -300,6 +298,7 @@ public class CreateVoucherServiceImpl { subData.put("F7", dataTemp.get("MONEY"));//跽 subData.put("F8", "0");// subData.put("ENTRYDC", "1"); + // ijЩƾ֤Ҫ跽չʾϢ if("PZ2018071000000006".equals(VOUCHERNO)||"PZ2018080300000071".equals(VOUCHERNO)||"PZ2018071000000009".equals(VOUCHERNO)||"PZ2018080300000073".equals(VOUCHERNO)) { subData.put("CUSTID",dataTemp.get("DISTRIBUTOR_ID"));//id subData.put("CUSTNAME",dataTemp.get("DISTRIBUTOR_NAME"));// diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java index 778fc7703..6fc1b03ea 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java @@ -17,13 +17,12 @@ public class CreateVoucherRentIncomeMission implements Job { public void execute(JobExecutionContext arg0) throws JobExecutionException { String startime = StringFunction.getTodayNow(); try{ - /*CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); + CreateVoucherRentIncome cvri=new CreateVoucherRentIncome(); cvri.CreateVoucher("PZ2018072100000024");//յ-- cvri.CreateVoucher("PZ2018080400000081");//յ--ֱ cvri.CreateVoucher("PZ2018072100000025");//յϢ-- - cvri.CreateVoucher("PZ2018080400000082");//յϢ--ֱ -*/ + cvri.CreateVoucher("PZ2018080400000082");//յϢ--ֱ InsertVoucherRentIncome ivri=new InsertVoucherRentIncome(); ivri.execute();