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 f2491f9b..6d2f6726 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 @@ -694,30 +694,30 @@ public class ShippingDetailsFormPlugin extends AbstractBillPlugIn implements Bef this.getView().showMessage("数量不允许低于关联调拨数量;,请重新填写"); this.getModel().setValue("yem_qty", e.getChangeSet()[0].getOldValue()); } -// Map map = new HashMap<>(); -// DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo"); -// if (!yemEsMaterialinfo.isEmpty()) { -// for (DynamicObject dynamicObject : yemEsMaterialinfo) { -// DynamicObject yemProductmodel = dynamicObject.getDynamicObject("yem_productmodel"); -// if (yemProductmodel != null) { -// long aLong = yemProductmodel.getDynamicObject("yem_products").getLong("id"); -//// long aLong = yemProductmodel.getLong("id"); -// BigDecimal yemQty = dynamicObject.getBigDecimal("yem_qty"); -// map.merge(aLong, yemQty, (a, b) -> b.add(a)); -// } -// } -// DynamicObjectCollection yemEsSalesorderP = this.getModel().getEntryEntity("yem_es_salesorder_p"); -// for (int i = 0; i < yemEsSalesorderP.size(); i++) { -// DynamicObject dynamicObject = yemEsSalesorderP.get(i); -// DynamicObject yemAccessorytype = dynamicObject.getDynamicObject("yem_accessorytype"); -// if (yemAccessorytype != null) { -// long aLong = yemAccessorytype.getLong("id"); -// if (map.get(aLong) != null) { -// this.getModel().setValue("yem_pcstype", map.get(aLong), i); -// } -// } -// } -// } + Map map = new HashMap<>(); + DynamicObjectCollection yemEsMaterialinfo = this.getModel().getEntryEntity("yem_es_materialinfo"); + if (!yemEsMaterialinfo.isEmpty()) { + for (DynamicObject dynamicObject : yemEsMaterialinfo) { + DynamicObject yemProductmodel = dynamicObject.getDynamicObject("yem_productmodel"); + if (yemProductmodel != null) { + long aLong = yemProductmodel.getDynamicObject("yem_products").getLong("id"); +// long aLong = yemProductmodel.getLong("id"); + BigDecimal yemQty = dynamicObject.getBigDecimal("yem_qty"); + map.merge(aLong, yemQty, (a, b) -> b.add(a)); + } + } + DynamicObjectCollection yemEsSalesorderP = this.getModel().getEntryEntity("yem_es_salesorder_p"); + for (int i = 0; i < yemEsSalesorderP.size(); i++) { + DynamicObject dynamicObject = yemEsSalesorderP.get(i); + DynamicObject yemAccessorytype = dynamicObject.getDynamicObject("yem_accessorytype"); + if (yemAccessorytype != null) { + long aLong = yemAccessorytype.getLong("id"); + if (map.get(aLong) != null) { + this.getModel().setValue("yem_pcstype", map.get(aLong), i); + } + } + } + } case "yem_isdismantlecar": extracted(); break;