From e63328acdcdd3866ac4b4407f6f8427be35ea507 Mon Sep 17 00:00:00 2001 From: ljw Date: Thu, 12 Dec 2024 19:00:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=8F=91=E8=BF=90=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ShippingDetailsFormPlugin.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java index 5c4ad8bd..efd30488 100644 --- a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java +++ b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java @@ -534,8 +534,16 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef if ("yem_es_salesorder".equals(yemsourcebilltype)) { DynamicObjectCollection dynamicObjectCollection = this.getModel().getEntryEntity("yem_es_materialinfo"); if (!dynamicObjectCollection.isEmpty()) { + List list = new ArrayList<>(); DynamicObject yemEsMaterialinfo = dynamicObjectCollection.get(currentRowIndex); long yemCoreentryid = yemEsMaterialinfo.getLong("yem_coreentryid"); + DynamicObjectCollection yemEsSalesorderZ = yemEsMaterialinfo.getDynamicObjectCollection("yem_es_salesorder_z"); + if (!yemEsSalesorderZ.isEmpty()){ + for (DynamicObject dynamicObject : yemEsSalesorderZ) { + String yemVehicleno = dynamicObject.getString("yem_vehicleno"); + list.add(yemVehicleno); + } + } String yemsourcebillno = (String) this.getModel().getValue("yem_sourcebillno"); if (YEM.isNotEmpty(yemsourcebillno)) { DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", "", new QFilter[]{ @@ -553,7 +561,8 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef List zjNumberList = new ArrayList(); for (DynamicObject temp : yem_es_salesorder_z) { boolean yemIfdelivered = temp.getBoolean("yem_ifdelivered"); - if (!yemIfdelivered) { + String yem_vehicleno = temp.getString("yem_vehicleno"); + if (!yemIfdelivered && !list.contains(yem_vehicleno)) { zjNumberList.add(temp); } }