From 2e71eb777961eb2e23330dc4704122c5a9f5eff2 Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 26 Nov 2024 17:10:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E7=94=9F=E6=88=90=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?=E8=B5=84=E6=96=99=E6=97=B6=EF=BC=8C=E5=8F=AA=E6=9C=89=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1=E5=88=86=E7=B1=BB=E4=B8=BA=E6=95=B4=E6=9C=BA=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E6=98=AF=E5=90=A6=E8=B5=A0=E5=93=81=E4=B8=BA=E5=90=A6?= =?UTF-8?q?=E7=9A=84=E8=A1=8C=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 1d45f34ef863bfcc252b7128194b8fed954e7934) --- .../es/salesorder/from/SalesOrderPJEdit.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java index 459fa6ee..7a317443 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderPJEdit.java @@ -816,16 +816,18 @@ public class SalesOrderPJEdit extends AbstractBillPlugIn implements Plugin, Befo DynamicObject productModel = (DynamicObject) model.getValue("yem_productmodel", i); if (YEM.isNotEmpty(materialClass) && YEM.isNotEmpty(productModel)) { if ("Z".equals(materialClass)) { - DynamicObject products = productModel.getDynamicObject("yem_products"); - if (YEM.isNotEmpty(products)) { - Long id = products.getLong("id"); - if (map.containsKey(id)) { - map.put(id, map.get(id).add((BigDecimal) model.getValue("yem_qty", i))); - } else { - map.put(id, (BigDecimal) model.getValue("yem_qty", i)); + boolean yemIfgift =(boolean) model.getValue("yem_ifgift"); + if (!yemIfgift) { + DynamicObject products = productModel.getDynamicObject("yem_products"); + if (YEM.isNotEmpty(products)) { + Long id = products.getLong("id"); + if (map.containsKey(id)) { + map.put(id, map.get(id).add((BigDecimal) model.getValue("yem_qty", i))); + } else { + map.put(id, (BigDecimal) model.getValue("yem_qty", i)); + } } } - } } }