From da7aa098ab0aad8901f79926cf47b5b16f940f44 Mon Sep 17 00:00:00 2001
From: ljw <ljw@yunemao.com>
Date: Fri, 20 Dec 2024 20:23:07 +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, 5 insertions(+), 11 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 178061d9..a7d7f5f4 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 ee109a60..9a2680da 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
@@ -12,8 +12,6 @@ import kd.bos.orm.query.QCP;
 import kd.bos.orm.query.QFilter;
 import kd.bos.servicehelper.BusinessDataServiceHelper;
 import org.apache.commons.lang3.ArrayUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -114,11 +112,7 @@ public class ClientUtils {
 //                list.add(new QFilter("yem_productclass.number",QCP.equals,yemBdProductsid));
                 //读取价格库数据
                 DynamicObject yem_pricelibrary = null;
-                if (multiconfig != null && !multiconfig.isEmpty()) {
-                    yem_pricelibrary = BusinessDataServiceHelper.loadSingle("yem_pricelibrary", list.toArray(new QFilter[0]));
-                } else {
-                    yem_pricelibrary = BusinessDataServiceHelper.loadSingle("yem_pricelibrary", list.toArray(new QFilter[0]));
-                }
+                yem_pricelibrary = BusinessDataServiceHelper.loadSingle("yem_pricelibrary", list.toArray(new QFilter[0]));
                 if (yem_pricelibrary != null) {
                     //多功能配置分录行无数据 则跳过查询价格库
                     if (multiconfig != null && !multiconfig.isEmpty()) {
@@ -1950,7 +1944,7 @@ public class ClientUtils {
     /**
      * 计算销售FOB单价
      * <p>
-     * 销售FOB单价=商品明细对应多功能配置中 单台加价金额（结算币别）合计值 + 销售FCA标配青岛单价+FOB与FCA费用差额
+     * 销售FOB单价=商品明细对应多功能配置中 单台加价金额（结算币别）合计值 + 销售FCA标配青岛单价
      */
     public static void calculateSalesFOBUnitPrice(IDataModel model, int idx) {
 //        if (!isFCAPriceItem(model, idx)) {