From f85526f6e5be9f15159332640867ec5c66882668 Mon Sep 17 00:00:00 2001 From: ljw Date: Thu, 7 Nov 2024 15:14:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=202.=E5=A4=96=E9=94=80=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=8D=95=E5=88=A0=E9=99=A4=E8=A1=8C=E6=95=88?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xsalesorder/from/XSalesOrderFromEdit.java | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java b/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java index 1cddcc5b..e4f31b16 100644 --- a/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java +++ b/src/main/java/com/yem/wm/es/xsalesorder/from/XSalesOrderFromEdit.java @@ -1,9 +1,11 @@ package com.yem.wm.es.xsalesorder.from; +import com.yem.wm.utils.DynamicObjectUtil; import com.yem.wm.utils.FunctionalCommon; import com.yem.wm.utils.YEM; import kd.bos.bill.AbstractBillPlugIn; import kd.bos.dataentity.entity.DynamicObject; +import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.entity.botp.runtime.BFRow; import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.datamodel.RowDataEntity; @@ -92,12 +94,32 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn { if ("yem_es_materialinfo".equals(name)) { for(int rowIndex : rowIndexs){ Long yem_sourceentryid = (Long)model.getValue("yem_sourceentryid",rowIndex); - List loadSourceRowIds = BFTrackerServiceHelper.loadSourceRowIds("yem_es_salesorder", name,new Long[]{yem_sourceentryid} ); - List loadTargetRowIds = BFTrackerServiceHelper.loadTargetRowIds("yem_es_salesorder", name,new Long[]{yem_sourceentryid} ); - if(loadTargetRowIds.size() > 0) { - e.setCancel(true);//阻断增行 - view.showTipNotification("该分录已存在下游，禁止删除。"); +// List loadSourceRowIds = BFTrackerServiceHelper.loadSourceRowIds("yem_es_salesorder", name,new Long[]{yem_sourceentryid} ); +// List loadTargetRowIds = BFTrackerServiceHelper.loadTargetRowIds("yem_es_salesorder" +// , name,new Long[]{(long)model.getValue("yem_masterid")},new Long[]{yem_sourceentryid} ,null); + String selectfield = DynamicObjectUtil.getSelectfields("yem_es_salesorder", false); + String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_es_salesorder", "yem_es_materialinfo", false); + DynamicObject loadSingle = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", selectfields + , new QFilter[]{new QFilter("id", QCP.equals, model.getValue("yem_masterid"))}); + if (loadSingle!=null) { + DynamicObjectCollection yemEsMaterialinfo = loadSingle.getDynamicObjectCollection("yem_es_materialinfo"); + if (!yemEsMaterialinfo.isEmpty()){ + for (DynamicObject dynamicObject : yemEsMaterialinfo) { + long aLong = dynamicObject.getLong("id"); + if (aLong == yem_sourceentryid){ + String yemIntauditbusano = dynamicObject.getString("yem_intauditbusano"); + if (!"".equals(yemIntauditbusano)){ + e.setCancel(true);//阻断增行 + view.showTipNotification("第"+(rowIndex+1)+"行分录已存在下游，禁止删除。"); + } + } + } + } } +// if(loadTargetRowIds.size() > 0) { +// e.setCancel(true);//阻断增行 +// view.showTipNotification("该分录已存在下游，禁止删除。"); +// } } } }