diff --git a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java index d602d6bd..0d91e2dc 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java +++ b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit.java @@ -659,50 +659,7 @@ public class StorageTransEdit extends AbstractBillPlugIn implements BeforeF7Sele } if ("creditconfirm".equals(operateKey)) { -// DynamicObjectCollection dynamicObjectCollection = dataEntity.getDynamicObjectCollection("yem_creditdetail"); -// if (dynamicObjectCollection.size()>0){ -// Map map = new HashMap<>(); -// for (DynamicObject dynamicObject : dynamicObjectCollection) { -// DynamicObject yemSalecontractno = dynamicObject.getDynamicObject("yem_salecontractno"); -// BigDecimal yemCreditamtCd = dynamicObject.getBigDecimal("yem_creditamt_cd"); -// if (yemSalecontractno!=null){ -// long aLong = yemSalecontractno.getLong("id"); -// if (map.get(aLong)!=null){ -// BigDecimal bigDecimal = map.get(aLong); -// map.put(aLong, yemCreditamtCd.add(bigDecimal)); -// }else { -// map.put(aLong, yemCreditamtCd); -// } -// } -// } -// for (DynamicObject dynamicObject : dynamicObjectCollection) { -// DynamicObject yemSalecontractno = dynamicObject.getDynamicObject("yem_salecontractno"); -// if (yemSalecontractno!=null){ -// long aLong = yemSalecontractno.getLong("id"); -// BigDecimal bigDecimal = map.get(aLong); -// String selectfield = DynamicObjectUtil.getSelectfields("yem_es_salesorder", false); -// String selectfields = DynamicObjectUtil.getEntrySelectfields(selectfield, "yem_es_salesorder", "yem_es_salescontrac_s", false); -// DynamicObject yemEsSalesorder = BusinessDataServiceHelper.loadSingle("yem_es_salesorder", selectfields -// , new QFilter[]{new QFilter("id", QCP.equals, aLong)}); -// if (yemEsSalesorder != null) { -// DynamicObjectCollection yemEsMaterialinfo = yemEsSalesorder.getDynamicObjectCollection("yem_es_salescontrac_s"); -// if (yemEsMaterialinfo.size()>0){ -// BigDecimal salescontrac = BigDecimal.ZERO; -// for (DynamicObject object : yemEsMaterialinfo) { -// boolean yemIspre = object.getBoolean("yem_ispre"); -// if (!yemIspre){ -// salescontrac = salescontrac.add(object.getBigDecimal("yem_rapamt")); -// } -// } -// if (salescontrac.compareTo(bigDecimal)<0){ -// view.showTipNotification(yemEsSalesorder.getString("billno")+"非预收收汇金额不足,请修改金额!!!"); -// return; -// } -// } -// } -// } -// } -// } + int rowCount = model.getEntryRowCount("yem_creditdetail"); StringBuilder sb = new StringBuilder(); for (int i = 0; i < rowCount; i++) { diff --git a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_xbs.java b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_xbs.java index 877de7ac..d00064cf 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_xbs.java +++ b/src/main/java/com/yem/wm/es/storagetrans/form/StorageTransEdit_xbs.java @@ -46,18 +46,6 @@ public class StorageTransEdit_xbs extends AbstractBillPlugIn { } } - @Override - public void beforeDoOperation(BeforeDoOperationEventArgs e) { - super.beforeDoOperation(e); - FormOperate source = (FormOperate) e.getSource(); - String operateKey = source.getOperateKey(); - IDataModel model = this.getModel(); - IFormView view = this.getView(); - if ("creditconfirm".equals(operateKey)) { - - } - } - @Override public void afterDoOperation(AfterDoOperationEventArgs e) { super.afterDoOperation(e); 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..35d3777d 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,7 +1,5 @@ package com.yem.wm.es.xsalesorder.from; -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.entity.botp.runtime.BFRow; @@ -17,6 +15,7 @@ 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; @@ -33,6 +32,7 @@ public class XSalesOrderFromEdit extends AbstractBillPlugIn { super.afterBindData(e); SplitContainer splitContainer = this.getControl("yem_splitcontainerap"); splitContainer.setCollapse("yem_splitpanelap1", true); + this.getModel().setValue("yem_signdate",new Date()); } @Override