凭证相关

This commit is contained in:
amarsoft 2018-08-06 20:18:19 +08:00
parent d2148bee68
commit e8f09283ee
2 changed files with 7 additions and 1 deletions

View File

@ -45,6 +45,12 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
param.clear();
map.put("FlowUnid", FlowUnid);
sql= "SELECT LCCT.HANDLING_CHARGE_MONEY AS MONEY,LCCT.HANDLING_CHARGE_MONEY/1.06 AS HANDLFEENOTAX,(LCCT.HANDLING_CHARGE_MONEY-ROUND(LCCT.HANDLING_CHARGE_MONEY/1.06,2))AS HANDLTAX,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,LEC.ID AS CARID,LEC.MODEL ,CIF.CERTID AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_CALC_CONDITION LCCT INNER JOIN lc_fund_income_temp lfit ON lfit.contract_id=lcct.contract_id AND lfit.fee_type='feetype10' LEFT JOIN LB_CONTRACT_INFO LCI ON LCCT.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 lfit.FLOWUNID=:FLOWUNID";
if("PZ2018071000000009".equals(VOUCHERNO)||"PZ2018080300000073".equals(VOUCHERNO)){
sql+=" AND lcct.HANDLING_CHARGE_MONEY='0020'";
}
if("PZ2018071000000007".equals(VOUCHERNO)||"PZ2018080300000072".equals(VOUCHERNO)){
//sql+="AND lcct.HANDLING_CHARGE_MONEY='0010'";
}
List<Map<String,String>> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);

View File

@ -151,7 +151,7 @@ public class VoucherToV8Impl implements VoucherService {
F7Co=new BigDecimal( list.get(i).get("F7"));
F8Co=new BigDecimal( list.get(i).get("F8"));
if(!F7Co.equals(BigDecimal.ZERO) || !F8Co.equals(BigDecimal.ZERO)){
if(F7Co.compareTo(BigDecimal.ZERO)!=0 || F8Co.compareTo(BigDecimal.ZERO)!=0){
v8Vouchers.add(v8);
}
}