From 25ac523502404761b66bbfb7482dd3ef0228cf1f Mon Sep 17 00:00:00 2001
From: ljw <ljw@yunemao.com>
Date: Mon, 9 Dec 2024 15:33:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=E8=AE=A2=E8=88=B1=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E5=8F=91=E8=BF=90=E6=98=8E=E7=BB=86=E5=8D=95?=
 =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=E6=95=B4=E6=9C=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../es/shippingdetails/form/ShippingDetailsFormPlugin.java  | 6 +++++-
 .../com/yem/wm/es/storagetrans/form/StorageTransEdit.java   | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java
index 5a14752c..57d34c2f 100644
--- a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java
+++ b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java
@@ -5,6 +5,7 @@ import com.alibaba.druid.support.logging.Log;
 import com.alibaba.druid.support.logging.LogFactory;
 import com.alibaba.druid.util.StringUtils;
 import com.yem.wm.bc.companytitle.form.CompanyTitleEdit;
+import com.yem.wm.es.Util.ZJUtils;
 import com.yem.wm.es.contractamtlist.util.FunUtil;
 import com.yem.wm.es.shippingdetails.util.PaymentControlUtil;
 import com.yem.wm.utils.FunctionalCommon;
@@ -180,7 +181,10 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef
             map.put("flag", "B");
             FunUtil.viewForm("yem_contractamtlistoccupy", map, view);
         }
-
+        if (key.equals("getmachine")) {
+            ZJUtils.renewMachineProductInfo(view, model);
+//            renewMachineProductInfo();
+        }
         //回填海关编码
         if ("backcustomscode".equals(key) && e.getOperationResult().isSuccess()) {
             //回填海关编码
diff --git a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
index 38985e94..23de8d05 100644
--- a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
+++ b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java
@@ -2,6 +2,7 @@ package com.yem.wm.es.storagetrans.form;
 
 import com.yem.or.utils.OrderApiUtils;
 import com.yem.wm.es.Util.TotalUtil;
+import com.yem.wm.es.Util.ZJUtils;
 import com.yem.wm.es.contactbook.op.ContactBookSaveOp;
 import com.yem.wm.es.salesorder.utils.SalesOrderUtils;
 import com.yem.wm.utils.CalendarUtils;
@@ -643,6 +644,10 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele
         String operateKey = formOperate.getOperateKey();
         DynamicObject dataEntity = model.getDataEntity(true);
         IFormView view = this.getView();
+        if (operateKey.equals("getmachine")) {
+            ZJUtils.renewMachineProductInfo(view, model);
+//            renewMachineProductInfo();
+        }
         if ("draw".equals(operateKey)) {
             String creditbackstatus = dataEntity.getString("yem_creditbackstatus");
             if ("A".equals(creditbackstatus)) {