From 684d5f79947e70a49376a9d79ac9b65c5f4e06eb Mon Sep 17 00:00:00 2001
From: 25655 <2565550274@qq.com>
Date: Mon, 24 Feb 2025 18:13:02 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=201.=E6=8A=A5=E5=85=B3=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=AD=E7=9A=84=E4=BA=A7=E5=93=81=E6=9C=BA=E5=9E=8B?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E4=B8=BA=E8=B5=84=E6=BA=90=E5=8F=B7.?=
 =?UTF-8?q?=E6=8A=A5=E5=85=B3=E6=9C=BA=E5=9E=8B(=E6=96=87=E6=9C=AC)?=
 =?UTF-8?q?=EF=BC=8C=E6=B3=A8=E6=84=8F=E4=BB=85=E8=B0=83=E6=95=B4=E6=95=B4?=
 =?UTF-8?q?=E6=9C=BA=E8=A1=8C=E7=9A=84=E6=8A=A5=E5=85=B3=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=E8=AE=B0=E4=BB=B6=E8=A1=8C=E4=B8=8D=E8=B0=83=E6=95=B4;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../es/declaredocx/form/DeclareDocxEdit.java  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/yem/wm/es/declaredocx/form/DeclareDocxEdit.java b/src/main/java/com/yem/wm/es/declaredocx/form/DeclareDocxEdit.java
index 0acc7dad..c1676439 100644
--- a/src/main/java/com/yem/wm/es/declaredocx/form/DeclareDocxEdit.java
+++ b/src/main/java/com/yem/wm/es/declaredocx/form/DeclareDocxEdit.java
@@ -511,12 +511,19 @@ public class DeclareDocxEdit extends AbstractBillPlugIn implements BeforeF7Selec
             HashMap<String, List<DynamicObject>> compMapP = Maps.newHashMap();
 
             for (DynamicObject dynamicObject : compListZ) {
-                DynamicObject productmodel = dynamicObject.getDynamicObject("yem_productmodel");
-                long productId = 0L;
-                if (YEM.isNotEmpty(productmodel)) {
-                    DynamicObject products = productmodel.getDynamicObject("yem_products");
-                    if (YEM.isNotEmpty(products)) {
-                        productId = products.getLong("id");
+                String productId = "";
+                String yemBusinesssort = dynamicObject.getString("yem_businesssort");
+                if ("P".equals(yemBusinesssort)) {
+                    // 产品机型
+                    DynamicObject productmodel = (DynamicObject) dynamicObject.get("yem_productmodel");
+                    if (productmodel != null) {
+                        productId = productmodel.getString("yem_customs_type");
+                    }
+                }else if ("Z".equals(yemBusinesssort)) {
+                    // 资源号
+                    DynamicObject yem_resourcenog = (DynamicObject) dynamicObject.get("yem_resourcenog");
+                    if (yem_resourcenog != null) {
+                        productId = yem_resourcenog.getString("yem_customs_type");
                     }
                 }
                 long customclass = dynamicObject.getLong("yem_customclass.id");