From c6b75c4d8ebcfc7eed353211958c1ca3ea4e64ad Mon Sep 17 00:00:00 2001
From: ljw <ljw@yunemao.com>
Date: Fri, 20 Dec 2024 21:28:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=A4=96=E9=94=80=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A0=87=E5=87=86=E4=BB=B7=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=94=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yem/wm/es/salesorder/from/SalesOrderZJEdit.java    |  6 +++---
 .../com/yem/wm/im/clientdemand/utils/ClientUtils.java  | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
index a7d7f5f4..178061d9 100644
--- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
+++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java
@@ -420,9 +420,9 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
             case "yem_singlenumber":
                 ZJUtils.countCostSumAmountZJ(model);//
                 break;
-//            case "yem_marketraisepribase":
-//                ClientUtils.countStandardSales(model);
-//                break;
+            case "yem_marketraisepribase":
+                ClientUtils.countStandardSales(model);
+                break;
             case "yem_giftcurrency":
                 countGiftRate();
                 break;
diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
index 9a2680da..b6d9e614 100644
--- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
+++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java
@@ -1950,6 +1950,7 @@ public class ClientUtils {
 //        if (!isFCAPriceItem(model, idx)) {
 //            return;
 //        }
+        String string = model.getDataEntityType().getName();
 
         DynamicObject dataEntity = model.getDataEntity(true);
         DynamicObjectCollection c = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
@@ -1971,6 +1972,15 @@ public class ClientUtils {
             int rowCount = model.getEntryRowCount("yem_es_materialinfo");
             for (int i = 0; i < rowCount; i++) {
                 DynamicObject d = c.get(i);
+                if (string.equals("yem_es_xsalesorder")){
+                    String yemLinetype = d.getString("yem_linetype");
+                    if (!"add".equals(yemLinetype)){
+                        continue;
+                    }
+                }
+                if (!"Z".equals(d.getString("yem_businesssort"))){
+                    continue;
+                }
                 DynamicObjectCollection subC = d.getDynamicObjectCollection("yem_multiconfig");
                 BigDecimal sumAmt = BigDecimal.ZERO;
                 for (DynamicObject sub : subC) {