From 73fcde95318082e997437d10526c6f40ee4a63dc Mon Sep 17 00:00:00 2001 From: ljw Date: Fri, 3 Jan 2025 16:03:50 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=EF=BC=881=EF=BC=89=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E7=BB=93=E7=AE=97=E5=B8=81=E5=88=AB=3D=E7=BE=8E?= =?UTF-8?q?=E5=85=83=EF=BC=9A=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=E2=91=A0=E3=80=80=E6=89=A3=E5=87=8F=E5=90=8E?= =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=88=E7=BE=8E=E5=85=83=EF=BC=89=3D?= =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E7=BE=8E=E5=85=83=E9=87=91=E9=A2=9D=EF=BC=88?= =?UTF-8?q?=E5=AE=9E=E9=99=85=EF=BC=89+=20=E9=85=8D=E4=BB=B6=E8=B5=84?= =?UTF-8?q?=E9=87=91=E6=B1=A0=E5=A2=9E=E5=8A=A0=E9=87=91=E9=A2=9D-?= =?UTF-8?q?=E9=85=8D=E4=BB=B6=E8=B5=84=E9=87=91=E6=B1=A0=E6=89=A3=E5=87=8F?= =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=9B=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=E2=91=A1=E3=80=80=E6=89=A3=E5=87=8F?= =?UTF-8?q?=E5=90=8E=E9=87=91=E9=A2=9D=EF=BC=88=E4=BA=BA=E6=B0=91=E5=B8=81?= =?UTF-8?q?=EF=BC=89=3D=20=E4=B8=8A=E6=AC=A1=E4=BA=BA=E6=B0=91=E5=B8=81?= =?UTF-8?q?=E9=87=91=E9=A2=9D=EF=BC=88=E5=AE=9E=E9=99=85=EF=BC=89=EF=BC=9B?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=EF=BC=882=EF=BC=89=E5=A6=82=E6=9E=9C=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E5=B8=81=E5=88=AB=3D=E4=BA=BA=E6=B0=91=E5=B8=81=EF=BC=9A=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=E2=91=A0?= =?UTF-8?q?=E3=80=80=E6=89=A3=E5=87=8F=E5=90=8E=E9=87=91=E9=A2=9D=EF=BC=88?= =?UTF-8?q?=E7=BE=8E=E5=85=83=EF=BC=89=3D=E4=B8=8A=E6=AC=A1=E7=BE=8E?= =?UTF-8?q?=E5=85=83=E9=87=91=E9=A2=9D=EF=BC=88=E5=AE=9E=E9=99=85=EF=BC=89?= =?UTF-8?q?=EF=BC=9B=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=E2=91=A1=E3=80=80=E6=89=A3=E5=87=8F=E5=90=8E=E9=87=91?= =?UTF-8?q?=E9=A2=9D=EF=BC=88=E4=BA=BA=E6=B0=91=E5=B8=81=EF=BC=89=3D=20?= =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E4=BA=BA=E6=B0=91=E5=B8=81=E9=87=91=E9=A2=9D?= =?UTF-8?q?=EF=BC=88=E5=AE=9E=E9=99=85=EF=BC=89+=20=E9=85=8D=E4=BB=B6?= =?UTF-8?q?=E8=B5=84=E9=87=91=E6=B1=A0=E5=A2=9E=E5=8A=A0=E9=87=91=E9=A2=9D?= =?UTF-8?q?-=E9=85=8D=E4=BB=B6=E8=B5=84=E9=87=91=E6=B1=A0=E6=89=A3?= =?UTF-8?q?=E5=87=8F=E9=87=91=E9=A2=9D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yem/wm/im/debcrednotenew/op/DebCredNewSubmitOp.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 78476f42..39317cc6 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 @@ -70,11 +70,11 @@ public class DebCredNewSubmitOp extends AbstractOperationServicePlugIn { BigDecimal yemAmount = billObj.getBigDecimal("yem_amount");//配件资金池增加金额 BigDecimal yemAmountSub = billObj.getBigDecimal("yem_amount_sub");//配件资金池扣减金额 if ("CNY".equals(number)){ - dynamicObject.set("yem_afterdeductionusd",yemCreditusdamt); - dynamicObject.set("yem_afterdeductionrmb",yemCreditrmbamt.add(yemAmount.subtract(yemAmountSub))); + dynamicObject.set("yem_koujianusd",yemCreditusdamt); + dynamicObject.set("yem_koujiancny",yemCreditrmbamt.add(yemAmount.subtract(yemAmountSub))); }else if ("USD".equals(number)){ - dynamicObject.set("yem_afterdeductionusd",yemCreditusdamt.add(yemAmount.subtract(yemAmountSub))); - dynamicObject.set("yem_afterdeductionrmb",yemCreditrmbamt); + dynamicObject.set("yem_koujianusd",yemCreditusdamt.add(yemAmount.subtract(yemAmountSub))); + dynamicObject.set("yem_koujiancny",yemCreditrmbamt); } } getlast(dynamicObject);