From e17ea78cf4c9e8b37e7ecf0b31ac5bbebfb6c9b4 Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 21 Jan 2025 11:33:18 +0800 Subject: [PATCH] Revert "fix:" This reverts commit ddb4cdb124a5716961c2db79e0a668f94ee5b230. --- .../xsalesorder/from/XSalesOrderFromEdit.java | 50 +++++++++++++------ 1 file changed, 36 insertions(+), 14 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 4833abdd..8f0a0bb3 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,8 +1,9 @@ package com.yem.wm.es.xsalesorder.from; +import com.yem.wm.utils.DynamicObjectUtil; import kd.bos.bill.AbstractBillPlugIn; import kd.bos.dataentity.entity.DynamicObject; -import kd.bos.entity.botp.runtime.BFRow; +import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.entity.datamodel.IDataModel; import kd.bos.entity.datamodel.RowDataEntity; import kd.bos.entity.datamodel.events.AfterAddRowEventArgs; @@ -13,11 +14,8 @@ import kd.bos.form.events.AfterDoOperationEventArgs; import kd.bos.orm.query.QCP; import kd.bos.orm.query.QFilter; import kd.bos.servicehelper.BusinessDataServiceHelper; -import kd.bos.servicehelper.botp.BFTrackerServiceHelper; -import java.util.Date; import java.util.EventObject; -import java.util.List; /** * @author zhouc @@ -32,6 +30,10 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn { super.afterBindData(e); SplitContainer splitContainer = this.getControl("yem_splitcontainerap"); splitContainer.setCollapse("yem_splitpanelap1", true); + Object yemSigndate = this.getModel().getValue("yem_signdate"); + if (yemSigndate == null) { + this.getModel().setValue("yem_signdate", this.getModel().getValue("createtime")); + } } @Override @@ -54,6 +56,9 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn { if ("yem_es_materialinfo".equals(name)) { setMaterialType(rowIndex); } + if ("yem_multiconfig".equals(name)){ + this.getModel().setValue("yem_linetypes","add",rowIndex); + } } } @@ -81,6 +86,7 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn { } } } + @Override public void beforeDeleteRow(BeforeDeleteRowEventArgs e) { super.beforeDeleteRow(e); @@ -91,19 +97,35 @@ 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)+"行分录已存在下游,禁止删除。"); + } + } + } + } } } } } - @Override - public void afterCreateNewData(EventObject e) { - super.afterCreateNewData(e); - this.getModel().setValue("yem_signdate",new Date()); - } +// @Override +// public void afterCreateNewData(EventObject e) { +// super.afterCreateNewData(e); +// this.getModel().setValue("yem_signdate",new Date()); +// } }