anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

凭证所需字段被删除修复

Browse Source
This commit is contained in:
xiezhiwen 2018-08-15 19:20:48 +08:00
parent dbc3bf31c8
commit 1590bf16b1
9 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WebContent/WEB-INF/etc/jbo/jbo_calc.xml
View File

@ -1175,6 +1175,7 @@
<attribute name="PAYMENT_NUMBER" label="投放编号" type="STRING" length="32"/>
<attribute name="EQUIP_AMT" label="设备款" type="DOUBLE" length="22" scale="2"/>
<attribute name="FIRST_PAYMENT" label="综合首付款" type="DOUBLE" length="22" scale="2"/>
<attribute name="GPS_FEE" label="GPS费用" type="DOUBLE" length="22" scale="2"/>
<attribute name="FIRST_PAYMENT_RATIO" label="综合首付款比例" type="DOUBLE" length="22" scale="6"/>
<attribute name="EQUIP_END_VALUE" label="期末余值" type="DOUBLE" length="22" scale="2"/>
<attribute name="CLEAN_LEASE_MONEY" label="融资额" type="DOUBLE" length="22" scale="2"/>

3
src_core/com/tenwa/comm/util/jboutil/DataOperatorUtil.java
View File

@ -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);

4
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherDistCautionMoneyRe.java
View File

@ -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,"

5
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherHandlingMoney.java
View File

@ -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();

2
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/CautionMoneyVoucher.java
View File

@ -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";
}

6
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/DistributorCautionMoneyVoucher.java
View File

@ -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";
}

12
src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherMethodSettle/RedIncomeVoucher.java
View File

@ -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";
}
}

3
src_core/com/tenwa/voucher/serviceImp/CreateVoucherServiceImpl.java
View File

@ -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<VoucherJavaParamService> c=(Class<VoucherJavaParamService>)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");
// 某些凭证要求借方展示经销商信息
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"));//经销商名称

5
src_tenwa/com/tenwa/lease/app/quartzmession/CreateVoucherRentIncomeMission.java
View File

@ -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();