Merge remote-tracking branch 'origin/master'

src/main/java/com/uas/erp/schedular/b2b/task/SaleDownTask.java

@@ -50,8 +50,9 @@ public class SaleDownTask extends AbstractTask {
             int count = jdbcTemplate.count("from SaleDown where sa_type='purchase' and b2b_pu_id=?", sale.getB2b_pu_id());
             if (count == 0) {
                 int saId = jdbcTemplate.generate("SaleDown_SEQ");
-                Float rate = jdbcTemplate.getFloat("select cm_crrate from currencysmonth left join Currencys on cr_name=cm_crname where cm_yearmonth = ? and cm_crname = ? and nvl(cr_statuscode,' ')='CANUSE'",
-                        Float.class, DateUtil.getYearmonth(sale.getSa_date()), sale.getSa_currency());
+                String rateStr = jdbcTemplate.getString("select cm_crrate from currencysmonth left join Currencys on cr_name=cm_crname where cm_yearmonth = ? and cm_crname = ? and nvl(cr_statuscode,' ')='CANUSE'",
+                        DateUtil.getYearmonth(sale.getSa_date()), sale.getSa_currency());
+                Float rate = Float.parseFloat(rateStr);
                 sale.setSa_rate(rate);
                 sqls.add(sale.toSqlString(saId));
                 idList.add(Long.valueOf(saId));