diff --git a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java index 23831453..f1e483c8 100644 --- a/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java +++ b/src/main/java/com/yem/wm/es/shippingdetails/form/ShippingDetailsFormPlugin.java @@ -399,14 +399,15 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef super.beforeDeleteRow(e); String name = e.getEntryProp().getName(); int[] rowIndexs = e.getRowIndexs(); - if ("yem_es_materialinfo".equals(name)){ + String string = this.getModel().getDataEntityType().getName(); + if ("yem_es_materialinfo".equals(name)&&"yem_xshippingdetails".equals(string)){ for (int rowIndex : rowIndexs) { BigDecimal yemStorageqty = (BigDecimal)this.getModel().getValue("yem_storageqty", rowIndex); BigDecimal yemDeliveryqty = (BigDecimal) this.getModel().getValue("yem_deliveryqty", rowIndex); BigDecimal yemTradeappqty = (BigDecimal)this.getModel().getValue("yem_tradeappqty", rowIndex); if (yemStorageqty.compareTo(BigDecimal.ZERO)>0||yemDeliveryqty.compareTo(BigDecimal.ZERO)>0||yemTradeappqty.compareTo(BigDecimal.ZERO)>0){ this.getView().showMessage("删除单已存在下游单,不允许删除!!!"); - e.setCancel(false); + e.setCancel(true); } } }