From 890964f91a06b28cb7b7b1b7125bc9fd73d9950c Mon Sep 17 00:00:00 2001
From: zzs <hi@lnbiuc.copm>
Date: Mon, 14 Oct 2024 16:01:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(version1011):=E6=95=B4=E6=9C=BA=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yem/wm/im/clientdemand/utils/ClientUtils.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 4d71412e..0f913565 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
@@ -2079,9 +2079,8 @@ public class ClientUtils {
      * @param idx   明细行
      */
     public static void calculatePortAmt(IDataModel model, int idx) {
+        BigDecimal calc = BigDecimal.ZERO;
         if (isFCAPriceItem(model, idx)) {
-            BigDecimal qty = (BigDecimal) model.getValue("yem_qty", idx);
-            BigDecimal calc = BigDecimal.ZERO;
             Map<String, Object> logistics = queryLogistics(model, idx, "FYXM0023.6");
             if (YEM.isNotEmpty(logistics)) {
                 DynamicObject logisticsObj = (DynamicObject) logistics.get("obj");
@@ -2090,13 +2089,13 @@ public class ClientUtils {
                 BigDecimal price = entry.getBigDecimal("yem_price");
                 BigDecimal squareqty = (BigDecimal) model.getValue("yem_squareqty", idx);
                 if (squareqty.compareTo(BigDecimal.ZERO) > 0) {
-                    calc = qty.multiply(price).multiply(squareqty);
+                    calc = price.multiply(squareqty);
                 } else {
-                    calc = qty.multiply(price);
+                    calc = price;
                 }
             }
-            model.setValue("yem_portamt", calc, idx);
         }
+        model.setValue("yem_portamt", calc, idx);
     }
 
     /**
@@ -2108,6 +2107,7 @@ public class ClientUtils {
      * @param idx   明细行
      */
     public static void calcInlandTransportationAmt(IDataModel model, int idx) {
+        BigDecimal calc = BigDecimal.ZERO;
         if (isFCAPriceItem(model, idx)) {
             BigDecimal tonsqty = (BigDecimal) model.getValue("yem_tonsqty", idx);
             BigDecimal price = BigDecimal.ZERO;
@@ -2119,9 +2119,9 @@ public class ClientUtils {
                 DynamicObjectCollection subC = entryObj.getDynamicObjectCollection("yem_subentryentity");
                 price = queryIntervalPrice(subC, tonsqty);
             }
-            BigDecimal calc = price.multiply(tonsqty);
-            model.setValue("yem_inlandtransportation", calc, idx);
+            calc = price.multiply(tonsqty);
         }
+        model.setValue("yem_inlandtransportation", calc, idx);
     }
 
     /**