diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java index a7d7f5f4..178061d9 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java @@ -420,9 +420,9 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo case "yem_singlenumber": ZJUtils.countCostSumAmountZJ(model);// break; -// case "yem_marketraisepribase": -// ClientUtils.countStandardSales(model); -// break; + case "yem_marketraisepribase": + ClientUtils.countStandardSales(model); + break; case "yem_giftcurrency": countGiftRate(); break; diff --git a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java index 9a2680da..b6d9e614 100644 --- a/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java +++ b/src/main/java/com/yem/wm/im/clientdemand/utils/ClientUtils.java @@ -1950,6 +1950,7 @@ public class ClientUtils { // if (!isFCAPriceItem(model, idx)) { // return; // } + String string = model.getDataEntityType().getName(); DynamicObject dataEntity = model.getDataEntity(true); DynamicObjectCollection c = dataEntity.getDynamicObjectCollection("yem_es_materialinfo"); @@ -1971,6 +1972,15 @@ public class ClientUtils { int rowCount = model.getEntryRowCount("yem_es_materialinfo"); for (int i = 0; i < rowCount; i++) { DynamicObject d = c.get(i); + if (string.equals("yem_es_xsalesorder")){ + String yemLinetype = d.getString("yem_linetype"); + if (!"add".equals(yemLinetype)){ + continue; + } + } + if (!"Z".equals(d.getString("yem_businesssort"))){ + continue; + } DynamicObjectCollection subC = d.getDynamicObjectCollection("yem_multiconfig"); BigDecimal sumAmt = BigDecimal.ZERO; for (DynamicObject sub : subC) {