From cd3b39b2ed0f1c2f994fadbdd72a53228e8664af Mon Sep 17 00:00:00 2001
From: zhouc <zhouc@yunemao.com>
Date: Sat, 21 Sep 2024 20:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B9=E7=94=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=90=BA=E5=B8=A6=E5=86=85=E9=99=86=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E8=B4=B9=E3=80=81=E6=B8=AF=E6=9D=82=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../es/salesorder/from/SalesOrderZJEdit.java  | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 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 dea85e87..ba8ae375 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
@@ -87,7 +87,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
         OperationStatus status = fsp.getStatus();
         String formId = fsp.getFormId();
         String appId = fsp.getAppId();
-        if (OperationStatus.ADDNEW == status&&appId.equals("yem_es")) {
+        if (OperationStatus.ADDNEW == status && appId.equals("yem_es")) {
             SplitContainer splitContainer = this.getControl("yem_splitcontainerap");
             splitContainer.setCollapse("yem_splitpanelap1", true);
             QFilter qFilter = null;
@@ -193,6 +193,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
         String name = e.getProperty().getName();
         ChangeData changeData = e.getChangeSet()[0];
         Object oldValue = changeData.getOldValue();
+        Object newValue = changeData.getNewValue();
         int rowIndex = changeData.getRowIndex();
         int ParentRow = changeData.getParentRowIndex();
         DynamicObject dataEntity = model.getDataEntity();
@@ -526,10 +527,30 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
                 break;
             case "yem_tonsqty":
             case "yem_port":
-            case "yem_padexpense":
+            case "yem_shippingmethod":
                 ClientUtils.calcInlandTransportationAmt(model, rowIndex);//计算内陆运费
                 ClientUtils.calculatePortAmt(model, rowIndex);//计算港杂费
                 break;
+            case "yem_padexpense":
+                DynamicObject padexpense = (DynamicObject) newValue;
+                if (padexpense != null) {
+                    String number = padexpense.getString("number");
+                    //内陆运输费
+                    if ("FYXM0023.11".equals(number)) {
+                        DynamicObjectCollection entryRows = this.getModel().getEntryEntity("yem_es_materialinfo");
+                        for(int i = 0;i<entryRows.size();i++){
+                            ClientUtils.calcInlandTransportationAmt(model, i);//计算内陆运费
+                        }
+                    }
+                    //港杂费
+                    else if ("FYXM0023.6".equals(number)) {
+                        DynamicObjectCollection entryRows = this.getModel().getEntryEntity("yem_es_materialinfo");
+                        for(int i = 0;i<entryRows.size();i++){
+                            ClientUtils.calculatePortAmt(model, i);//计算内陆运费
+                        }
+                    }
+                }
+                break;
             case "yem_squareqty":
                 ClientUtils.calculatePortAmt(model, rowIndex);//计算港杂费
                 break;
@@ -570,6 +591,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
 
     /**
      * 选择赠送配件-产品机型，汇总明细信息中相同机型的数量
+     *
      * @param rowIndex
      */
     private void summarizeModules(int rowIndex) {
@@ -598,6 +620,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo
 
     /**
      * 修改商品明细中数量，同步修改礼品赠送中数量
+     *
      * @param model
      * @param rowIndex
      */