diff --git a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java index f18c88f1..e3710246 100644 --- a/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java +++ b/src/main/java/com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java @@ -60,7 +60,11 @@ public class SalesOrderAuditOp extends AbstractOperationServicePlugIn { for(DynamicObject dataEntitie : dataEntities){ dataEntitie = BusinessDataServiceHelper.loadSingle(dataEntitie.getPkValue(),dataEntitie.getDynamicObjectType().getName()); frameworkContract(dataEntitie); - giftAmount(dataEntitie); + //是否礼品赠送 = 是 + String yem_isgiftgive = dataEntitie.getString("yem_isgiftgive"); + if(yem_isgiftgive.equals("A")){ + giftAmount(dataEntitie); + } giftSpecialAmount(dataEntitie); } @@ -157,8 +161,8 @@ public class SalesOrderAuditOp extends AbstractOperationServicePlugIn { DynamicObjectCollection giveamounts = dataEntitie.getDynamicObjectCollection("yem_es_salesorder_l"); DynamicObject giftamountss = BusinessDataServiceHelper.loadSingle("yem_im_giftamount", new QFilter[]{new QFilter("yem_groupcusfields", QCP.equals,customer), - new QFilter("org", QCP.equals,org), - new QFilter("yem_bd_products", QCP.equals,products)}); + new QFilter("org", QCP.equals,org), + new QFilter("yem_bd_products", QCP.equals,products)}); if (giveamounts!=null){