From 63f745826701fd518286d9890e420a405a4a5ea2 Mon Sep 17 00:00:00 2001 From: violet Date: Mon, 2 Sep 2024 20:18:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A4=96=E9=94=80=E5=90=88=E5=90=8C?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=A4=BC=E5=93=81=E8=B5=A0=E9=80=81=3D?= =?UTF-8?q?=E6=98=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yem/wm/es/salesorder/op/SalesOrderAuditOp.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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){