diff --git a/src/main/java/com/yem/wm/es/exportpresent/task/ExportPresentWarningTask.java b/src/main/java/com/yem/wm/es/exportpresent/task/ExportPresentWarningTask.java index d97e8e19..7a775f27 100644 --- a/src/main/java/com/yem/wm/es/exportpresent/task/ExportPresentWarningTask.java +++ b/src/main/java/com/yem/wm/es/exportpresent/task/ExportPresentWarningTask.java @@ -58,21 +58,24 @@ public class ExportPresentWarningTask extends AbstractTask { DynamicObject order = salesorderEntry.getValue(); salesorderNo.put(order.getString("billno"), orderId); } - Map stOrder = BusinessDataServiceHelper.loadFromCache("yem_es_storagetrans", "id, billno, yem_es_salescontrac_s.yem_rapamt, yem_es_salescontrac_s.yem_contractnumbers_p", new QFilter[]{new QFilter("yem_es_salescontrac_s.yem_contractnumbers_p", "in", salesorderNo.keySet())}); + Map stOrder = BusinessDataServiceHelper.loadFromCache("yem_es_storagetrans", "id, billno, yem_es_salescontrac_s.yem_rapamt, yem_es_salescontrac_s.yem_contractnumbers_p, yem_es_salescontrac_s.yem_ispre", new QFilter[]{new QFilter("yem_es_salescontrac_s.yem_contractnumbers_p", "in", salesorderNo.keySet())}); // 合同号-收汇金额合计 Map receiveAmt = new HashMap<>(); for (DynamicObject stBill : stOrder.values()) { DynamicObjectCollection collection = stBill.getDynamicObjectCollection("yem_es_salescontrac_s"); for (DynamicObject d : collection) { - BigDecimal rapamt = d.getBigDecimal("yem_rapamt"); - String contractnumbers = d.getString("yem_contractnumbers_p"); - BigDecimal calc; - if (receiveAmt.containsKey(contractnumbers)) { - calc = receiveAmt.get(contractnumbers).add(rapamt); - } else { - calc = rapamt; + boolean ispre = d.getBoolean("yem_ispre"); + if (ispre) { + BigDecimal rapamt = d.getBigDecimal("yem_rapamt"); + String contractnumbers = d.getString("yem_contractnumbers_p"); + BigDecimal calc; + if (receiveAmt.containsKey(contractnumbers)) { + calc = receiveAmt.get(contractnumbers).add(rapamt); + } else { + calc = rapamt; + } + receiveAmt.put(contractnumbers, calc); } - receiveAmt.put(contractnumbers, calc); } } for (Map.Entry salesorderEntry : salesorderNo.entrySet()) {