violet/ensign
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：

Browse Source 
贷记单提交计算扣减后金额
This commit is contained in:
ljw 2025-01-03 21:15:24 +08:00
parent 5a6cde6e38
commit 32db098136
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java
View File

@ -152,23 +152,8 @@ public class DebCredNewSubmitOp extends AbstractOperationServicePlugIn {
String number = yem_em_replace.getString("number"); String number = yem_em_replace.getString("number");
if (number.equals("CNY")) { if (number.equals("CNY")) {
temp.set("yem_creditrmbamt", bigDecimal); temp.set("yem_creditrmbamt", bigDecimal);
}
if (number.equals("USD")) {
temp.set("yem_creditusdamt", bigDecimal);
}
if (yemCurrency != null) { if (yemCurrency != null) {
/*
（1）如果结算币别=美元：
①　扣减后金额（美元）=上次美元金额（实际）+ 配件资金池增加金额-配件资金池扣减金额；
②　扣减后金额（人民币）= 上次人民币金额（实际）；
（2）如果结算币别=人民币：
①　扣减后金额（美元）=上次美元金额（实际）；
②　扣减后金额（人民币）= 上次人民币金额（实际）+ 配件资金池增加金额-配件资金池扣减金额；
*/
String numbers = yemCurrency.getString("number"); String numbers = yemCurrency.getString("number");
// BigDecimal yemCreditusdamt = temp.getBigDecimal("yem_creditusdamt");//上次美元金额（实际）
// BigDecimal yemCreditrmbamt = temp.getBigDecimal("yem_creditrmbamt");//上次人民币金额（实际）
if ("CNY".equals(numbers)) { if ("CNY".equals(numbers)) {
temp.set("yem_koujianusd", bigDecimal); temp.set("yem_koujianusd", bigDecimal);
temp.set("yem_koujiancny", bigDecimal.add(yemAmount.subtract(yemAmountSub))); temp.set("yem_koujiancny", bigDecimal.add(yemAmount.subtract(yemAmountSub)));
@ -178,6 +163,21 @@ public class DebCredNewSubmitOp extends AbstractOperationServicePlugIn {
} }
} }
} }
if (number.equals("USD")) {
temp.set("yem_creditusdamt", bigDecimal);
if (yemCurrency != null) {
String numbers = yemCurrency.getString("number");
if ("CNY".equals(numbers)) {
temp.set("yem_koujianusd", bigDecimal);
temp.set("yem_koujiancny", bigDecimal.add(yemAmount.subtract(yemAmountSub)));
} else if ("USD".equals(numbers)) {
temp.set("yem_koujianusd", bigDecimal.add(yemAmount.subtract(yemAmountSub)));
temp.set("yem_koujiancny", bigDecimal);
}
}
}
}
} }
} }
if (map1.size() > 0) { if (map1.size() > 0) {