From e0bbeea4fdd49878e72d65cc1d278a778c1424d1 Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 26 Nov 2024 18:41:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E6=98=AF=E5=90=A6=E9=9C=80=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E7=89=A9=E6=96=99=E5=B1=9E=E6=80=A7=E4=B8=BA=E6=98=AF?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E8=B5=B0=E5=88=A4=E6=96=AD=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BB=96=E6=83=85=E5=86=B5=E4=BF=9D=E6=8C=81?= =?UTF-8?q?=E5=8E=9F=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 444d8c412e65d0c66da7d7f7f4a72b51644afe41) --- .../op/OrderProReqBillSubmitOp.java | 16 +--------------- .../validator/OrderProReqBillValidator.java | 2 +- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/yem/wm/im/orderproreqbill/op/OrderProReqBillSubmitOp.java b/src/main/java/com/yem/wm/im/orderproreqbill/op/OrderProReqBillSubmitOp.java index 0521ed1b..1cc29335 100644 --- a/src/main/java/com/yem/wm/im/orderproreqbill/op/OrderProReqBillSubmitOp.java +++ b/src/main/java/com/yem/wm/im/orderproreqbill/op/OrderProReqBillSubmitOp.java @@ -13,21 +13,7 @@ public class OrderProReqBillSubmitOp extends AbstractOperationServicePlugIn { public void onPreparePropertys(PreparePropertysEventArgs e) { super.onPreparePropertys(e); List keys = e.getFieldKeys(); - - keys.add("yem_es_materialinfo"); - keys.add("yem_warehouse"); - keys.add("yem_outwhcode"); - keys.add("yem_billtype"); - - - keys.add("yem_isvmi"); - keys.add("yem_companyorg"); - keys.add("billstatus"); - keys.add("yem_es_materialinfo"); - - - keys.add("yem_es_materialinfo.yem_materiel"); - keys.add("yem_es_materialinfo.seq"); + keys.addAll(this.billEntityType.getAllFields().keySet()); } diff --git a/src/main/java/com/yem/wm/im/orderproreqbill/validator/OrderProReqBillValidator.java b/src/main/java/com/yem/wm/im/orderproreqbill/validator/OrderProReqBillValidator.java index 18173d8b..b3ad0189 100644 --- a/src/main/java/com/yem/wm/im/orderproreqbill/validator/OrderProReqBillValidator.java +++ b/src/main/java/com/yem/wm/im/orderproreqbill/validator/OrderProReqBillValidator.java @@ -26,7 +26,7 @@ public class OrderProReqBillValidator extends AbstractValidator { for (DynamicObject object : yemImEntryentity) { DynamicObject yemMaterialnum = object.getDynamicObject("yem_materiel"); int seq = object.getInt("seq"); - if (yemMaterialnum != null) { + if (yemMaterialnum != null && "A".equals(bill.getString("yem_attributesneed"))) { String yemMaterialnumnumber = yemMaterialnum.getString("number"); DynamicObject dynamicObjec = BusinessDataServiceHelper.loadSingle("yem_material_procinfo", "id,number,createorg" , new QFilter[]{new QFilter("createorg.number", QCP.equals, number)