Revert "fix:"

This reverts commit 684d5f7994.
This commit is contained in:
25655 2025-02-25 09:23:07 +08:00
parent 9a208ac39e
commit b451f0f033

View File

@ -511,19 +511,12 @@ public class DeclareDocxEdit extends AbstractBillPlugIn implements BeforeF7Selec
HashMap<String, List<DynamicObject>> compMapP = Maps.newHashMap(); HashMap<String, List<DynamicObject>> compMapP = Maps.newHashMap();
for (DynamicObject dynamicObject : compListZ) { for (DynamicObject dynamicObject : compListZ) {
String productId = ""; DynamicObject productmodel = dynamicObject.getDynamicObject("yem_productmodel");
String yemBusinesssort = dynamicObject.getString("yem_businesssort"); long productId = 0L;
if ("P".equals(yemBusinesssort)) { if (YEM.isNotEmpty(productmodel)) {
// 产品机型 DynamicObject products = productmodel.getDynamicObject("yem_products");
DynamicObject productmodel = (DynamicObject) dynamicObject.get("yem_productmodel"); if (YEM.isNotEmpty(products)) {
if (productmodel != null) { productId = products.getLong("id");
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"); long customclass = dynamicObject.getLong("yem_customclass.id");