diff --git a/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java b/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
index 13e2c41d..e51c13ae 100644
--- a/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
+++ b/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
@@ -116,11 +116,13 @@ public class SparepartsPlugin extends AbstractReportListDataPlugin {
             int i = 0;
             for (DynamicObject dynamicObject : yem_bd_producttype) {
                 String name = dynamicObject.getString("name");
-                if (i == 0) {
-                    sb.append("  (AND  yem_fittingtype  = ").append("'" + name + "'");
-                } else if (i == yem_bd_producttype.size()) {
+                if (yem_bd_producttype.size() - 1 == 0) {
+                    sb.append("  AND yem_fittingtype  = ").append("'" + name + "'");
+                } else if (i == 0) {
+                    sb.append("  AND( yem_fittingtype  = ").append("'" + name + "'");
+                } else if (i == yem_bd_producttype.size() - 1) {
                     sb.append("  OR  yem_fittingtype  = ").append("'" + name + "')");
-                }else {
+                } else {
                     sb.append("  OR  yem_fittingtype  = ").append("'" + name + "'");
                 }
 //                names.add(name);
diff --git a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
index e2198abd..fe50f05e 100644
--- a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
+++ b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
@@ -179,9 +179,9 @@ public class CusdecToDeclaredocxTask extends AbstractTask {
                                     , BigDecimalUtils.div((user.getBigDecimal("yem_feerate").multiply(declaredocx.getBigDecimal("yem_reightamtrate")))
                                             ,declaredocx.getBigDecimal("yem_exrate"),2));
 
-                            BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_currencybase")
-                                    , declaredocx.getDynamicObject("yem_exratetable")
+                            BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_exratetable")
                                     , declaredocx.getDynamicObject("yem_usdcurrency")
+                                    , declaredocx.getDynamicObject("yem_currencybase")
                                     , yemFiedatets);
                             declaredocx.set("yem_usbexrate", exchangeRate);
                             declaredocx.set("yem_despportcodebase",user.getDynamicObject("yem_despportcodebase") );