diff --git a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java index dea85e87..ba8ae375 100644 --- a/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java +++ b/src/main/java/com/yem/wm/es/salesorder/from/SalesOrderZJEdit.java @@ -87,7 +87,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo OperationStatus status = fsp.getStatus(); String formId = fsp.getFormId(); String appId = fsp.getAppId(); - if (OperationStatus.ADDNEW == status&&appId.equals("yem_es")) { + if (OperationStatus.ADDNEW == status && appId.equals("yem_es")) { SplitContainer splitContainer = this.getControl("yem_splitcontainerap"); splitContainer.setCollapse("yem_splitpanelap1", true); QFilter qFilter = null; @@ -193,6 +193,7 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo String name = e.getProperty().getName(); ChangeData changeData = e.getChangeSet()[0]; Object oldValue = changeData.getOldValue(); + Object newValue = changeData.getNewValue(); int rowIndex = changeData.getRowIndex(); int ParentRow = changeData.getParentRowIndex(); DynamicObject dataEntity = model.getDataEntity(); @@ -526,10 +527,30 @@ public class SalesOrderZJEdit extends AbstractBillPlugIn implements Plugin, Befo break; case "yem_tonsqty": case "yem_port": - case "yem_padexpense": + case "yem_shippingmethod": ClientUtils.calcInlandTransportationAmt(model, rowIndex);//计算内陆运费 ClientUtils.calculatePortAmt(model, rowIndex);//计算港杂费 break; + case "yem_padexpense": + DynamicObject padexpense = (DynamicObject) newValue; + if (padexpense != null) { + String number = padexpense.getString("number"); + //内陆运输费 + if ("FYXM0023.11".equals(number)) { + DynamicObjectCollection entryRows = this.getModel().getEntryEntity("yem_es_materialinfo"); + for(int i = 0;i