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 c1676439..0acc7dad 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,19 +511,12 @@ public class DeclareDocxEdit extends AbstractBillPlugIn implements BeforeF7Selec
             HashMap<String, List<DynamicObject>> compMapP = Maps.newHashMap();
 
             for (DynamicObject dynamicObject : compListZ) {
-                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");
+                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");
                     }
                 }
                 long customclass = dynamicObject.getLong("yem_customclass.id");