凭证相关

This commit is contained in:
amarsoft 2018-08-21 20:02:38 +08:00
parent f787c636dd
commit 4b882f3845

View File

@ -82,7 +82,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
Map<String,String> map1=new HashMap<String, String>();
map1.put("leas_form", leas_form);
map1.put("startdate", start_date);
String sql1 ="SELECT DIS_ATTRIBUTE,FIX_AMOUNT,DIS_RATIO,PRODUCT_ID FROM LB_PRODUCT_SALVAGE WHERE DATE_FORMAT(effect_start,'%Y/%m/%d')>DATE_FORMAT(:startdate,'%Y/%m/%d') AND DATE_FORMAT(effect_end,'%Y/%m/%d')>DATE_FORMAT(:startdate,'%Y/%m/%d') AND product_id =:leas_form";
String sql1 ="SELECT DIS_ATTRIBUTE,FIX_AMOUNT,DIS_RATIO,PRODUCT_ID FROM LB_PRODUCT_SALVAGE WHERE DATE_FORMAT(effect_start,'%Y/%m/%d')<=DATE_FORMAT(:startdate,'%Y/%m/%d') AND DATE_FORMAT(effect_end,'%Y/%m/%d')>DATE_FORMAT(:startdate,'%Y/%m/%d') AND product_id =:leas_form";
List<Map<String,String>> dataList1=DataOperatorUtil.getDataBySql(Sqlca, sql1, map1);
BigDecimal bigMoney=null;
BigDecimal bigMoneyNoTax=null;
@ -99,6 +99,7 @@ public String CreateVoucher(String FlowUnid,String VOUCHERNO) throws Exception {
}
if(disAttribute!=null&&!"".equals(disAttribute)){
if("1".equals(disAttribute)){
MONEY=fixAmount;
param.put("FACT_MONEY",MONEY);
bigMoneyNoTax=new BigDecimal(MONEY).divide(taxRate,2, BigDecimal.ROUND_HALF_UP);
bigMoneyTax=new BigDecimal(MONEY).subtract(new BigDecimal(MONEY).divide(taxRate,2, BigDecimal.ROUND_HALF_UP));