feat:使用订舱中非预收金额合计判断是否回款
This commit is contained in:
parent
7a3638ca84
commit
a0d082a2cc
@ -58,21 +58,24 @@ public class ExportPresentWarningTask extends AbstractTask {
|
|||||||
DynamicObject order = salesorderEntry.getValue();
|
DynamicObject order = salesorderEntry.getValue();
|
||||||
salesorderNo.put(order.getString("billno"), orderId);
|
salesorderNo.put(order.getString("billno"), orderId);
|
||||||
}
|
}
|
||||||
Map<Object, DynamicObject> 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<Object, DynamicObject> 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<String, BigDecimal> receiveAmt = new HashMap<>();
|
Map<String, BigDecimal> receiveAmt = new HashMap<>();
|
||||||
for (DynamicObject stBill : stOrder.values()) {
|
for (DynamicObject stBill : stOrder.values()) {
|
||||||
DynamicObjectCollection collection = stBill.getDynamicObjectCollection("yem_es_salescontrac_s");
|
DynamicObjectCollection collection = stBill.getDynamicObjectCollection("yem_es_salescontrac_s");
|
||||||
for (DynamicObject d : collection) {
|
for (DynamicObject d : collection) {
|
||||||
BigDecimal rapamt = d.getBigDecimal("yem_rapamt");
|
boolean ispre = d.getBoolean("yem_ispre");
|
||||||
String contractnumbers = d.getString("yem_contractnumbers_p");
|
if (ispre) {
|
||||||
BigDecimal calc;
|
BigDecimal rapamt = d.getBigDecimal("yem_rapamt");
|
||||||
if (receiveAmt.containsKey(contractnumbers)) {
|
String contractnumbers = d.getString("yem_contractnumbers_p");
|
||||||
calc = receiveAmt.get(contractnumbers).add(rapamt);
|
BigDecimal calc;
|
||||||
} else {
|
if (receiveAmt.containsKey(contractnumbers)) {
|
||||||
calc = rapamt;
|
calc = receiveAmt.get(contractnumbers).add(rapamt);
|
||||||
|
} else {
|
||||||
|
calc = rapamt;
|
||||||
|
}
|
||||||
|
receiveAmt.put(contractnumbers, calc);
|
||||||
}
|
}
|
||||||
receiveAmt.put(contractnumbers, calc);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for (Map.Entry<String, Long> salesorderEntry : salesorderNo.entrySet()) {
|
for (Map.Entry<String, Long> salesorderEntry : salesorderNo.entrySet()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user