From 32db0981368b4a279e72669923be8cc0f892724f Mon Sep 17 00:00:00 2001 From: ljw Date: Fri, 3 Jan 2025 21:15:24 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E8=B4=B7=E8=AE=B0=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A1=E7=AE=97=E6=89=A3=E5=87=8F=E5=90=8E?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../debcrednotenew/op/DebCredNewSubmitOp.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java b/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java index fb28161a..f4a0a772 100644 --- a/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java +++ b/src/main/java/com/yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java @@ -152,31 +152,31 @@ public class DebCredNewSubmitOp extends AbstractOperationServicePlugIn { String number = yem_em_replace.getString("number"); if (number.equals("CNY")) { temp.set("yem_creditrmbamt", 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 (number.equals("USD")) { temp.set("yem_creditusdamt", bigDecimal); - } - if (yemCurrency != null) { - /* - （1）如果结算币别=美元： - ①　扣减后金额（美元）=上次美元金额（实际）+ 配件资金池增加金额-配件资金池扣减金额； - ②　扣减后金额（人民币）= 上次人民币金额（实际）； - （2）如果结算币别=人民币： - ①　扣减后金额（美元）=上次美元金额（实际）； - ②　扣减后金额（人民币）= 上次人民币金额（实际）+ 配件资金池增加金额-配件资金池扣减金额； - */ - - String numbers = yemCurrency.getString("number"); -// BigDecimal yemCreditusdamt = temp.getBigDecimal("yem_creditusdamt");//上次美元金额（实际） -// BigDecimal yemCreditrmbamt = temp.getBigDecimal("yem_creditrmbamt");//上次人民币金额（实际） - 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 (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); + } } } + } } }