From b451f0f033ca7be40871f5cf844a97e2b79e5128 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Tue, 25 Feb 2025 09:23:07 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix=EF=BC=9A"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 684d5f79947e70a49376a9d79ac9b65c5f4e06eb. --- .../es/declaredocx/form/DeclareDocxEdit.java | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 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 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> 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");