From 9a8784964b70fc5b67b9d891bc07f45ad8efc845 Mon Sep 17 00:00:00 2001 From: 25655 <2565550274@qq.com> Date: Sat, 1 Mar 2025 12:03:49 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2.订舱通知单选择f7过滤 --- .../storagetrans/form/StorageTransZJEdit.java | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransZJEdit.java b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransZJEdit.java index 7c75dd0b..952f5bbd 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransZJEdit.java +++ b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransZJEdit.java @@ -255,21 +255,6 @@ public class StorageTransZJEdit extends AbstractBillPlugIn implements BeforeF7Se public void selectF7CustomClass(BeforeF7SelectEvent e) { //1、过滤报关分类时，整机行只能过滤业务分类为整机的报关分类；配件行只能过滤业务分类为配件的报关分类 int row = e.getRow(); - List ids = new ArrayList(); - IDataModel model = this.getModel(); - DynamicObject materiel = (DynamicObject) model.getValue("yem_materiel", row); - if (YEM.isNotEmpty(materiel)) { - DynamicObject[] declarationEles = BusinessDataServiceHelper.load("yem_bd_declarationele", "id,yem_customclass", - new QFilter[]{new QFilter("yem_material", QCP.equals, materiel.getPkValue())}); - for (DynamicObject declarationEle : declarationEles) { - DynamicObject hsCodebase = declarationEle.getDynamicObject("yem_customclass"); - if (YEM.isNotEmpty(hsCodebase)) { - ids.add(hsCodebase.getLong("id")); - } - } - } - e.addCustomQFilter(new QFilter("id", QCP.in, ids)); - String businesssort = (String) this.getModel().getValue("yem_businesssort", row); if (businesssort == null) { e.addCustomQFilter(new QFilter("yem_businessclassify", QCP.equals, null)); @@ -278,6 +263,20 @@ public class StorageTransZJEdit extends AbstractBillPlugIn implements BeforeF7Se e.addCustomQFilter(new QFilter("yem_businessclassify", QCP.equals, "Z")); } if ("P".equals(businesssort)) { + List ids = new ArrayList(); + IDataModel model = this.getModel(); + DynamicObject materiel = (DynamicObject) model.getValue("yem_materiel", row); + if (YEM.isNotEmpty(materiel)) { + DynamicObject[] declarationEles = BusinessDataServiceHelper.load("yem_bd_declarationele", "id,yem_customclass", + new QFilter[]{new QFilter("yem_material", QCP.equals, materiel.getPkValue())}); + for (DynamicObject declarationEle : declarationEles) { + DynamicObject hsCodebase = declarationEle.getDynamicObject("yem_customclass"); + if (YEM.isNotEmpty(hsCodebase)) { + ids.add(hsCodebase.getLong("id")); + } + } + } + e.addCustomQFilter(new QFilter("id", QCP.in, ids)); e.addCustomQFilter(new QFilter("yem_businessclassify", QCP.equals, "P")); }