From 396c9fdb2ad252987ec60b3f87bd24a2347616c8 Mon Sep 17 00:00:00 2001
From: 25655 <2565550274@qq.com>
Date: Sat, 25 Jan 2025 12:47:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E5=8D=95=E4=B8=80=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E6=8A=A5=E5=85=B3=E5=8D=95=E9=97=AE=E9=A2=98=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=202.=E6=8A=A5=E8=A1=A8=E5=8F=96=E5=80=BC=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rf/salescommission/SparepartsPlugin.java  | 21 +++++++++++++------
 .../yem/tws/task/CusdecToDeclaredocxTask.java |  4 ++--
 .../validator/DebCredNewAuditValidatorOp.java |  4 ++++
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java b/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
index 1f3f9a84..13e2c41d 100644
--- a/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
+++ b/src/main/java/com/yem/rf/salescommission/SparepartsPlugin.java
@@ -112,15 +112,24 @@ public class SparepartsPlugin extends AbstractReportListDataPlugin {
             sb.append("  AND  yem_shipdate  <=  '").append("%").append(yem_shipdatesdis).append("%").append("'");
         }
         if (YEM.isNotEmpty(yem_bd_producttype)) {
-            List<String> names = new ArrayList<>();
+//            List<String> names = new ArrayList<>();
+            int i = 0;
             for (DynamicObject dynamicObject : yem_bd_producttype) {
                 String name = dynamicObject.getString("name");
-                names.add(name);
-//                sb.append("  AND  yem_bd_products  = ").append("'" +name + "'");
+                if (i == 0) {
+                    sb.append("  (AND  yem_fittingtype  = ").append("'" + name + "'");
+                } else if (i == yem_bd_producttype.size()) {
+                    sb.append("  OR  yem_fittingtype  = ").append("'" + name + "')");
+                }else {
+                    sb.append("  OR  yem_fittingtype  = ").append("'" + name + "'");
+                }
+//                names.add(name);
+
+                i++;
             }
-            Map<String, Object> map = new HashMap<>();
-            map.put("var", names);
-            result = result.filter("yem_bd_products in var", map);
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("var", names);
+//            result = result.filter("yem_fittingtype in var", map);
 
         }
         DataSet where = result.where(sb.toString());
diff --git a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
index e6b29f96..e2198abd 100644
--- a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
+++ b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java
@@ -179,8 +179,8 @@ 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_exratetable")
-                                    , declaredocx.getDynamicObject("yem_currencybase")
+                            BigDecimal exchangeRate = YEM.getExchangeRate(declaredocx.getDynamicObject("yem_currencybase")
+                                    , declaredocx.getDynamicObject("yem_exratetable")
                                     , declaredocx.getDynamicObject("yem_usdcurrency")
                                     , yemFiedatets);
                             declaredocx.set("yem_usbexrate", exchangeRate);
diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java b/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java
index d874f512..d9e9c25c 100644
--- a/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java
+++ b/src/main/java/com/yem/wm/im/debcrednotenew/validator/DebCredNewAuditValidatorOp.java
@@ -35,6 +35,10 @@ public class DebCredNewAuditValidatorOp extends AbstractValidator {
             if (yem_groupcusfields == null) {
                 this.addErrorMessage(dataEntitie, "对应集团客户不能为空，如果没有集团客户请在《客户》维护后再尝试操作！");
             }
+            String yemGenerate = dataEntity.getString("yem_generate");
+            if (!"B".equals(yemGenerate)) {
+                return;
+            }
             //客户
             String customername = "";
             DynamicObject yem_customer = dataEntity.getDynamicObject("yem_customer");