From b933551b420f2dc2c362258318353e06c86fe84c Mon Sep 17 00:00:00 2001
From: 25655 <2565550274@qq.com>
Date: Mon, 10 Feb 2025 09:41:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E9=85=8D=E4=BB=B6=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E6=98=8E=E7=BB=86=E8=A1=A8=EF=BC=88=E5=B7=B2=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=EF=BC=89=202.=E5=8D=95=E4=B8=80=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=8A=A5=E5=85=B3=E5=8D=95=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yem/rf/salescommission/SparepartsPlugin.java   | 10 ++++++----
 .../java/com/yem/tws/task/CusdecToDeclaredocxTask.java |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

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