From 261d35ff592bf49af854912f550c63857057fae7 Mon Sep 17 00:00:00 2001
From: ljw <ljw@yunemao.com>
Date: Mon, 25 Nov 2024 10:27:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=A4=96=E9=94=80=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E8=B5=A0=E9=80=81=E9=85=8D=E4=BB=B6=E9=A1=B5=E7=AD=BE=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E8=B5=8B=E5=80=BC=202.=E5=8F=91=E8=BF=90=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=8D=95=E5=8F=B0=E6=95=B0=E5=8F=91=E8=BF=90=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../es/salesorder/utils/SalesOrderUtils.java  | 25 +++++++++----------
 .../form/ShippingDetailsZJFormPlugin.java     |  7 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
index 49c11948..468755b8 100644
--- a/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
+++ b/src/main/java/com/yem/wm/es/salesorder/utils/SalesOrderUtils.java
@@ -1226,21 +1226,20 @@ public class SalesOrderUtils {
             List<DynamicObject> value = entry.getValue();
             DynamicObject basemodelib = BusinessDataServiceHelper.loadSingle(productmodelId, "yem_bd_basemodelib");
             long products = basemodelib.getLong("yem_products.id");
-            BigDecimal qty = BigDecimal.ZERO;
-            BigDecimal singlepartgiftmat = BigDecimal.ZERO;
+//            BigDecimal singlepartgiftmat = BigDecimal.ZERO;
             for (DynamicObject dynamicObject : value) {
-                qty = qty.add(dynamicObject.getBigDecimal("yem_qty"));
-                singlepartgiftmat = singlepartgiftmat.add(dynamicObject.getBigDecimal("yem_singlepartgiftmat")); // 单台配件金额
+                BigDecimal qty = dynamicObject.getBigDecimal("yem_qty");
+                BigDecimal singlepartgiftmat = dynamicObject.getBigDecimal("yem_singlepartgiftmat"); // 单台配件金额
+                BigDecimal amount = qty.multiply(singlepartgiftmat);
+                if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) continue;
+                DynamicObject addNew = giftEntry.addNew();
+                addNew.set("yem_giveproactype", products); // 产品机型
+                addNew.set("yem_qtyint", qty); // 台数
+                addNew.set("yem_singleamt", singlepartgiftmat); // 单台配件金额
+                addNew.set("yem_singleamtlocal", singlepartgiftmat.multiply(exrate)); // 单台配件金额（本位币）
+                addNew.set("yem_giveamt", amount); // 配件金额
+                addNew.set("yem_giveamtbase", amount.multiply(exrate)); // 配件金额本位币
             }
-            BigDecimal amount = qty.multiply(singlepartgiftmat);
-            if (singlepartgiftmat.compareTo(BigDecimal.ZERO) == 0) continue;
-            DynamicObject addNew = giftEntry.addNew();
-            addNew.set("yem_giveproactype", products); // 产品机型
-            addNew.set("yem_qtyint", qty); // 台数
-            addNew.set("yem_singleamt", singlepartgiftmat); // 单台配件金额
-            addNew.set("yem_singleamtlocal", singlepartgiftmat.multiply(exrate)); // 单台配件金额（本位币）
-            addNew.set("yem_giveamt", amount); // 配件金额
-            addNew.set("yem_giveamtbase", amount.multiply(exrate)); // 配件金额本位币
         }
     }
 
diff --git a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsZJFormPlugin.java b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsZJFormPlugin.java
index 4625ec74..fbb9c6bb 100644
--- a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsZJFormPlugin.java
+++ b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsZJFormPlugin.java
@@ -2,6 +2,7 @@ package com.yem.wm.es.shippingdetails.form;
 
 import com.yem.wm.es.Util.TotalUtil;
 import com.yem.wm.es.Util.ZJUtils;
+import com.yem.wm.im.clientdemand.utils.ClientUtils;
 import kd.bos.bill.AbstractBillPlugIn;
 import kd.bos.bill.OperationStatus;
 import kd.bos.dataentity.entity.DynamicObject;
@@ -42,10 +43,10 @@ public class ShippingDetailsZJFormPlugin extends AbstractBillPlugIn {
         DynamicObjectCollection materialInfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");
         switch (name) {
             case "yem_qty" :
-//                ZJUtils.setRandomDataTools(model);
+                ZJUtils.setRandomDataTools(model);
                 ZJUtils.countOrderSumNumberZJ(model);
-//                TotalUtil.setGiftGiving(model);
-//                ClientUtils.addSaAmountTk(model,rowIndex);//销售金额（价格条款）结算币别
+                TotalUtil.setGiftGiving(model);
+                ClientUtils.addSaAmountTk(model,rowIndex);//销售金额（价格条款）结算币别
                 break;
             case "yem_lenghtunit" ://长度单位
             case "yem_vol" ://体积