From bab8485b37d6a76f4b17e90fb59139dc63adfaa3 Mon Sep 17 00:00:00 2001 From: ljw Date: Thu, 14 Nov 2024 21:30:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E5=8F=91=E8=BF=90=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E5=A4=87=E6=B3=A8=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ShippingDetailsFormPlugin.java | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) 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 d5285ea4..e01eac3b 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 @@ -608,10 +608,11 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef private void extracted() { String value = ((DynamicObject) this.getModel().getValue("yem_billtype")).getString("number"); + DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo"); + Boolean tere = false; if ("yem_shippingdetails_zj".equals(value) || "yem_shippingdetails_nmzj".equals(value)) { String yemIsdismantlecar = (String) this.getModel().getValue("yem_isdismantlecar"); if ("B".equals(yemIsdismantlecar)) { - DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo"); for (int i = 0; i < yemEsMaterialinfo.size(); i++) { DynamicObject dynamicObject = yemEsMaterialinfo.get(i); DynamicObject yemProductmodel = dynamicObject.getDynamicObject("yem_productmodel"); @@ -622,9 +623,8 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef , new QFilter[]{new QFilter("id", QCP.equals, yemProducts.getLong("id"))}); DynamicObject group = loadsingle.getDynamicObject("group"); String yemVechpowertype = loadsingle.getString("yem_vechpowertype"); - if (group != null&& yemVechpowertype.equals("燃油")) { + if (group != null && yemVechpowertype.equals("燃油")) { String string = group.getString("number"); - Boolean tere = false; if ("ZZJ-7T".equals(string)) { tere = true; } else if ("ZZJ-6T".equals(string)) { @@ -634,14 +634,26 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef } else if ("ZZJ-4T".equals(string)) { tere = true; } - if (tere) { - this.getModel().setValue("yem_remarks", "更换锁紧螺母",i); - }else { - this.getModel().setValue("yem_remarks", "",i); - } } } } + if (tere) { + this.getModel().setValue("yem_remarks", "更换锁紧螺母", i); + } else { + this.getModel().setValue("yem_remarks", "", i); + } + } + }else { + if (!yemEsMaterialinfo.isEmpty()) { + for (int i = 0; i < yemEsMaterialinfo.size(); i++) { + this.getModel().setValue("yem_remarks", "", i); + } + } + } + } else { + if (!yemEsMaterialinfo.isEmpty()) { + for (int i = 0; i < yemEsMaterialinfo.size(); i++) { + this.getModel().setValue("yem_remarks", "", i); } } }